Rampoina/MegaGlest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Updates to the Win32 projects to link in zlib, libpng, and libjpeg

Browse Source
This commit is contained in:
Mark Vejvoda 2010-03-24 10:12:08 +00:00
parent 6496d72533
commit e91c15b9e2
4 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mk/windoze/CopyWindowsRuntimeDlls.bat
View File

@ -2,5 +2,7 @@
if not exist ..\..\data\glest_game\dsound.dll copy dsound.dll ..\..\data\glest_game\
if not exist ..\..\data\glest_game\xerces-c_3_0.dll copy xerces-c_3_0.dll ..\..\data\glest_game\
if not exist ..\..\data\glest_game\libpng14.dll copy libpng14.dll ..\..\data\glest_game\
if not exist ..\..\data\glest_game\zlib1.dll copy zlib1.dll ..\..\data\glest_game\
pause

BIN
mk/windoze/Glest.suo
View File

Binary file not shown.

2
mk/windoze/glest_game.vcproj
View File

@ -155,7 +155,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="dsound.lib dxguid.lib ogg_static.lib vorbis_static.lib vorbisfile_static.lib opengl32.lib glu32.lib wsock32.lib libglest.lib mmc.lib zlib.lib lua5.1.lib xerces-c_3.lib Dbghelp.lib"
AdditionalDependencies="dsound.lib dxguid.lib ogg_static.lib vorbis_static.lib vorbisfile_static.lib opengl32.lib glu32.lib wsock32.lib libglest.lib mmc.lib lua5.1.lib xerces-c_3.lib Dbghelp.lib libpng.lib jpeg.lib zlib.lib"
AdditionalLibraryDirectories="../../source/win32_deps/lib;&quot;../../build/$(ConfigurationName)/libglest&quot;"
IgnoreDefaultLibraryNames=""
GenerateDebugInformation="true"

28
mk/windoze/shared_lib.vcproj
View File

@ -40,7 +40,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="../../../deps/include/lua;../../../deps/include;../../source/shared_lib/include;../../source/shared_lib/include/graphics;../../source/shared_lib/include/graphics/gl;../../source/shared_lib/include/platform;../../source/shared_lib/include/platform/win32;../../source/shared_lib/include/sound;../../source/shared_lib/include/sound/ds8;../../source/shared_lib/include/util;../../source/shared_lib/include/lua;../../source/shared_lib/include/xml;../../source/win32_deps/include;&quot;../../source/win32_deps/xerces-c-3.0.1/src&quot;;&quot;../../source/win32_deps/xerces-c-3.0.1/src/xercesc/xinclude&quot;"
AdditionalIncludeDirectories="../../../deps/include/lua;../../../deps/include;../../source/shared_lib/include;../../source/shared_lib/include/graphics;../../source/shared_lib/include/graphics/gl;../../source/shared_lib/include/platform;../../source/shared_lib/include/platform/win32;../../source/shared_lib/include/sound;../../source/shared_lib/include/sound/ds8;../../source/shared_lib/include/util;../../source/shared_lib/include/lua;../../source/shared_lib/include/xml;../../source/win32_deps/include;&quot;../../source/win32_deps/xerces-c-3.0.1/src&quot;;&quot;../../source/win32_deps/xerces-c-3.0.1/src/xercesc/xinclude&quot;;../../source/win32_deps/lpng141;&quot;../../source/win32_deps/jpeg-8a&quot;"
PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;NO_GL_ASSERTIONS;USE_PCH=1"
StringPooling="true"
MinimalRebuild="true"
@ -113,7 +113,7 @@
InlineFunctionExpansion="2"
EnableIntrinsicFunctions="true"
FavorSizeOrSpeed="1"
AdditionalIncludeDirectories="../../../deps/include/lua;../../../deps/include;../../source/shared_lib/include;../../source/shared_lib/include/graphics;../../source/shared_lib/include/graphics/gl;../../source/shared_lib/include/platform;../../source/shared_lib/include/platform/win32;../../source/shared_lib/include/sound;../../source/shared_lib/include/sound/ds8;../../source/shared_lib/include/util;../../source/shared_lib/include/lua;../../source/shared_lib/include/xml;../../source/win32_deps/include;&quot;../../source/win32_deps/xerces-c-3.0.1/src&quot;;&quot;../../source/win32_deps/xerces-c-3.0.1/src/xercesc/xinclude&quot;"
AdditionalIncludeDirectories="../../../deps/include/lua;../../../deps/include;../../source/shared_lib/include;../../source/shared_lib/include/graphics;../../source/shared_lib/include/graphics/gl;../../source/shared_lib/include/platform;../../source/shared_lib/include/platform/win32;../../source/shared_lib/include/sound;../../source/shared_lib/include/sound/ds8;../../source/shared_lib/include/util;../../source/shared_lib/include/lua;../../source/shared_lib/include/xml;../../source/win32_deps/include;&quot;../../source/win32_deps/xerces-c-3.0.1/src&quot;;&quot;../../source/win32_deps/xerces-c-3.0.1/src/xercesc/xinclude&quot;;../../source/win32_deps/libpng141;&quot;../../source/win32_deps/jpeg-8a&quot;"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;USE_PCH=1"
RuntimeLibrary="0"
EnableFunctionLevelLinking="true"
@ -167,6 +167,10 @@
<Filter
Name="graphics"
>
<File
RelativePath="..\..\source\shared_lib\sources\graphics\BMPReader.cpp"
>
</File>
<File
RelativePath="..\..\source\shared_lib\sources\graphics\buffer.cpp"
>
@ -179,6 +183,10 @@
RelativePath="..\..\source\shared_lib\sources\graphics\context.cpp"
>
</File>
<File
RelativePath="..\..\source\shared_lib\sources\graphics\FileReader.cpp"
>
</File>
<File
RelativePath="..\..\source\shared_lib\sources\graphics\font.cpp"
>
@ -191,10 +199,18 @@
RelativePath="..\..\source\shared_lib\sources\graphics\graphics_interface.cpp"
>
</File>
<File
RelativePath="..\..\source\shared_lib\sources\graphics\ImageReaders.cpp"
>
</File>
<File
RelativePath="..\..\source\shared_lib\sources\graphics\interpolation.cpp"
>
</File>
<File
RelativePath="..\..\source\shared_lib\sources\graphics\JPGReader.cpp"
>
</File>
<File
RelativePath="..\..\source\shared_lib\sources\graphics\model.cpp"
>
@ -211,6 +227,10 @@
RelativePath="..\..\source\shared_lib\sources\graphics\pixmap.cpp"
>
</File>
<File
RelativePath="..\..\source\shared_lib\sources\graphics\PNGReader.cpp"
>
</File>
<File
RelativePath="..\..\source\shared_lib\sources\graphics\quaternion.cpp"
>
@ -231,6 +251,10 @@
RelativePath="..\..\source\shared_lib\sources\graphics\texture_manager.cpp"
>
</File>
<File
RelativePath="..\..\source\shared_lib\sources\graphics\TGAReader.cpp"
>
</File>
<Filter
Name="gl"
>