From 5d8a3b3974bb63e7e2afadc814a346935ff7554d Mon Sep 17 00:00:00 2001 From: Ryan Stecker Date: Wed, 2 Apr 2014 18:13:15 -0500 Subject: [PATCH 1/5] Add gitignore for some common non-tracked files. --- .gitignore | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..114c66c --- /dev/null +++ b/.gitignore @@ -0,0 +1,28 @@ + +# Compiled Object files +*.slo +*.lo +*.o + +# Compiled Dynamic libraries +*.so +*.dylib + +# Compiled Static libraries +*.lai +*.la +*.a + +# visual studio +*.sdf +*.opensdf + +# user files +*.suo +*.user + +# msvc temporaries/binaries +[Dd]ebug - */ +[Rr]elease - */ +[Dd]ebug/ +[Rr]elease/ \ No newline at end of file From 57bfd916027ad3969f5a19187598d6770035cdeb Mon Sep 17 00:00:00 2001 From: Ryan Stecker Date: Wed, 2 Apr 2014 18:16:48 -0500 Subject: [PATCH 2/5] Properly name solution/vcproj files. --- Extension/msvc10/{sdk.sln => SteamWorks.sln} | 2 +- Extension/msvc10/{sdk.vcxproj => SteamWorks.vcxproj} | 3 +++ .../msvc10/{sdk.vcxproj.filters => SteamWorks.vcxproj.filters} | 0 3 files changed, 4 insertions(+), 1 deletion(-) rename Extension/msvc10/{sdk.sln => SteamWorks.sln} (85%) rename Extension/msvc10/{sdk.vcxproj => SteamWorks.vcxproj} (99%) rename Extension/msvc10/{sdk.vcxproj.filters => SteamWorks.vcxproj.filters} (100%) diff --git a/Extension/msvc10/sdk.sln b/Extension/msvc10/SteamWorks.sln similarity index 85% rename from Extension/msvc10/sdk.sln rename to Extension/msvc10/SteamWorks.sln index f4c85a4..13f434a 100644 --- a/Extension/msvc10/sdk.sln +++ b/Extension/msvc10/SteamWorks.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 11.00 # Visual Studio 2010 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sdk", "sdk.vcxproj", "{B3E797CF-4E77-4C9D-B8A8-7589B6902206}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SteamWorks", "SteamWorks.vcxproj", "{B3E797CF-4E77-4C9D-B8A8-7589B6902206}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/Extension/msvc10/sdk.vcxproj b/Extension/msvc10/SteamWorks.vcxproj similarity index 99% rename from Extension/msvc10/sdk.vcxproj rename to Extension/msvc10/SteamWorks.vcxproj index f7c0189..29423f9 100644 --- a/Extension/msvc10/sdk.vcxproj +++ b/Extension/msvc10/SteamWorks.vcxproj @@ -14,6 +14,7 @@ {B3E797CF-4E77-4C9D-B8A8-7589B6902206} sdk Win32Proj + SteamWorks @@ -28,10 +29,12 @@ DynamicLibrary MultiByte true + v110 DynamicLibrary MultiByte + v110 diff --git a/Extension/msvc10/sdk.vcxproj.filters b/Extension/msvc10/SteamWorks.vcxproj.filters similarity index 100% rename from Extension/msvc10/sdk.vcxproj.filters rename to Extension/msvc10/SteamWorks.vcxproj.filters From 4f858dde303b66062c3239bcd1654478b66b699d Mon Sep 17 00:00:00 2001 From: Ryan Stecker Date: Wed, 2 Apr 2014 18:39:36 -0500 Subject: [PATCH 3/5] Add some files missing from the project. --- Extension/msvc10/SteamWorks.vcxproj | 10 +++++++ Extension/msvc10/SteamWorks.vcxproj.filters | 30 +++++++++++++++++++++ 2 files changed, 40 insertions(+) diff --git a/Extension/msvc10/SteamWorks.vcxproj b/Extension/msvc10/SteamWorks.vcxproj index 29423f9..1598da4 100644 --- a/Extension/msvc10/SteamWorks.vcxproj +++ b/Extension/msvc10/SteamWorks.vcxproj @@ -186,18 +186,28 @@ + + + + + + + + + + diff --git a/Extension/msvc10/SteamWorks.vcxproj.filters b/Extension/msvc10/SteamWorks.vcxproj.filters index e56a1fe..36e008c 100644 --- a/Extension/msvc10/SteamWorks.vcxproj.filters +++ b/Extension/msvc10/SteamWorks.vcxproj.filters @@ -36,6 +36,21 @@ Source Files + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + @@ -59,5 +74,20 @@ Header Files + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + \ No newline at end of file From 7c44ab134384cb57d19048f7579fa3332b2d33e8 Mon Sep 17 00:00:00 2001 From: Ryan Stecker Date: Wed, 2 Apr 2014 18:44:46 -0500 Subject: [PATCH 4/5] Add missing CDetour and asm files from project. --- Extension/msvc10/SteamWorks.vcxproj | 5 ++++ Extension/msvc10/SteamWorks.vcxproj.filters | 27 +++++++++++++++++++++ 2 files changed, 32 insertions(+) diff --git a/Extension/msvc10/SteamWorks.vcxproj b/Extension/msvc10/SteamWorks.vcxproj index 1598da4..fbe56e7 100644 --- a/Extension/msvc10/SteamWorks.vcxproj +++ b/Extension/msvc10/SteamWorks.vcxproj @@ -183,6 +183,8 @@ + + @@ -196,6 +198,9 @@ + + + diff --git a/Extension/msvc10/SteamWorks.vcxproj.filters b/Extension/msvc10/SteamWorks.vcxproj.filters index 36e008c..34b6c85 100644 --- a/Extension/msvc10/SteamWorks.vcxproj.filters +++ b/Extension/msvc10/SteamWorks.vcxproj.filters @@ -16,6 +16,18 @@ {31958233-BB2D-4e41-A8F9-CE8A4684F436} + + {165bd3d1-013b-4a7c-9ae8-7726e1167ab8} + + + {ddc20a5f-f759-411d-b126-0e969544e25a} + + + {a4151558-d2e9-4b94-bd9f-9e411544f549} + + + {760cee12-5e87-4fa0-a3f9-bb85ea8c88de} + @@ -51,6 +63,12 @@ Source Files + + Source Files\CDetour + + + Source Files\asm + @@ -89,5 +107,14 @@ Header Files + + Header Files\CDetour + + + Header Files\CDetour + + + Header Files\asm + \ No newline at end of file From 8accb8997ddecad1208738464eb1bc6497d91499 Mon Sep 17 00:00:00 2001 From: Ryan Stecker Date: Wed, 2 Apr 2014 18:45:28 -0500 Subject: [PATCH 5/5] Fix up project compiler and linker include directories and dependencies. --- Extension/msvc10/SteamWorks.vcxproj | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/Extension/msvc10/SteamWorks.vcxproj b/Extension/msvc10/SteamWorks.vcxproj index fbe56e7..83b219b 100644 --- a/Extension/msvc10/SteamWorks.vcxproj +++ b/Extension/msvc10/SteamWorks.vcxproj @@ -78,8 +78,8 @@ Disabled - ..;..\sdk;..\..\..\public;..\..\..\public\extensions;..\..\..\public\sourcepawn;$(STEAMWORKS_SDK)\public\steam;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;SDK_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD;%(PreprocessorDefinitions) + ..;..\sdk;$(MMSOURCE110)\core;$(MMSOURCE110)\core\sourcehook;$(SOURCEMOD15)\public;$(SOURCEMOD15)\public\sourcepawn;$(HL2SDK2013)\public;$(HL2SDK2013)\public\tier0;$(HL2SDK2013)\public\tier1;$(STEAMWORKS_SDK)\public\steam;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;SDK_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD;VERSION_SAFE_STEAM_API_INTERFACES;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebug @@ -98,13 +98,14 @@ MachineX86 - kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;$(HL2SDK)\lib\public\steam_api.lib;%(AdditionalDependencies) + tier0.lib;tier1.lib;steam_api.lib;%(AdditionalDependencies) + $(STEAMWORKS_SDK)\redistributable_bin\;$(HL2SDK2013)\lib\public\;%(AdditionalLibraryDirectories) Speed - ..;..\sdk;..\..\..\public;..\..\..\public\extensions;..\..\..\public\sourcepawn;$(STEAMWORKS_SDK)\public\steam;%(AdditionalIncludeDirectories) + ..;..\sdk;$(MMSOURCE110)\core;$(MMSOURCE110)\core\sourcehook;$(SOURCEMOD15)\public;$(SOURCEMOD15)\public\sourcepawn;$(HL2SDK2013)\public;$(HL2SDK2013)\public\tier0;$(HL2SDK2013)\public\tier1;$(STEAMWORKS_SDK)\public\steam;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;SDK_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD;VERSION_SAFE_STEAM_API_INTERFACES;%(PreprocessorDefinitions) MultiThreaded NotSet @@ -125,7 +126,8 @@ MachineX86 - kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;$(HL2SDK)\lib\public\steam_api.lib;%(AdditionalDependencies) + tier0.lib;tier1.lib;steam_api.lib;%(AdditionalDependencies) + $(STEAMWORKS_SDK)\redistributable_bin\;$(HL2SDK2013)\lib\public\;%(AdditionalLibraryDirectories)