From 70cf0c09a875f578cc9be9ebf7a900c3e857a2a5 Mon Sep 17 00:00:00 2001 From: madmaxoft Date: Mon, 2 Dec 2013 22:36:43 +0100 Subject: [PATCH] The server builds and uses Lua as DLL in Debug mode. This is a test to see how LuaRocks will interact. Only debug mode on Windows is affected, all other platforms and modes are unchanged. --- MCServer/.gitignore | 4 ++++ VC2008/Lua.vcproj | 18 +++++++++++------- VC2008/MCServer.vcproj | 2 +- 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/MCServer/.gitignore b/MCServer/.gitignore index c03bcbe99..1fed134fe 100644 --- a/MCServer/.gitignore +++ b/MCServer/.gitignore @@ -1,4 +1,7 @@ *.exe +*.dll +*.exp +*.lib *.ini MCServer logs @@ -20,3 +23,4 @@ valgrind.log motd.txt *.deuser *.dmp +*.xml diff --git a/VC2008/Lua.vcproj b/VC2008/Lua.vcproj index 326ba6411..4dee8c06e 100644 --- a/VC2008/Lua.vcproj +++ b/VC2008/Lua.vcproj @@ -20,7 +20,7 @@ Name="Debug|Win32" OutputDirectory="$(SolutionDir)$(ConfigurationName)\Lua" IntermediateDirectory="$(ConfigurationName)\Lua" - ConfigurationType="4" + ConfigurationType="2" CharacterSet="1" > + @@ -73,6 +78,9 @@ + @@ -375,10 +383,6 @@ RelativePath="..\lib\lua\src\ltm.c" > - - diff --git a/VC2008/MCServer.vcproj b/VC2008/MCServer.vcproj index 95e10ba40..e5de93f98 100644 --- a/VC2008/MCServer.vcproj +++ b/VC2008/MCServer.vcproj @@ -43,7 +43,7 @@ AdditionalOptions="/MP" Optimization="0" AdditionalIncludeDirectories=""../lib/jsoncpp/include";../lib" - PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;XML_STATIC" + PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;XML_STATIC;LUA_BUILD_AS_DLL" MinimalRebuild="false" BasicRuntimeChecks="3" RuntimeLibrary="1"