From 24c7563478c75ab9644b772d58775dd2b14a7e40 Mon Sep 17 00:00:00 2001 From: Zack Middleton Date: Tue, 18 Aug 2015 18:14:06 -0500 Subject: [PATCH] Copy msvc11 build changes to msvc10 --- misc/msvc10/cgame.vcxproj | 2 ++ misc/msvc10/game.vcxproj | 2 ++ misc/msvc10/q3_ui.vcxproj | 1 + misc/msvc10/quake3.vcxproj | 26 +++++++++++++++----------- misc/msvc10/ui.vcxproj | 1 + 5 files changed, 21 insertions(+), 11 deletions(-) diff --git a/misc/msvc10/cgame.vcxproj b/misc/msvc10/cgame.vcxproj index 3206f749..1f099bdd 100644 --- a/misc/msvc10/cgame.vcxproj +++ b/misc/msvc10/cgame.vcxproj @@ -277,6 +277,7 @@ $(IntDir)$(TargetName).lib MachineX86 + false @@ -469,6 +470,7 @@ $(IntDir)$(TargetName).lib MachineX86 + false diff --git a/misc/msvc10/game.vcxproj b/misc/msvc10/game.vcxproj index 207b6cec..99fa92a6 100644 --- a/misc/msvc10/game.vcxproj +++ b/misc/msvc10/game.vcxproj @@ -180,6 +180,7 @@ $(IntDir)$(TargetName).lib MachineX86 + false @@ -276,6 +277,7 @@ $(IntDir)$(TargetName).lib MachineX86 + false diff --git a/misc/msvc10/q3_ui.vcxproj b/misc/msvc10/q3_ui.vcxproj index cde14875..e73ef4b4 100644 --- a/misc/msvc10/q3_ui.vcxproj +++ b/misc/msvc10/q3_ui.vcxproj @@ -468,6 +468,7 @@ $(IntDir)uix86.lib MachineX86 + false diff --git a/misc/msvc10/quake3.vcxproj b/misc/msvc10/quake3.vcxproj index b1790cf9..c506898a 100644 --- a/misc/msvc10/quake3.vcxproj +++ b/misc/msvc10/quake3.vcxproj @@ -154,10 +154,10 @@ MaxSpeed AnySuitable - ..\..\code\SDL12\include;..\..\code\libcurl;..\..\code\AL;..\..\code\libspeex\include;..\..\code\zlib;..\..\code\jpeg-8c;%(AdditionalIncludeDirectories) + ..\..\code\SDL12\include;..\..\code\libcurl-7.35.0;..\..\code\AL;..\..\code\libspeex\include;..\..\code\zlib;..\..\code\jpeg-8c;%(AdditionalIncludeDirectories) _WIN32;WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;BOTLIB;USE_ICON;USE_CURL;USE_CURL_DLOPEN;USE_OPENAL;USE_OPENAL_DLOPEN;USE_VOIP;USE_INTERNAL_JPEG;HAVE_CONFIG_H;MISSIONPACK;%(PreprocessorDefinitions) true - MultiThreaded + MultiThreadedDLL true @@ -189,6 +189,7 @@ MachineX86 libcmt.lib + false Post build processing.. @@ -207,7 +208,7 @@ MaxSpeed AnySuitable - ..\..\code\SDL12\include;..\..\code\libcurl;..\..\code\AL;..\..\code\libspeex\include;..\..\code\zlib;..\..\code\jpeg-8c;%(AdditionalIncludeDirectories) + ..\..\code\SDL12\include;..\..\code\libcurl-7.35.0;..\..\code\AL;..\..\code\libspeex\include;..\..\code\zlib;..\..\code\jpeg-8c;%(AdditionalIncludeDirectories) _WIN32;WIN32;_WIN64;__WIN64__;NDEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;BOTLIB;USE_ICON;USE_CURL;USE_CURL_DLOPEN;USE_OPENAL;USE_OPENAL_DLOPEN;USE_VOIP;USE_INTERNAL_JPEG;HAVE_CONFIG_H;MISSIONPACK;%(PreprocessorDefinitions) true MultiThreaded @@ -260,7 +261,7 @@ Disabled - ..\..\code\SDL12\include;..\..\code\libcurl;..\..\code\AL;..\..\code\libspeex\include;..\..\code\zlib;..\..\code\jpeg-8c;%(AdditionalIncludeDirectories) + ..\..\code\SDL12\include;..\..\code\libcurl-7.35.0;..\..\code\AL;..\..\code\libspeex\include;..\..\code\zlib;..\..\code\jpeg-8c;%(AdditionalIncludeDirectories) _WIN32;WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;BOTLIB;USE_ICON;USE_CURL;USE_CURL_DLOPEN;USE_OPENAL;USE_OPENAL_DLOPEN;USE_VOIP;USE_INTERNAL_JPEG;HAVE_CONFIG_H;%(PreprocessorDefinitions) MultiThreadedDebugDLL @@ -298,6 +299,7 @@ MachineX86 + false Post build processing.. @@ -315,7 +317,7 @@ Disabled - ..\..\code\SDL12\include;..\..\code\libcurl;..\..\code\AL;..\..\code\libspeex\include;..\..\code\zlib;..\..\code\jpeg-8c;%(AdditionalIncludeDirectories) + ..\..\code\SDL12\include;..\..\code\libcurl-7.35.0;..\..\code\AL;..\..\code\libspeex\include;..\..\code\zlib;..\..\code\jpeg-8c;%(AdditionalIncludeDirectories) _WIN32;WIN32;_WIN64;__WIN64__;_DEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;BOTLIB;USE_ICON;USE_CURL;USE_CURL_DLOPEN;USE_OPENAL;USE_OPENAL_DLOPEN;USE_VOIP;USE_INTERNAL_JPEG;HAVE_CONFIG_H;%(PreprocessorDefinitions) MultiThreadedDebugDLL @@ -372,10 +374,10 @@ MaxSpeed AnySuitable - ..\..\code\SDL12\include;..\..\code\libcurl;..\..\code\AL;..\..\code\libspeex\include;..\..\code\zlib;..\..\code\jpeg-8c;%(AdditionalIncludeDirectories) + ..\..\code\SDL12\include;..\..\code\libcurl-7.35.0;..\..\code\AL;..\..\code\libspeex\include;..\..\code\zlib;..\..\code\jpeg-8c;%(AdditionalIncludeDirectories) _WIN32;WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;BOTLIB;USE_ICON;USE_CURL;USE_CURL_DLOPEN;USE_OPENAL;USE_OPENAL_DLOPEN;USE_VOIP;USE_INTERNAL_JPEG;HAVE_CONFIG_H;%(PreprocessorDefinitions) true - MultiThreaded + MultiThreadedDLL true @@ -407,6 +409,7 @@ MachineX86 libcmt.lib + false @@ -421,10 +424,10 @@ MaxSpeed AnySuitable - ..\..\code\SDL12\include;..\..\code\libcurl;..\..\code\AL;..\..\code\libspeex\include;..\..\code\zlib;..\..\code\jpeg-8c;%(AdditionalIncludeDirectories) + ..\..\code\SDL12\include;..\..\code\libcurl-7.35.0;..\..\code\AL;..\..\code\libspeex\include;..\..\code\zlib;..\..\code\jpeg-8c;%(AdditionalIncludeDirectories) _WIN32;WIN32;_WIN64;__WIN64__;NDEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;BOTLIB;USE_ICON;USE_CURL;USE_CURL_DLOPEN;USE_OPENAL;USE_OPENAL_DLOPEN;USE_VOIP;USE_INTERNAL_JPEG;HAVE_CONFIG_H;%(PreprocessorDefinitions) true - MultiThreaded + MultiThreadedDLL true @@ -469,7 +472,7 @@ Disabled - ..\..\code\SDL12\include;..\..\code\libcurl;..\..\code\AL;..\..\code\libspeex\include;..\..\code\zlib;..\..\code\jpeg-8c;%(AdditionalIncludeDirectories) + ..\..\code\SDL12\include;..\..\code\libcurl-7.35.0;..\..\code\AL;..\..\code\libspeex\include;..\..\code\zlib;..\..\code\jpeg-8c;%(AdditionalIncludeDirectories) _WIN32;WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;BOTLIB;USE_ICON;USE_CURL;USE_CURL_DLOPEN;USE_OPENAL;USE_OPENAL_DLOPEN;USE_VOIP;USE_INTERNAL_JPEG;HAVE_CONFIG_H;MISSIONPACK;%(PreprocessorDefinitions) MultiThreadedDebugDLL @@ -507,6 +510,7 @@ MachineX86 + false Post build processing.. @@ -524,7 +528,7 @@ Disabled - ..\..\code\SDL12\include;..\..\code\libcurl;..\..\code\AL;..\..\code\libspeex\include;..\..\code\zlib;..\..\code\jpeg-8c;%(AdditionalIncludeDirectories) + ..\..\code\SDL12\include;..\..\code\libcurl-7.35.0;..\..\code\AL;..\..\code\libspeex\include;..\..\code\zlib;..\..\code\jpeg-8c;%(AdditionalIncludeDirectories) _WIN32;WIN32;_WIN64;__WIN64__;_DEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;BOTLIB;USE_ICON;USE_CURL;USE_CURL_DLOPEN;USE_OPENAL;USE_OPENAL_DLOPEN;USE_VOIP;USE_INTERNAL_JPEG;HAVE_CONFIG_H;MISSIONPACK;%(PreprocessorDefinitions) MultiThreadedDebugDLL diff --git a/misc/msvc10/ui.vcxproj b/misc/msvc10/ui.vcxproj index c0173217..9a449337 100644 --- a/misc/msvc10/ui.vcxproj +++ b/misc/msvc10/ui.vcxproj @@ -472,6 +472,7 @@ $(IntDir)uix86.lib MachineX86 + false