diff options
| author | madmaxoft <github@xoft.cz> | 2013-12-02 22:36:43 +0100 |
|---|---|---|
| committer | madmaxoft <github@xoft.cz> | 2013-12-02 22:36:59 +0100 |
| commit | 70cf0c09a875f578cc9be9ebf7a900c3e857a2a5 (patch) | |
| tree | 32a8cfeaac42a8945b9840895aeefb4a3452ebf1 | |
| parent | APIDump: Added missing params to OnPlayerRightClick() hook. (diff) | |
| download | cuberite-70cf0c09a875f578cc9be9ebf7a900c3e857a2a5.tar cuberite-70cf0c09a875f578cc9be9ebf7a900c3e857a2a5.tar.gz cuberite-70cf0c09a875f578cc9be9ebf7a900c3e857a2a5.tar.bz2 cuberite-70cf0c09a875f578cc9be9ebf7a900c3e857a2a5.tar.lz cuberite-70cf0c09a875f578cc9be9ebf7a900c3e857a2a5.tar.xz cuberite-70cf0c09a875f578cc9be9ebf7a900c3e857a2a5.tar.zst cuberite-70cf0c09a875f578cc9be9ebf7a900c3e857a2a5.zip | |
| -rw-r--r-- | MCServer/.gitignore | 4 | ||||
| -rw-r--r-- | VC2008/Lua.vcproj | 18 | ||||
| -rw-r--r-- | 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" > <Tool @@ -41,7 +41,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS" + PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;LUA_BUILD_AS_DLL" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -59,12 +59,17 @@ Name="VCPreLinkEventTool" /> <Tool - Name="VCLibrarianTool" + Name="VCLinkerTool" + OutputFile="$(ProjectDir)\..\MCServer\lua5.1.dll" + GenerateDebugInformation="true" /> <Tool Name="VCALinkTool" /> <Tool + Name="VCManifestTool" + /> + <Tool Name="VCXDCMakeTool" /> <Tool @@ -74,6 +79,9 @@ Name="VCFxCopTool" /> <Tool + Name="VCAppVerifierTool" + /> + <Tool Name="VCPostBuildEventTool" /> </Configuration> @@ -376,10 +384,6 @@ > </File> <File - RelativePath="..\lib\lua\src\lua.c" - > - </File> - <File RelativePath="..\lib\lua\src\luac.c" > </File> 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" |