diff --git a/mk/windoze/Glest_vc2010.sln b/mk/windoze/Glest_vc2010.sln index 34de0444..35841bbc 100644 --- a/mk/windoze/Glest_vc2010.sln +++ b/mk/windoze/Glest_vc2010.sln @@ -2,12 +2,21 @@ Microsoft Visual Studio Solution File, Format Version 11.00 # Visual C++ Express 2010 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glest_game", "glest_game.vcxproj", "{6B0C65F1-D031-46AF-AC0D-7C38892D2952}" + ProjectSection(ProjectDependencies) = postProject + {CDF4DDB9-945E-4D0D-9F0E-2BBEB5D22141} = {CDF4DDB9-945E-4D0D-9F0E-2BBEB5D22141} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libglest", "shared_lib.vcxproj", "{8DAA0C24-95CD-4F66-B4C5-19ABDD771746}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glest_editor", "glest_editor.vcxproj", "{5D09BE33-81EC-450B-8A7B-2E7B941ADC56}" + ProjectSection(ProjectDependencies) = postProject + {CDF4DDB9-945E-4D0D-9F0E-2BBEB5D22141} = {CDF4DDB9-945E-4D0D-9F0E-2BBEB5D22141} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "g3d_viewer", "g3d_viewer.vcxproj", "{FE5C7C7C-F109-44F5-8329-25A4E24F162C}" + ProjectSection(ProjectDependencies) = postProject + {CDF4DDB9-945E-4D0D-9F0E-2BBEB5D22141} = {CDF4DDB9-945E-4D0D-9F0E-2BBEB5D22141} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libstreflop", "libstreflop.vcxproj", "{CDF4DDB9-945E-4D0D-9F0E-2BBEB5D22141}" EndProject @@ -100,24 +109,6 @@ Global {FE5C7C7C-F109-44F5-8329-25A4E24F162C}.Release+MT with error catching|Win32.Build.0 = Release|Win32 {FE5C7C7C-F109-44F5-8329-25A4E24F162C}.Syncdebug|Win32.ActiveCfg = Release|Win32 {FE5C7C7C-F109-44F5-8329-25A4E24F162C}.Syncdebug|Win32.Build.0 = Release|Win32 - {FE5C7C7C-F109-44F5-8329-19A4E24F162D}.Debug|Win32.ActiveCfg = Debug|Win32 - {FE5C7C7C-F109-44F5-8329-19A4E24F162D}.Debug|Win32.Build.0 = Debug|Win32 - {FE5C7C7C-F109-44F5-8329-19A4E24F162D}.Debug+MT|Win32.ActiveCfg = Debug|Win32 - {FE5C7C7C-F109-44F5-8329-19A4E24F162D}.Debug+MT|Win32.Build.0 = Debug|Win32 - {FE5C7C7C-F109-44F5-8329-19A4E24F162D}.Debug-MT|Win32.ActiveCfg = Debug|Win32 - {FE5C7C7C-F109-44F5-8329-19A4E24F162D}.Debug-MT|Win32.Build.0 = Debug|Win32 - {FE5C7C7C-F109-44F5-8329-19A4E24F162D}.No debug|Win32.ActiveCfg = Release|Win32 - {FE5C7C7C-F109-44F5-8329-19A4E24F162D}.No debug|Win32.Build.0 = Release|Win32 - {FE5C7C7C-F109-44F5-8329-19A4E24F162D}.Release with error catching|Win32.ActiveCfg = Release|Win32 - {FE5C7C7C-F109-44F5-8329-19A4E24F162D}.Release with error catching|Win32.Build.0 = Release|Win32 - {FE5C7C7C-F109-44F5-8329-19A4E24F162D}.Release_NO_STREFLOP|Win32.ActiveCfg = Release_NO_STREFLOP|Win32 - {FE5C7C7C-F109-44F5-8329-19A4E24F162D}.Release_NO_STREFLOP|Win32.Build.0 = Release_NO_STREFLOP|Win32 - {FE5C7C7C-F109-44F5-8329-19A4E24F162D}.Release|Win32.ActiveCfg = Release|Win32 - {FE5C7C7C-F109-44F5-8329-19A4E24F162D}.Release|Win32.Build.0 = Release|Win32 - {FE5C7C7C-F109-44F5-8329-19A4E24F162D}.Release+MT with error catching|Win32.ActiveCfg = Release|Win32 - {FE5C7C7C-F109-44F5-8329-19A4E24F162D}.Release+MT with error catching|Win32.Build.0 = Release|Win32 - {FE5C7C7C-F109-44F5-8329-19A4E24F162D}.Syncdebug|Win32.ActiveCfg = Release|Win32 - {FE5C7C7C-F109-44F5-8329-19A4E24F162D}.Syncdebug|Win32.Build.0 = Release|Win32 {CDF4DDB9-945E-4D0D-9F0E-2BBEB5D22141}.Debug|Win32.ActiveCfg = Debug|Win32 {CDF4DDB9-945E-4D0D-9F0E-2BBEB5D22141}.Debug|Win32.Build.0 = Debug|Win32 {CDF4DDB9-945E-4D0D-9F0E-2BBEB5D22141}.Debug+MT|Win32.ActiveCfg = Debug|Win32 diff --git a/mk/windoze/g2xml.vcxproj b/mk/windoze/g2xml.vcxproj index 9a5b3d81..b12d7832 100644 --- a/mk/windoze/g2xml.vcxproj +++ b/mk/windoze/g2xml.vcxproj @@ -56,6 +56,7 @@ Level3 EditAndContinue + true true @@ -74,6 +75,7 @@ Level3 ProgramDatabase + true true diff --git a/mk/windoze/g3d_viewer.vcxproj b/mk/windoze/g3d_viewer.vcxproj index bcbe3003..83a5724d 100644 --- a/mk/windoze/g3d_viewer.vcxproj +++ b/mk/windoze/g3d_viewer.vcxproj @@ -73,6 +73,7 @@ Level3 EditAndContinue + true wxbase28d.lib;wxbase28d_net.lib;wxbase28d_xml.lib;wxexpatd.lib;wxjpegd.lib;wxmsw28d_adv.lib;wxmsw28d_aui.lib;wxmsw28d_core.lib;wxmsw28d_gl.lib;wxmsw28d_html.lib;wxmsw28d_media.lib;wxmsw28d_qa.lib;wxmsw28d_richtext.lib;wxmsw28d_xrc.lib;wxregexd.lib;wxtiffd.lib;wxzlibd.lib;winmm.lib;rpcrt4.lib;kernel32.lib;user32.lib;gdi32.lib;ole32.lib;oleaut32.lib;comctl32.lib;comdlg32.lib;uuid.lib;advapi32.lib;shell32.lib;libglest.lib;Dbghelp.lib;sdl.lib;sdlmain.lib;dxguid.lib;libstreflop.lib;libcurl.lib;ws2_32.lib;xerces-c_3d.lib;libpng.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies) @@ -101,6 +102,7 @@ ProgramDatabase true Fast + true wxbase29u.lib;wxbase29u_net.lib;wxbase29u_xml.lib;wxexpat.lib;wxjpeg.lib;wxtiff.lib;wxmsw29u_adv.lib;wxmsw29u_aui.lib;wxmsw29u_core.lib;wxmsw29u_gl.lib;wxmsw29u_html.lib;wxmsw29u_media.lib;wxmsw29u_qa.lib;wxmsw29u_richtext.lib;wxmsw29u_xrc.lib;wxregexu.lib;winmm.lib;rpcrt4.lib;kernel32.lib;user32.lib;gdi32.lib;ole32.lib;oleaut32.lib;comctl32.lib;comdlg32.lib;uuid.lib;advapi32.lib;shell32.lib;libglest.lib;Dbghelp.lib;sdl.lib;sdlmain.lib;dxguid.lib;libstreflop.lib;libcurl.lib;ws2_32.lib;xerces-c_static_3.lib;libpng15.lib;jpeg.lib;ftgl_static.lib;freetype244MT.lib;glew32s.lib;zlibstat.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies) @@ -135,6 +137,7 @@ c:\temp\release\$(TargetName).pch Level3 ProgramDatabase + true wxbase28.lib;wxbase28_net.lib;wxbase28_xml.lib;wxexpat.lib;wxjpeg.lib;wxmsw28_adv.lib;wxmsw28_aui.lib;wxmsw28_core.lib;wxmsw28_gl.lib;wxmsw28_html.lib;wxmsw28_media.lib;wxmsw28_qa.lib;wxmsw28_richtext.lib;wxmsw28_xrc.lib;wxregex.lib;wxtiff.lib;wxzlib.lib;winmm.lib;rpcrt4.lib;kernel32.lib;user32.lib;gdi32.lib;ole32.lib;oleaut32.lib;comctl32.lib;comdlg32.lib;uuid.lib;advapi32.lib;shell32.lib;libglest.lib;Dbghelp.lib;sdl.lib;sdlmain.lib;dxguid.lib;libstreflop.lib;libcurl.lib;ws2_32.lib;xerces-c_3.lib;libpng.lib;%(AdditionalDependencies) diff --git a/mk/windoze/glest_editor.vcxproj b/mk/windoze/glest_editor.vcxproj index 2830756b..b12f1453 100644 --- a/mk/windoze/glest_editor.vcxproj +++ b/mk/windoze/glest_editor.vcxproj @@ -73,6 +73,7 @@ Level3 EditAndContinue + true wxbase29u.lib;wxbase29u_net.lib;wxbase29u_xml.lib;wxexpat.lib;wxjpeg.lib;wxmsw29u_adv.lib;wxmsw29u_aui.lib;wxmsw29u_core.lib;wxmsw29u_gl.lib;wxmsw29u_html.lib;wxmsw29u_media.lib;wxmsw29u_qa.lib;wxmsw29u_richtext.lib;wxmsw29u_xrc.lib;wxpng.lib;wxregexu.lib;wxtiff.lib;winmm.lib;rpcrt4.lib;kernel32.lib;user32.lib;gdi32.lib;ole32.lib;oleaut32.lib;comctl32.lib;comdlg32.lib;uuid.lib;advapi32.lib;shell32.lib;libglest.lib;sdl.lib;sdlmain.lib;dsound.lib;dxguid.lib;Dbghelp.lib;libcurl.lib;ws2_32.lib;ftgl_static.lib;freetype244MT.lib;zlibstat.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies) @@ -100,6 +101,7 @@ Level3 ProgramDatabase + true wxbase29u.lib;wxbase29u_net.lib;wxbase29u_xml.lib;wxexpat.lib;wxjpeg.lib;wxmsw29u_adv.lib;wxmsw29u_aui.lib;wxmsw29u_core.lib;wxmsw29u_gl.lib;wxmsw29u_html.lib;wxmsw29u_media.lib;wxmsw29u_qa.lib;wxmsw29u_richtext.lib;wxmsw29u_xrc.lib;wxpng.lib;wxregexu.lib;wxtiff.lib;winmm.lib;rpcrt4.lib;kernel32.lib;user32.lib;gdi32.lib;ole32.lib;oleaut32.lib;comctl32.lib;comdlg32.lib;uuid.lib;advapi32.lib;shell32.lib;libglest.lib;sdl.lib;sdlmain.lib;dsound.lib;dxguid.lib;Dbghelp.lib;libcurl.lib;ws2_32.lib;ftgl_static.lib;freetype244MT.lib;zlibstat.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies) @@ -134,6 +136,7 @@ c:\temp\release\$(TargetName).pch Level3 ProgramDatabase + true wxbase28.lib;wxbase28_net.lib;wxbase28_xml.lib;wxexpat.lib;wxjpeg.lib;wxmsw28_adv.lib;wxmsw28_aui.lib;wxmsw28_core.lib;wxmsw28_gl.lib;wxmsw28_html.lib;wxmsw28_media.lib;wxmsw28_qa.lib;wxmsw28_richtext.lib;wxmsw28_xrc.lib;wxpng.lib;wxregex.lib;wxtiff.lib;wxzlib.lib;winmm.lib;rpcrt4.lib;kernel32.lib;user32.lib;gdi32.lib;ole32.lib;oleaut32.lib;comctl32.lib;comdlg32.lib;uuid.lib;advapi32.lib;shell32.lib;libglest.lib;sdl.lib;sdlmain.lib;dsound.lib;dxguid.lib;Dbghelp.lib;libcurl.lib;ws2_32.lib;%(AdditionalDependencies) diff --git a/mk/windoze/glest_game.vcxproj b/mk/windoze/glest_game.vcxproj index 6a509232..4e7aff62 100644 --- a/mk/windoze/glest_game.vcxproj +++ b/mk/windoze/glest_game.vcxproj @@ -86,6 +86,7 @@ Level2 ProgramDatabase 4018;4244;4250;%(DisableSpecificWarnings) + true dsound.lib;dxguid.lib;glew32s.lib;libogg_static.lib;libvorbis_static.lib;libvorbisfile_static.lib;opengl32.lib;glu32.lib;wsock32.lib;libglest.lib;mmc.lib;lua.lib;xerces-c_static_3D.lib;Dbghelp.lib;libpng15.lib;jpeg.lib;zlibstat.lib;sdl.lib;sdlmain.lib;winmm.lib;openal32.lib;iphlpapi.lib;libstreflop.lib;libcurl.lib;ws2_32.lib;libircclient.lib;freetype244MT_D.lib;ftgl_static_D.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies) @@ -126,6 +127,7 @@ Level3 ProgramDatabase 4018;4244;4250;4503;%(DisableSpecificWarnings) + true dsound.lib;dxguid.lib;glew32s.lib;libogg_static.lib;libvorbis_static.lib;libvorbisfile_static.lib;opengl32.lib;glu32.lib;wsock32.lib;libglest.lib;mmc.lib;lua.lib;xerces-c_static_3.lib;Dbghelp.lib;libpng15.lib;jpeg.lib;zlibstat.lib;sdl.lib;sdlmain.lib;winmm.lib;openal32.lib;iphlpapi.lib;libstreflop.lib;libcurl.lib;ws2_32.lib;libircclient.lib;freetype244MT.lib;ftgl_static.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies) @@ -168,6 +170,7 @@ Precise Level2 ProgramDatabase + true 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;sdl.lib;sdlmain.lib;winmm.lib;openal32.lib;iphlpapi.lib;libstreflop.lib;libcurl.lib;ws2_32.lib;%(AdditionalDependencies) diff --git a/mk/windoze/libstreflop.vcxproj b/mk/windoze/libstreflop.vcxproj index 9b66726b..2fe76ac5 100644 --- a/mk/windoze/libstreflop.vcxproj +++ b/mk/windoze/libstreflop.vcxproj @@ -81,6 +81,7 @@ $(IntDir)$(ProjectName).pdb Level3 EditAndContinue + true @@ -103,6 +104,7 @@ $(IntDir)$(ProjectName).pdb Level3 ProgramDatabase + true @@ -124,6 +126,7 @@ true Level3 ProgramDatabase + true @@ -145,6 +148,7 @@ true Level3 ProgramDatabase + true diff --git a/mk/windoze/shared_lib.vcxproj b/mk/windoze/shared_lib.vcxproj index 2b1a442d..521b6c29 100644 --- a/mk/windoze/shared_lib.vcxproj +++ b/mk/windoze/shared_lib.vcxproj @@ -80,6 +80,7 @@ Level2 EditAndContinue 4250;%(DisableSpecificWarnings) + true libstreflop.lib;libcurl.lib;libvlc.lib;%(AdditionalDependencies) @@ -133,6 +134,7 @@ true Level3 ProgramDatabase + true libstreflop.lib;libcurl.lib;%(AdditionalDependencies) diff --git a/mk/windoze/xml2g.vcxproj b/mk/windoze/xml2g.vcxproj index dfce64f4..8925a0c0 100644 --- a/mk/windoze/xml2g.vcxproj +++ b/mk/windoze/xml2g.vcxproj @@ -57,6 +57,7 @@ Level3 EditAndContinue ..\..\source\win32_deps\libxml2-2.7.7\include;%(AdditionalIncludeDirectories) + true true @@ -78,6 +79,7 @@ Level3 ProgramDatabase + true wsock32.lib;libxml2_a.lib;%(AdditionalDependencies)