summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHaru <haru@dotalux.com>2013-10-16 21:28:24 +0200
committerHaru <haru@dotalux.com>2013-10-16 21:30:26 +0200
commit37aca712bc0e09af5e17475cf2a7d0faa455c0eb (patch)
tree828e9b12b0e0a428f46c78ae38945df8e1d256e9
parent4a1332099ff348f88f3d2c05512a92d3bc6f9c25 (diff)
downloadhercules-37aca712bc0e09af5e17475cf2a7d0faa455c0eb.tar.gz
hercules-37aca712bc0e09af5e17475cf2a7d0faa455c0eb.tar.bz2
hercules-37aca712bc0e09af5e17475cf2a7d0faa455c0eb.tar.xz
hercules-37aca712bc0e09af5e17475cf2a7d0faa455c0eb.zip
Visual Studio project corrections
- Corrected duplicate GUIDs in the VS2010/VS2012 projects - Added gitignore entries for the HPMHooking plugin files - Special thanks to Takkun for providing the VS2012 updated file
-rw-r--r--.gitignore39
-rw-r--r--Hercules-12.sln8
-rw-r--r--vcproj-10/plugin-HPMHooking.vcxproj4
-rw-r--r--vcproj-12/plugin-HPMHooking.vcxproj4
4 files changed, 16 insertions, 39 deletions
diff --git a/.gitignore b/.gitignore
index 61a787f16..773005315 100644
--- a/.gitignore
+++ b/.gitignore
@@ -95,35 +95,10 @@ Thumbs.db
/tools/HPMHookGen/Makefile
/tools/HPMHookGen/doxyoutput
-# /vcproj-12/
-/vcproj-12/map-server
-/vcproj-12/char-server
-/vcproj-12/login-server
-/vcproj-12/char-server_sql
-/vcproj-12/login-server_sql
-/vcproj-12/mapcache
-/vcproj-12/map-server_sql
-/vcproj-12/*.user
-/vcproj-12/plugin-sample/
-
-# /vcproj-10/
-/vcproj-10/map-server
-/vcproj-10/char-server
-/vcproj-10/login-server
-/vcproj-10/char-server_sql
-/vcproj-10/login-server_sql
-/vcproj-10/mapcache
-/vcproj-10/map-server_sql
-/vcproj-10/*.user
-/vcproj-10/plugin-sample/
-
-# /vcproj-9/
-/vcproj-9/*.user
-/vcproj-9/char-server
-/vcproj-9/login-server
-/vcproj-9/map-server
-/vcproj-9/char-server_sql
-/vcproj-9/login-server_sql
-/vcproj-9/map-server_sql
-/vcproj-9/mapcache
-/vcproj-9/plugin-sample/
+# /vcproj-*
+/vcproj-*/*.user
+/vcproj-*/char-server
+/vcproj-*/login-server
+/vcproj-*/map-server
+/vcproj-*/mapcache
+/vcproj-*/plugin-*/
diff --git a/Hercules-12.sln b/Hercules-12.sln
index 8fef6c9ef..686100c98 100644
--- a/Hercules-12.sln
+++ b/Hercules-12.sln
@@ -10,7 +10,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mapcache", "vcproj-12\mapca
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plugin-sample", "vcproj-12\plugin-sample.vcxproj", "{E64C56D3-CDFB-483B-900B-A62D216B6D2F}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plugin-HPMHooking", "vcproj-12\plugin-HPMHooking.vcxproj", "{E64C56D3-CDFB-483B-900B-A62D216B6D2F}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plugin-HPMHooking", "vcproj-12\plugin-HPMHooking.vcxproj", "{745D4A8C-6A68-4721-A43A-D81BF59860A1}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -38,8 +38,10 @@ Global
{E64C56D3-CDFB-483B-900B-A62D216B6D2F}.Debug|Win32.Build.0 = Debug|Win32
{E64C56D3-CDFB-483B-900B-A62D216B6D2F}.Release|Win32.ActiveCfg = Release|Win32
{E64C56D3-CDFB-483B-900B-A62D216B6D2F}.Release|Win32.Build.0 = Release|Win32
- {E64C56D3-CDFB-483B-900B-A62D216B6D2F}.Release|Win32.ActiveCfg = Release|Win32
- {E64C56D3-CDFB-483B-900B-A62D216B6D2F}.Release|Win32.Build.0 = Release|Win32
+ {745D4A8C-6A68-4721-A43A-D81BF59860A1}.Debug|Win32.ActiveCfg = Debug|Win32
+ {745D4A8C-6A68-4721-A43A-D81BF59860A1}.Debug|Win32.Build.0 = Debug|Win32
+ {745D4A8C-6A68-4721-A43A-D81BF59860A1}.Release|Win32.ActiveCfg = Release|Win32
+ {745D4A8C-6A68-4721-A43A-D81BF59860A1}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/vcproj-10/plugin-HPMHooking.vcxproj b/vcproj-10/plugin-HPMHooking.vcxproj
index e1fa972f4..4ded9cc92 100644
--- a/vcproj-10/plugin-HPMHooking.vcxproj
+++ b/vcproj-10/plugin-HPMHooking.vcxproj
@@ -11,7 +11,7 @@
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
- <ProjectGuid>{E64C56D3-CDFB-483B-900B-A62D216B6D2F}</ProjectGuid>
+ <ProjectGuid>{7ED92B9F-95E8-49B8-9D4F-C4C9BFDE0B22}</ProjectGuid>
<RootNamespace>plugin-HPMHooking</RootNamespace>
<Keyword>Win32Proj</Keyword>
<ProjectName>plugin-HPMHooking</ProjectName>
@@ -115,4 +115,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
+</Project> \ No newline at end of file
diff --git a/vcproj-12/plugin-HPMHooking.vcxproj b/vcproj-12/plugin-HPMHooking.vcxproj
index 9b69dca0b..95d2c8dea 100644
--- a/vcproj-12/plugin-HPMHooking.vcxproj
+++ b/vcproj-12/plugin-HPMHooking.vcxproj
@@ -11,7 +11,7 @@
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
- <ProjectGuid>{E64C56D3-CDFB-483B-900B-A62D216B6D2F}</ProjectGuid>
+ <ProjectGuid>{745D4A8C-6A68-4721-A43A-D81BF59860A1}</ProjectGuid>
<RootNamespace>plugin-HPMHooking</RootNamespace>
<Keyword>Win32Proj</Keyword>
<ProjectName>plugin-HPMHooking</ProjectName>
@@ -117,4 +117,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
+</Project> \ No newline at end of file