From 664ef6bcad4774ce8d883372bd48045afefb0252 Mon Sep 17 00:00:00 2001 From: conde2 Date: Wed, 18 Jan 2017 11:20:09 -0200 Subject: [PATCH] Update Visual Studio Project Update Visual Studio to work with PATH system variables in Windows systems. Credits go to @Radseq for changing the project and to me for update to Visual Studio 2015 Closes #795 #746 #718 #724 #713 --- vc14/arch32.props | 12 ++ vc14/arch64.props | 17 +++ vc14/debug.props | 24 ++++ vc14/otclient.vcxproj | 100 +++++--------- vc14/register_otclient_boost_env.bat | 1 + vc14/register_otclient_sdk_env.bat | 1 + vc14/release.props | 20 +++ vc14/settings.props | 188 +++++++++++++++++++++++++++ 8 files changed, 293 insertions(+), 70 deletions(-) create mode 100644 vc14/arch32.props create mode 100644 vc14/arch64.props create mode 100644 vc14/debug.props create mode 100644 vc14/register_otclient_boost_env.bat create mode 100644 vc14/register_otclient_sdk_env.bat create mode 100644 vc14/release.props create mode 100644 vc14/settings.props diff --git a/vc14/arch32.props b/vc14/arch32.props new file mode 100644 index 00000000..b3f250b9 --- /dev/null +++ b/vc14/arch32.props @@ -0,0 +1,12 @@ + + + + + + + $(OTCLIENT_LIBS) + true + + + + \ No newline at end of file diff --git a/vc14/arch64.props b/vc14/arch64.props new file mode 100644 index 00000000..9d3daebc --- /dev/null +++ b/vc14/arch64.props @@ -0,0 +1,17 @@ + + + + + + + Speed + true + StreamingSIMDExtensions2 + Fast + + + $(OTCLIENT_LIBS64) + + + + \ No newline at end of file diff --git a/vc14/debug.props b/vc14/debug.props new file mode 100644 index 00000000..33e0f4a6 --- /dev/null +++ b/vc14/debug.props @@ -0,0 +1,24 @@ + + + + + + $(ProjectDir)../ + true + + + + false + false + EnableFastChecks + MultiThreadedDebugDLL + $(IntDir)\obj_r\%(RelativeDir) + /bigobj%(AdditionalOptions) + + + $(OTCLIENT_LIBDEPS_D) + + + + + diff --git a/vc14/otclient.vcxproj b/vc14/otclient.vcxproj index 667dc769..037f5073 100644 --- a/vc14/otclient.vcxproj +++ b/vc14/otclient.vcxproj @@ -19,6 +19,7 @@ + Win32Proj {17A8F78F-1FFB-4128-A3B3-59CC6C19D89A} otclient @@ -27,144 +28,103 @@ Application true v140 - MultiByte Application true v140 - MultiByte Application false v140 - true - MultiByte Application false v140 - true - MultiByte + + + + + + + + + + + + - D:\otclient-msvc13-libs\libogg-1.3.1\include;D:\otclient-msvc13-libs\libvorbis-1.3.3\include;D:\otclient-msvc13-libs\physfs-2.0.3\include;D:\otclient-msvc13-libs\OpenSSL-1.0.1e\include;D:\otclient-msvc13-libs\zlib-1.2.5\include;D:\otclient-msvc13-libs\OpenAL\include\AL;D:\otclient-msvc13-libs\glew-1.10.0\include;D:\otclient-msvc13-libs\LuaJIT-2.0.2\include;D:\otclient-msvc13-libs\boost_1_55_0\include;D:\otclient\src;..\src;$(IncludePath) - D:\otclient-msvc13-libs\libogg-1.3.1\lib;D:\otclient-msvc13-libs\libvorbis-1.3.3\lib;D:\otclient-msvc13-libs\physfs-2.0.3\lib;D:\otclient-msvc13-libs\OpenSSL-1.0.1e\lib\VC;D:\otclient-msvc13-libs\zlib-1.2.5\lib;D:\otclient-msvc13-libs\OpenAL\lib;D:\otclient-msvc13-libs\LuaJIT-2.0.2\lib;D:\otclient-msvc13-libs\glew-1.10.0\lib;D:\otclient-msvc13-libs\boost_1_55_0\lib;$(LibraryPath) - - - D:\otclient-msvc13-libs\libogg-1.3.1\include;D:\otclient-msvc13-libs\libvorbis-1.3.3\include;D:\otclient-msvc13-libs\physfs-2.0.3\include;D:\otclient-msvc13-libs\OpenSSL-1.0.1e\include;D:\otclient-msvc13-libs\zlib-1.2.5\include;D:\otclient-msvc13-libs\OpenAL\include\AL;D:\otclient-msvc13-libs\glew-1.10.0\include;D:\otclient-msvc13-libs\LuaJIT-2.0.2\include;D:\otclient-msvc13-libs\boost_1_55_0\include;D:\otclient\src;..\src;$(IncludePath) - D:\otclient-msvc13-libs\libogg-1.3.1\lib;D:\otclient-msvc13-libs\libvorbis-1.3.3\lib;D:\otclient-msvc13-libs\physfs-2.0.3\lib;D:\otclient-msvc13-libs\OpenSSL-1.0.1e\lib\VC;D:\otclient-msvc13-libs\zlib-1.2.5\lib;D:\otclient-msvc13-libs\OpenAL\lib;D:\otclient-msvc13-libs\LuaJIT-2.0.2\lib;D:\otclient-msvc13-libs\glew-1.10.0\lib;D:\otclient-msvc13-libs\boost_1_55_0\lib;$(LibraryPath) + $(VC_IncludePath);$(WindowsSDK_IncludePath);../src; + - D:\otclient-msvc13-libs\libogg-1.3.1\include;D:\otclient-msvc13-libs\libvorbis-1.3.3\include;D:\otclient-msvc13-libs\physfs-2.0.3\include;D:\otclient-msvc13-libs\OpenSSL-1.0.1e\include;D:\otclient-msvc13-libs\zlib-1.2.5\include;D:\otclient-msvc13-libs\OpenAL\include\AL;D:\otclient-msvc13-libs\glew-1.10.0\include;D:\otclient-msvc13-libs\LuaJIT-2.0.2\include;D:\otclient-msvc13-libs\boost_1_55_0\include;..\src;$(IncludePath) - D:\otclient-msvc13-libs\libogg-1.3.1\lib;D:\otclient-msvc13-libs\libvorbis-1.3.3\lib;D:\otclient-msvc13-libs\physfs-2.0.3\lib;D:\otclient-msvc13-libs\OpenSSL-1.0.1e\lib\VC;D:\otclient-msvc13-libs\zlib-1.2.5\lib;D:\otclient-msvc13-libs\OpenAL\lib;D:\otclient-msvc13-libs\LuaJIT-2.0.2\lib;D:\otclient-msvc13-libs\glew-1.10.0\lib;D:\otclient-msvc13-libs\boost_1_55_0\lib;$(LibraryPath) + $(VC_IncludePath);$(WindowsSDK_IncludePath);../src; - D:\otclient-msvc13-libs\libogg-1.3.1\include;D:\otclient-msvc13-libs\libvorbis-1.3.3\include;D:\otclient-msvc13-libs\physfs-2.0.3\include;D:\otclient-msvc13-libs\OpenSSL-1.0.1e\include;D:\otclient-msvc13-libs\zlib-1.2.5\include;D:\otclient-msvc13-libs\OpenAL\include\AL;D:\otclient-msvc13-libs\glew-1.10.0\include;D:\otclient-msvc13-libs\LuaJIT-2.0.2\include;D:\otclient-msvc13-libs\boost_1_55_0\include;D:\otclient\src;..\src;$(IncludePath) - D:\otclient-msvc13-libs\libogg-1.3.1\lib;D:\otclient-msvc13-libs\libvorbis-1.3.3\lib;D:\otclient-msvc13-libs\physfs-2.0.3\lib;D:\otclient-msvc13-libs\OpenSSL-1.0.1e\lib\VC;D:\otclient-msvc13-libs\zlib-1.2.5\lib;D:\otclient-msvc13-libs\OpenAL\lib;D:\otclient-msvc13-libs\LuaJIT-2.0.2\lib;D:\otclient-msvc13-libs\glew-1.10.0\lib;D:\otclient-msvc13-libs\boost_1_55_0\lib;$(LibraryPath) + $(VC_IncludePath);$(WindowsSDK_IncludePath);../src; - Level3 + $(PREPROCESSOR_DEFS);_SCL_SECURE_NO_WARNINGS;ZLIB_WINAPI;%(PreprocessorDefinitions) + ProgramDatabase Disabled - true - WIN32;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0501;BOT_PROTECTION;CLIENT;CRASH_HANDLER;FW_GRAPHICS;FW_NET;FW_SOUND;FW_XML;BUILD_TYPE="RelWithDebInfo";BUILD_COMMIT="devel";BUILD_REVISION="0";VERSION="0.6.3";%(PreprocessorDefinitions) - $(IntDir)\$(Platform)\src\%(RelativeDir)\ - /bigobj %(AdditionalOptions) + MachineX86 true - libcmt.lib - glew32.lib;zlib1.lib;libeay32MD.lib;physfs.lib;openal32.lib;luajit.lib;libogg_static.lib;libvorbisfile_static.lib;libvorbis_static.lib;opengl32.lib;dbghelp.lib;%(AdditionalDependencies) - true - Windows - mainCRTStartup - /bigobj %(AdditionalOptions) - Level3 - Disabled - true - WIN32;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;_WIN32_WINNT=0x0501;BOT_PROTECTION;CLIENT;CRASH_HANDLER;FW_GRAPHICS;FW_NET;FW_SOUND;FW_XML;BUILD_TYPE="RelWithDebInfo";BUILD_COMMIT="devel";BUILD_REVISION="0";VERSION="0.6.3";%(PreprocessorDefinitions) - $(IntDir)\$(Platform)\src\%(RelativeDir)\ - StreamingSIMDExtensions2 - Fast + $(PREPROCESSOR_DEFS);_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + ProgramDatabase true - libcmt.lib - glew32.lib;zlib1.lib;libeay32MD.lib;physfs.lib;openal32.lib;luajit.lib;libogg_static.lib;libvorbisfile_static.lib;libvorbis_static.lib;opengl32.lib;dbghelp.lib;%(AdditionalDependencies) - true - Windows - mainCRTStartup - Level3 - MaxSpeed - true - true - true - WIN32;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0501;BOT_PROTECTION;CLIENT;CRASH_HANDLER;FW_GRAPHICS;FW_NET;FW_SOUND;FW_XML;BUILD_TYPE="RelWithDebInfo";BUILD_COMMIT="devel";BUILD_REVISION="0";VERSION="0.6.3";%(PreprocessorDefinitions) - true - $(IntDir)\$(Platform)\src\%(RelativeDir)\ + $(PREPROCESSOR_DEFS);%(PreprocessorDefinitions) + MultiThreaded + MachineX86 true true true - glew32.lib;zlib1.lib;libeay32MD.lib;physfs.lib;openal32.lib;luajit.lib;libogg_static.lib;libvorbisfile_static.lib;libvorbis_static.lib;opengl32.lib;dbghelp.lib;%(AdditionalDependencies) - Windows - mainCRTStartup - libcmt.lib - true - Level3 - MaxSpeed - true - true - true - WIN32;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;_WIN32_WINNT=0x0501;BOT_PROTECTION;CLIENT;CRASH_HANDLER;FW_GRAPHICS;FW_NET;FW_SOUND;FW_XML;BUILD_TYPE="RelWithDebInfo";BUILD_COMMIT="devel";BUILD_REVISION="0";VERSION="0.6.3";%(PreprocessorDefinitions) - true - $(IntDir)\$(Platform)\src\%(RelativeDir)\ - Speed - true - StreamingSIMDExtensions2 - Fast + $(PREPROCESSOR_DEFS);%(PreprocessorDefinitions) + MultiThreadedDLL + ProgramDatabase + Level4 true true true - glew32.lib;zlib1.lib;libeay32MD.lib;physfs.lib;openal32.lib;luajit.lib;libogg_static.lib;libvorbisfile_static.lib;libvorbis_static.lib;opengl32.lib;dbghelp.lib;%(AdditionalDependencies) - Windows - mainCRTStartup - libcmt.lib - true @@ -499,4 +459,4 @@ - + \ No newline at end of file diff --git a/vc14/register_otclient_boost_env.bat b/vc14/register_otclient_boost_env.bat new file mode 100644 index 00000000..f8a8c4d9 --- /dev/null +++ b/vc14/register_otclient_boost_env.bat @@ -0,0 +1 @@ +setx BOOST_ROOT_OTCLIENT %CD% \ No newline at end of file diff --git a/vc14/register_otclient_sdk_env.bat b/vc14/register_otclient_sdk_env.bat new file mode 100644 index 00000000..72965fd9 --- /dev/null +++ b/vc14/register_otclient_sdk_env.bat @@ -0,0 +1 @@ +setx OTCLIENTSDKDir %CD% \ No newline at end of file diff --git a/vc14/release.props b/vc14/release.props new file mode 100644 index 00000000..309d9632 --- /dev/null +++ b/vc14/release.props @@ -0,0 +1,20 @@ + + + + + + $(ProjectDir)../ + false + + + + Full + $(IntDir)\obj_r\%(RelativeDir) + + + UseLinkTimeCodeGeneration + + + + + diff --git a/vc14/settings.props b/vc14/settings.props new file mode 100644 index 00000000..901332ea --- /dev/null +++ b/vc14/settings.props @@ -0,0 +1,188 @@ + + + + + $(OTCLIENTSDKDir)\LuaJIT-2.1.0\ + $(OTCLIENTSDKDir)\glew-2.0.0\ + $(OTCLIENTSDKDir)\libogg-1.3.2\ + $(OTCLIENTSDKDir)\libvorbis-1.3.5\ + $(OTCLIENTSDKDir)\OpenAL-1.15.1\ + $(OTCLIENTSDKDir)\OpenSSL-1.0.2j\ + $(OTCLIENTSDKDir)\physfs-2.0.3.1\ + $(OTCLIENTSDKDir)\zlib-1.2.8.8\ + + + WIN32; + _CRT_SECURE_NO_WARNINGS; + _WIN32_WINNT=0x0501; + BOT_PROTECTION; + OTCLIENT; + CRASH_HANDLER; + FW_GRAPHICS; + FW_NET; + FW_SOUND; + FW_XML; + BUILD_TYPE="RelWithDebInfo"; + BUILD_COMMIT="devel"; + BUILD_REVISION="0"; + VERSION="0.6.3"; + AB + + + + $(BOOST_ROOT_OTCLIENT); + $(LUA_DIR)\include; + $(GLEW_DIR)\include; + $(LIBOGG_DIR)\include; + $(LIBVORBIS_DIR)\include; + $(OPEN_AL_DIR)\include; + $(OPEN_SSL_DIR)\include; + $(PHYSFS_DIR)\include; + $(ZLIB_DIR)\include + + + + $(BOOST_ROOT_OTCLIENT)\lib32-msvc-14.0; + $(LUA_DIR)\lib; + $(GLEW_DIR)\lib; + $(LIBOGG_DIR)\lib; + $(LIBVORBIS_DIR)\lib; + $(OPEN_AL_DIR)\lib; + $(OPEN_SSL_DIR)\lib; + $(PHYSFS_DIR)\lib; + $(ZLIB_DIR)\lib + + + + $(BOOST_ROOT_OTCLIENT)\lib64-msvc-14.0; + $(LUA_DIR)\lib64; + $(GLEW_DIR)\lib64; + $(LIBOGG_DIR)\lib64; + $(LIBVORBIS_DIR)\lib64; + $(OPEN_AL_DIR)\lib64; + $(OPEN_SSL_DIR)\lib64; + $(PHYSFS_DIR)\lib64; + $(ZLIB_DIR)\lib64 + + + + glew32.lib; + zlib.lib; + libeay32.lib; + physfs.lib; + openal32.lib; + lua51.lib; + ogg.lib; + vorbisfile.lib; + vorbis.lib; + opengl32.lib; + dbghelp.lib; + kernel32.lib; + user32.lib; + shell32.lib; + gdi32.lib; + advapi32.lib; + + + + glew32.lib; + zlib.lib; + libeay32.lib; + physfs.lib; + openal32.lib; + lua51.lib; + ogg.lib; + vorbisfile.lib; + vorbis.lib; + opengl32.lib; + dbghelp.lib; + kernel32.lib; + user32.lib; + shell32.lib; + gdi32.lib; + advapi32.lib; + + + + + false + + + + $(OTCLIENT_INCLUDES) + Level3 + true + true + MultiThreaded + + + $(OTCLIENT_LIBDEPS) + Default + libcmt.lib + true + Windows + mainCRTStartup + + + + + + $(LUA_DIR) + true + + + $(GLEW_DIR) + true + + + $(LIBOGG_DIR) + true + + + $(LIBVORBIS_DIR) + true + + + $(OPEN_AL_DIR) + true + + + $(OPEN_SSL_DIR) + true + + + $(PHYSFS_DIR) + true + + + $(ZLIB_DIR) + true + + + + $(PREPROCESSOR_DEFS) + true + + + $(OTCLIENT_INCLUDES) + true + + + $(OTCLIENT_LIBS) + true + + + $(OTCLIENT_LIBS64) + true + + + $(OTCLIENT_LIBDEPS) + true + + + $(OTCLIENT_LIBDEPS_D) + + + \ No newline at end of file