From 80cf45d234b213e14a84aa4de1c6f31e6226e541 Mon Sep 17 00:00:00 2001 From: Vincent Herbet Date: Sun, 2 Sep 2018 20:34:40 +0200 Subject: [PATCH] Adjust version for manual build and update VS projects (#543) --- amxmodx/msvc12/amxmodx_mm.vcxproj | 5 ++++- amxmodx/version.rc | 16 +++++----------- compiler/amxxpc/amxxpc.vcxproj | 11 +++++------ modules/cstrike/cstrike/msvc12/cstrike.vcxproj | 6 ++++++ .../cstrike/msvc12/cstrike.vcxproj.filters | 8 ++++++++ modules/cstrike/csx/msvc12/csx.vcxproj | 8 +++++++- modules/cstrike/csx/msvc12/csx.vcxproj.filters | 8 ++++++++ modules/dod/dodfun/msvc12/dodfun.vcxproj | 8 +++++++- modules/dod/dodfun/msvc12/dodfun.vcxproj.filters | 8 ++++++++ modules/dod/dodx/msvc12/dodx.vcxproj | 8 +++++++- modules/dod/dodx/msvc12/dodx.vcxproj.filters | 8 ++++++++ modules/engine/msvc12/engine.vcxproj | 8 +++++++- modules/engine/msvc12/engine.vcxproj.filters | 8 ++++++++ modules/fakemeta/msvc12/fakemeta.vcxproj | 6 ++++++ modules/fakemeta/msvc12/fakemeta.vcxproj.filters | 8 ++++++++ modules/fun/fun.h | 2 +- modules/fun/msvc12/fun.vcxproj | 10 ++++++++-- modules/fun/msvc12/fun.vcxproj.filters | 8 ++++++++ modules/geoip/msvc12/geoip.vcxproj | 6 ++++++ modules/geoip/msvc12/geoip.vcxproj.filters | 8 ++++++++ modules/hamsandwich/msvc12/hamsandwich.vcxproj | 8 +++++++- .../msvc12/hamsandwich.vcxproj.filters | 8 ++++++++ modules/json/msvc12/json.vcxproj | 6 ++++++ modules/json/msvc12/json.vcxproj.filters | 8 ++++++++ modules/mysqlx/msvc12/mysqlx.vcxproj | 12 ++++++++++-- modules/mysqlx/msvc12/mysqlx.vcxproj.filters | 8 ++++++++ modules/ns/msvc12/ns.vcxproj | 8 +++++++- modules/ns/msvc12/ns.vcxproj.filters | 8 ++++++++ modules/nvault/msvc12/nvault.vcxproj | 6 ++++++ modules/nvault/msvc12/nvault.vcxproj.filters | 8 ++++++++ modules/regex/msvc12/regex.vcxproj | 6 ++++++ modules/regex/msvc12/regex.vcxproj.filters | 8 ++++++++ modules/sockets/msvc12/sockets.vcxproj | 6 ++++++ modules/sockets/msvc12/sockets.vcxproj.filters | 8 ++++++++ modules/sqlite/msvc12/sqlite.vcxproj | 8 +++++++- modules/sqlite/msvc12/sqlite.vcxproj.filters | 8 ++++++++ modules/tfcx/msvc12/tfcx.vcxproj | 8 +++++++- modules/tfcx/msvc12/tfcx.vcxproj.filters | 8 ++++++++ modules/ts/tsfun/msvc12/tsfun.vcxproj | 6 ++++++ modules/ts/tsfun/msvc12/tsfun.vcxproj.filters | 8 ++++++++ modules/ts/tsx/msvc12/tsx.vcxproj | 8 +++++++- modules/ts/tsx/msvc12/tsx.vcxproj.filters | 8 ++++++++ plugins/include/amxmodx_version.inc | 6 +++--- 43 files changed, 299 insertions(+), 35 deletions(-) diff --git a/amxmodx/msvc12/amxmodx_mm.vcxproj b/amxmodx/msvc12/amxmodx_mm.vcxproj index e1675884..80fb9367 100644 --- a/amxmodx/msvc12/amxmodx_mm.vcxproj +++ b/amxmodx/msvc12/amxmodx_mm.vcxproj @@ -446,7 +446,10 @@ md -p JIT 2>NUL - + + ../../public; + ../../public; + diff --git a/amxmodx/version.rc b/amxmodx/version.rc index 96b2228f..de953efa 100755 --- a/amxmodx/version.rc +++ b/amxmodx/version.rc @@ -6,13 +6,7 @@ // Generated from the TEXTINCLUDE 2 resource. // #include -#if defined AMBUILD -# include -#else -# define SVN_VERSION_DWORD 1, 8, 3, 0 -# define SVN_VERSION_STRING "dev-local" -# define SVN_VERSION SVN_VERSION_STRING -#endif +#include ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS @@ -32,8 +26,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US // VS_VERSION_INFO VERSIONINFO - FILEVERSION SVN_VERSION_DWORD - PRODUCTVERSION SVN_VERSION_DWORD + FILEVERSION AMXX_VERSION_FILE + PRODUCTVERSION AMXX_VERSION_FILE FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L @@ -50,12 +44,12 @@ BEGIN BEGIN VALUE "Comments", "AMX Mod X" VALUE "FileDescription", "AMX Mod X" - VALUE "FileVersion", SVN_VERSION_STRING + VALUE "FileVersion", AMXX_VERSION_STRING VALUE "InternalName", "amxmodx" VALUE "LegalCopyright", "Copyright (c) 2004-2015, AMX Mod X Dev Team" VALUE "OriginalFilename", "amxmodx_mm.dll" VALUE "ProductName", "AMX Mod X" - VALUE "ProductVersion", SVN_VERSION + VALUE "ProductVersion", AMXX_VERSION_STRING END END BLOCK "VarFileInfo" diff --git a/compiler/amxxpc/amxxpc.vcxproj b/compiler/amxxpc/amxxpc.vcxproj index 6d25c7a1..a9061c7f 100644 --- a/compiler/amxxpc/amxxpc.vcxproj +++ b/compiler/amxxpc/amxxpc.vcxproj @@ -55,29 +55,28 @@ Disabled - WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE; AMX_ANSIONLY;%(PreprocessorDefinitions) + _MBCS;WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE; AMX_ANSIONLY;%(PreprocessorDefinitions) true - EnableFastChecks MultiThreaded false Level3 - EditAndContinue + ProgramDatabase ..\..\public;..\..\third_party;..\..\third_party\zlib;..\..\amxmodx\;C:\Program Files (x86)\Visual Leak Detector\include;%(AdditionalIncludeDirectories) %(AdditionalDependencies) true - $(OutDir)amxxpc.pdb Console MachineX86 - LIBCMT;%(IgnoreSpecificDefaultLibraries) + + - WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE; AMX_ANSIONLY;%(PreprocessorDefinitions) + _MBCS;WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE; AMX_ANSIONLY;%(PreprocessorDefinitions) MultiThreaded Default false diff --git a/modules/cstrike/cstrike/msvc12/cstrike.vcxproj b/modules/cstrike/cstrike/msvc12/cstrike.vcxproj index 91f3b0ab..f26b3ce7 100644 --- a/modules/cstrike/cstrike/msvc12/cstrike.vcxproj +++ b/modules/cstrike/cstrike/msvc12/cstrike.vcxproj @@ -194,6 +194,12 @@ + + + ../../../../public; + ../../../../public; + + diff --git a/modules/cstrike/cstrike/msvc12/cstrike.vcxproj.filters b/modules/cstrike/cstrike/msvc12/cstrike.vcxproj.filters index 3d023ab5..9db0f2ba 100644 --- a/modules/cstrike/cstrike/msvc12/cstrike.vcxproj.filters +++ b/modules/cstrike/cstrike/msvc12/cstrike.vcxproj.filters @@ -42,6 +42,9 @@ {67de85cb-b8e7-4cd6-b8cf-2ff7ed540c2b} + + {1b196636-b242-45a8-ad14-3fb21eb799f7} + @@ -181,4 +184,9 @@ Pawn Includes + + + Resource Files + + \ No newline at end of file diff --git a/modules/cstrike/csx/msvc12/csx.vcxproj b/modules/cstrike/csx/msvc12/csx.vcxproj index 2badf907..baf4c398 100644 --- a/modules/cstrike/csx/msvc12/csx.vcxproj +++ b/modules/cstrike/csx/msvc12/csx.vcxproj @@ -163,7 +163,13 @@ + + + ../../../../public; + ../../../../public; + + - + \ No newline at end of file diff --git a/modules/cstrike/csx/msvc12/csx.vcxproj.filters b/modules/cstrike/csx/msvc12/csx.vcxproj.filters index cc5eab35..cc0710c6 100644 --- a/modules/cstrike/csx/msvc12/csx.vcxproj.filters +++ b/modules/cstrike/csx/msvc12/csx.vcxproj.filters @@ -18,6 +18,9 @@ {3f559917-fcbd-4cd3-8136-8a7a769af465} + + {95e872b8-d195-4d02-8a88-aed2894c54fe} + @@ -67,4 +70,9 @@ Pawn Includes + + + Resource Files + + \ No newline at end of file diff --git a/modules/dod/dodfun/msvc12/dodfun.vcxproj b/modules/dod/dodfun/msvc12/dodfun.vcxproj index cd252817..5c66baf0 100644 --- a/modules/dod/dodfun/msvc12/dodfun.vcxproj +++ b/modules/dod/dodfun/msvc12/dodfun.vcxproj @@ -161,7 +161,13 @@ + + + ../../../../public; + ../../../../public; + + - + \ No newline at end of file diff --git a/modules/dod/dodfun/msvc12/dodfun.vcxproj.filters b/modules/dod/dodfun/msvc12/dodfun.vcxproj.filters index b13a9b2c..285863b7 100644 --- a/modules/dod/dodfun/msvc12/dodfun.vcxproj.filters +++ b/modules/dod/dodfun/msvc12/dodfun.vcxproj.filters @@ -18,6 +18,9 @@ {2deb0e1f-fb04-4734-ae4a-39fa3d4eab86} + + {1441a5c1-9b0c-4dc7-b898-7236588e5f98} + @@ -64,4 +67,9 @@ Pawn Includes + + + Resource Files + + \ No newline at end of file diff --git a/modules/dod/dodx/msvc12/dodx.vcxproj b/modules/dod/dodx/msvc12/dodx.vcxproj index b8134d69..2101f2c0 100644 --- a/modules/dod/dodx/msvc12/dodx.vcxproj +++ b/modules/dod/dodx/msvc12/dodx.vcxproj @@ -164,7 +164,13 @@ + + + ../../../../public; + ../../../../public; + + - + \ No newline at end of file diff --git a/modules/dod/dodx/msvc12/dodx.vcxproj.filters b/modules/dod/dodx/msvc12/dodx.vcxproj.filters index 0052797e..644229de 100644 --- a/modules/dod/dodx/msvc12/dodx.vcxproj.filters +++ b/modules/dod/dodx/msvc12/dodx.vcxproj.filters @@ -18,6 +18,9 @@ {d13b95f6-bd1e-4c68-a7f1-57e4f39ffde3} + + {0f02323b-c637-4625-aa3c-03f1424de34c} + @@ -73,4 +76,9 @@ Pawn Includes + + + Resource Files + + \ No newline at end of file diff --git a/modules/engine/msvc12/engine.vcxproj b/modules/engine/msvc12/engine.vcxproj index 3ebf1a59..cc214aa7 100644 --- a/modules/engine/msvc12/engine.vcxproj +++ b/modules/engine/msvc12/engine.vcxproj @@ -130,7 +130,13 @@ + + + ../../../public; + ../../../public; + + - + \ No newline at end of file diff --git a/modules/engine/msvc12/engine.vcxproj.filters b/modules/engine/msvc12/engine.vcxproj.filters index 29888fb8..d79bc1d6 100644 --- a/modules/engine/msvc12/engine.vcxproj.filters +++ b/modules/engine/msvc12/engine.vcxproj.filters @@ -27,6 +27,9 @@ {6c2c3c74-4dc3-45bf-b3a5-6224971eee69} + + {766da9da-a13a-4f01-a886-570fc28772a6} + @@ -103,4 +106,9 @@ Pawn Includes + + + Resource Files + + \ No newline at end of file diff --git a/modules/fakemeta/msvc12/fakemeta.vcxproj b/modules/fakemeta/msvc12/fakemeta.vcxproj index 3cf5703f..2798db0b 100644 --- a/modules/fakemeta/msvc12/fakemeta.vcxproj +++ b/modules/fakemeta/msvc12/fakemeta.vcxproj @@ -148,6 +148,12 @@ + + + ../../../public; + ../../../public; + + diff --git a/modules/fakemeta/msvc12/fakemeta.vcxproj.filters b/modules/fakemeta/msvc12/fakemeta.vcxproj.filters index bc479670..859e079d 100644 --- a/modules/fakemeta/msvc12/fakemeta.vcxproj.filters +++ b/modules/fakemeta/msvc12/fakemeta.vcxproj.filters @@ -48,6 +48,9 @@ {2800175e-06bf-42bf-b3c1-f86561471531} + + {c5065ec5-3262-49dd-825b-2cf3956e79ac} + @@ -186,4 +189,9 @@ PEV + + + Resource Files + + \ No newline at end of file diff --git a/modules/fun/fun.h b/modules/fun/fun.h index 75e391b1..014591de 100644 --- a/modules/fun/fun.h +++ b/modules/fun/fun.h @@ -103,7 +103,7 @@ class CPlayer private: - int bodyHits_[kMaxClients + 1] {}; + int bodyHits_[kMaxClients + 1]; bool silentFootsteps_ {}; }; diff --git a/modules/fun/msvc12/fun.vcxproj b/modules/fun/msvc12/fun.vcxproj index fd1cea2c..7791b435 100644 --- a/modules/fun/msvc12/fun.vcxproj +++ b/modules/fun/msvc12/fun.vcxproj @@ -19,7 +19,7 @@ DynamicLibrary false MultiByte - v120_xp + v140_xp DynamicLibrary @@ -159,7 +159,13 @@ + + + ../../../public; + ../../../public; + + - + \ No newline at end of file diff --git a/modules/fun/msvc12/fun.vcxproj.filters b/modules/fun/msvc12/fun.vcxproj.filters index a4b5a414..eb94e2da 100644 --- a/modules/fun/msvc12/fun.vcxproj.filters +++ b/modules/fun/msvc12/fun.vcxproj.filters @@ -21,6 +21,9 @@ {d2522a66-df9f-49c8-9f74-ee3738ae3d98} + + {200a07a6-c1a4-4ad1-bda3-3fb5ea7c106a} + @@ -55,4 +58,9 @@ Pawn Includes + + + Resource Files + + \ No newline at end of file diff --git a/modules/geoip/msvc12/geoip.vcxproj b/modules/geoip/msvc12/geoip.vcxproj index e23c0fb0..b86a84f5 100644 --- a/modules/geoip/msvc12/geoip.vcxproj +++ b/modules/geoip/msvc12/geoip.vcxproj @@ -123,6 +123,12 @@ + + + ../../../public; + ../../../public; + + diff --git a/modules/geoip/msvc12/geoip.vcxproj.filters b/modules/geoip/msvc12/geoip.vcxproj.filters index 6836a135..e1a731d7 100644 --- a/modules/geoip/msvc12/geoip.vcxproj.filters +++ b/modules/geoip/msvc12/geoip.vcxproj.filters @@ -21,6 +21,9 @@ {0bd4b9fb-f847-4fe5-af3e-9000fc854c5c} + + {cfe982b9-749c-4d98-ac7b-207290a68c7e} + @@ -76,4 +79,9 @@ Pawn Includes + + + Resource Files + + \ No newline at end of file diff --git a/modules/hamsandwich/msvc12/hamsandwich.vcxproj b/modules/hamsandwich/msvc12/hamsandwich.vcxproj index 1df330f9..5fba745b 100644 --- a/modules/hamsandwich/msvc12/hamsandwich.vcxproj +++ b/modules/hamsandwich/msvc12/hamsandwich.vcxproj @@ -139,7 +139,13 @@ + + + ../../../public; + ../../../public; + + - + \ No newline at end of file diff --git a/modules/hamsandwich/msvc12/hamsandwich.vcxproj.filters b/modules/hamsandwich/msvc12/hamsandwich.vcxproj.filters index c453c475..5036ee1e 100644 --- a/modules/hamsandwich/msvc12/hamsandwich.vcxproj.filters +++ b/modules/hamsandwich/msvc12/hamsandwich.vcxproj.filters @@ -33,6 +33,9 @@ {c26eb07d-14b7-49e9-9122-6b7f5a711ecf} + + {ce1c1544-036d-4339-918f-a716641a3b4f} + @@ -130,4 +133,9 @@ Pawn Includes + + + Resource Files + + \ No newline at end of file diff --git a/modules/json/msvc12/json.vcxproj b/modules/json/msvc12/json.vcxproj index a6d0c836..ab84c8b6 100644 --- a/modules/json/msvc12/json.vcxproj +++ b/modules/json/msvc12/json.vcxproj @@ -114,6 +114,12 @@ + + + ../../../public; + ../../../public; + + diff --git a/modules/json/msvc12/json.vcxproj.filters b/modules/json/msvc12/json.vcxproj.filters index 8c67d724..bd530d20 100644 --- a/modules/json/msvc12/json.vcxproj.filters +++ b/modules/json/msvc12/json.vcxproj.filters @@ -22,6 +22,9 @@ {aaebd544-6579-4a7e-9c6b-2ccc3c0280be} + + {50d2c03b-6783-40f5-8cb5-78ca29e9cfdc} + @@ -59,4 +62,9 @@ Pawn Includes + + + Resource Files + + \ No newline at end of file diff --git a/modules/mysqlx/msvc12/mysqlx.vcxproj b/modules/mysqlx/msvc12/mysqlx.vcxproj index ea8581b7..c875f1e7 100644 --- a/modules/mysqlx/msvc12/mysqlx.vcxproj +++ b/modules/mysqlx/msvc12/mysqlx.vcxproj @@ -91,7 +91,7 @@ ws2_32.lib;..\..\..\..\mysql-5.5\lib\mysqlclient.lib;%(AdditionalDependencies) - %(IgnoreSpecificDefaultLibraries) + LIBCMT;%(IgnoreSpecificDefaultLibraries) true Windows true @@ -100,6 +100,8 @@ MachineX86 .data,RW /EXPORT:GiveFnptrsToDll=_GiveFnptrsToDll@8,@1 %(AdditionalOptions) + $(OutDir)mysql2.pdb + false @@ -209,7 +211,13 @@ + + + ../../../public; + ../../../public; + + - + \ No newline at end of file diff --git a/modules/mysqlx/msvc12/mysqlx.vcxproj.filters b/modules/mysqlx/msvc12/mysqlx.vcxproj.filters index 92502344..2bbffbc6 100644 --- a/modules/mysqlx/msvc12/mysqlx.vcxproj.filters +++ b/modules/mysqlx/msvc12/mysqlx.vcxproj.filters @@ -42,6 +42,9 @@ {557b0e54-eb0e-488f-b8bc-3cee3f8ddfba} + + {746bb65b-17aa-4f58-8afc-0cfff3799bb7} + @@ -217,4 +220,9 @@ Pawn Includes + + + Resource Files + + \ No newline at end of file diff --git a/modules/ns/msvc12/ns.vcxproj b/modules/ns/msvc12/ns.vcxproj index 92eb2f3c..613cf0d2 100644 --- a/modules/ns/msvc12/ns.vcxproj +++ b/modules/ns/msvc12/ns.vcxproj @@ -184,7 +184,13 @@ + + + ../../../public; + ../../../public; + + - + \ No newline at end of file diff --git a/modules/ns/msvc12/ns.vcxproj.filters b/modules/ns/msvc12/ns.vcxproj.filters index 0c46780d..ec38d5ee 100644 --- a/modules/ns/msvc12/ns.vcxproj.filters +++ b/modules/ns/msvc12/ns.vcxproj.filters @@ -18,6 +18,9 @@ {28f804b5-b177-4048-b0c6-36ba103593b9} + + {4cc1fba9-04e0-4d8b-973a-e14073a505de} + @@ -119,4 +122,9 @@ Module SDK + + + Resource Files + + \ No newline at end of file diff --git a/modules/nvault/msvc12/nvault.vcxproj b/modules/nvault/msvc12/nvault.vcxproj index 9b11484f..0d6c76e9 100644 --- a/modules/nvault/msvc12/nvault.vcxproj +++ b/modules/nvault/msvc12/nvault.vcxproj @@ -118,6 +118,12 @@ + + + ../../../public; + ../../../public; + + diff --git a/modules/nvault/msvc12/nvault.vcxproj.filters b/modules/nvault/msvc12/nvault.vcxproj.filters index a0b3e0b4..aada0fbf 100644 --- a/modules/nvault/msvc12/nvault.vcxproj.filters +++ b/modules/nvault/msvc12/nvault.vcxproj.filters @@ -18,6 +18,9 @@ {4722a41b-9bbc-4c55-b0da-315b9f16f618} + + {9c53c0aa-9c17-4dce-a6c0-6f1e0675766d} + @@ -67,4 +70,9 @@ Pawn Includes + + + Resource Files + + \ No newline at end of file diff --git a/modules/regex/msvc12/regex.vcxproj b/modules/regex/msvc12/regex.vcxproj index c003b909..5547acbb 100644 --- a/modules/regex/msvc12/regex.vcxproj +++ b/modules/regex/msvc12/regex.vcxproj @@ -114,6 +114,12 @@ + + + ../../../public; + ../../../public; + + diff --git a/modules/regex/msvc12/regex.vcxproj.filters b/modules/regex/msvc12/regex.vcxproj.filters index eca67379..e952dd6a 100644 --- a/modules/regex/msvc12/regex.vcxproj.filters +++ b/modules/regex/msvc12/regex.vcxproj.filters @@ -18,6 +18,9 @@ {c5722376-8e24-440a-9f13-023f19099b30} + + {2e1aa30c-3176-440f-a39c-3733f9f8d503} + @@ -55,4 +58,9 @@ Pawn Includes + + + Resource Files + + \ No newline at end of file diff --git a/modules/sockets/msvc12/sockets.vcxproj b/modules/sockets/msvc12/sockets.vcxproj index 8920980e..110a7bba 100644 --- a/modules/sockets/msvc12/sockets.vcxproj +++ b/modules/sockets/msvc12/sockets.vcxproj @@ -108,6 +108,12 @@ + + + ../../../public; + ../../../public; + + diff --git a/modules/sockets/msvc12/sockets.vcxproj.filters b/modules/sockets/msvc12/sockets.vcxproj.filters index 8582b30b..9dee420b 100644 --- a/modules/sockets/msvc12/sockets.vcxproj.filters +++ b/modules/sockets/msvc12/sockets.vcxproj.filters @@ -18,6 +18,9 @@ {ffbc64d0-627e-4b7b-851d-f0c0cb9030ed} + + {ea476f56-a723-4227-b805-64745134c852} + @@ -40,4 +43,9 @@ Pawn Includes + + + Resource Files + + \ No newline at end of file diff --git a/modules/sqlite/msvc12/sqlite.vcxproj b/modules/sqlite/msvc12/sqlite.vcxproj index 86742fed..b19e8a29 100644 --- a/modules/sqlite/msvc12/sqlite.vcxproj +++ b/modules/sqlite/msvc12/sqlite.vcxproj @@ -149,7 +149,13 @@ + + + ../../../public; + ../../../public; + + - + \ No newline at end of file diff --git a/modules/sqlite/msvc12/sqlite.vcxproj.filters b/modules/sqlite/msvc12/sqlite.vcxproj.filters index c2e957b4..1f9952cd 100644 --- a/modules/sqlite/msvc12/sqlite.vcxproj.filters +++ b/modules/sqlite/msvc12/sqlite.vcxproj.filters @@ -39,6 +39,9 @@ {e0a36119-bb5b-4f07-9e0e-80f9aa7a7d21} + + {9595267e-27de-4ad9-b2cd-ecd10c9513ae} + @@ -145,4 +148,9 @@ Pawn Includes + + + Resource Files + + \ No newline at end of file diff --git a/modules/tfcx/msvc12/tfcx.vcxproj b/modules/tfcx/msvc12/tfcx.vcxproj index efd0a97d..b7c54bc4 100644 --- a/modules/tfcx/msvc12/tfcx.vcxproj +++ b/modules/tfcx/msvc12/tfcx.vcxproj @@ -164,7 +164,13 @@ + + + ../../../public; + ../../../public; + + - + \ No newline at end of file diff --git a/modules/tfcx/msvc12/tfcx.vcxproj.filters b/modules/tfcx/msvc12/tfcx.vcxproj.filters index d1eb4e85..186af755 100644 --- a/modules/tfcx/msvc12/tfcx.vcxproj.filters +++ b/modules/tfcx/msvc12/tfcx.vcxproj.filters @@ -18,6 +18,9 @@ {be880015-6e29-4a0b-8301-e79f2e8231f6} + + {8da747a0-926a-4603-9877-c9324c6c7c8d} + @@ -73,4 +76,9 @@ Pawn Includes + + + Resource Files + + \ No newline at end of file diff --git a/modules/ts/tsfun/msvc12/tsfun.vcxproj b/modules/ts/tsfun/msvc12/tsfun.vcxproj index 05972e4d..97707b41 100644 --- a/modules/ts/tsfun/msvc12/tsfun.vcxproj +++ b/modules/ts/tsfun/msvc12/tsfun.vcxproj @@ -144,6 +144,12 @@ + + + ../../../../public; + ../../../../public; + + diff --git a/modules/ts/tsfun/msvc12/tsfun.vcxproj.filters b/modules/ts/tsfun/msvc12/tsfun.vcxproj.filters index 9373be25..6f69a4b5 100644 --- a/modules/ts/tsfun/msvc12/tsfun.vcxproj.filters +++ b/modules/ts/tsfun/msvc12/tsfun.vcxproj.filters @@ -11,6 +11,9 @@ {cfef04ba-c30c-466a-93ca-94ebda8e8c7e} + + {7050bcc2-ace8-46a1-95cc-bf360fdb28eb} + @@ -25,4 +28,9 @@ Module SDK\SDK Base + + + Resource Files + + \ No newline at end of file diff --git a/modules/ts/tsx/msvc12/tsx.vcxproj b/modules/ts/tsx/msvc12/tsx.vcxproj index c8b47ce6..f1082a95 100644 --- a/modules/ts/tsx/msvc12/tsx.vcxproj +++ b/modules/ts/tsx/msvc12/tsx.vcxproj @@ -160,7 +160,13 @@ + + + ../../../../public; + ../../../../public; + + - + \ No newline at end of file diff --git a/modules/ts/tsx/msvc12/tsx.vcxproj.filters b/modules/ts/tsx/msvc12/tsx.vcxproj.filters index ec2078af..676d3cf6 100644 --- a/modules/ts/tsx/msvc12/tsx.vcxproj.filters +++ b/modules/ts/tsx/msvc12/tsx.vcxproj.filters @@ -15,6 +15,9 @@ {bb25b7bf-a54d-448d-998f-a5278f379fe8} + + {668912fb-d2b2-4cbe-b395-aa45a9663ee2} + @@ -62,4 +65,9 @@ Module SDK + + + Resource Files + + \ No newline at end of file diff --git a/plugins/include/amxmodx_version.inc b/plugins/include/amxmodx_version.inc index 7d9c502a..eb2215dd 100644 --- a/plugins/include/amxmodx_version.inc +++ b/plugins/include/amxmodx_version.inc @@ -12,6 +12,6 @@ #endif #define _amxmodx_version_included -#define AMXX_VERSION 1.83 -#define AMXX_VERSION_NUM 183 -stock const AMXX_VERSION_STR[] = "1.8.3-manual"; +#define AMXX_VERSION 1.9.0 +#define AMXX_VERSION_NUM 190 +stock const AMXX_VERSION_STR[] = "1.9.0-manual";