From 6cc678f6f96941ac03c54c2c2b68dd38448de8cc Mon Sep 17 00:00:00 2001 From: Sam Hocevar Date: Fri, 8 Jun 2012 17:50:57 +0000 Subject: [PATCH] build: allow to use OpenGL instead of Direct3D in Visual Studio by simply changing a configuration variable in a file. --- win32/Lol.Core.Build.props | 13 +++++++++++++ win32/Lol.Core.Config.props | 1 + win32/Lol.Core.Rules.props | 22 +++++++--------------- win32/Lol.Core.Vars.props | 3 ++- win32/lolcore.vcxproj | 3 +-- win32/lolengine.sln | 3 +++ 6 files changed, 27 insertions(+), 18 deletions(-) create mode 100644 win32/Lol.Core.Build.props diff --git a/win32/Lol.Core.Build.props b/win32/Lol.Core.Build.props new file mode 100644 index 00000000..a0e17d44 --- /dev/null +++ b/win32/Lol.Core.Build.props @@ -0,0 +1,13 @@ + + + + + + + + + + false + + + diff --git a/win32/Lol.Core.Config.props b/win32/Lol.Core.Config.props index 6d6fc41f..cdc8b062 100644 --- a/win32/Lol.Core.Config.props +++ b/win32/Lol.Core.Config.props @@ -1,5 +1,6 @@  + true diff --git a/win32/Lol.Core.Rules.props b/win32/Lol.Core.Rules.props index 52ca340a..0dd8f1d2 100644 --- a/win32/Lol.Core.Rules.props +++ b/win32/Lol.Core.Rules.props @@ -35,10 +35,12 @@ true - kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;$(SdlDeps);$(GdiDeps);$(GlDeps);$(D3d9Deps);%(AdditionalDependencies) - $(SdlLibs);$(GlLibs);$(D3d9Libs);%(AdditionalLibraryDirectories) - kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;$(SdlDeps);$(GdiDeps);$(GlDeps);$(D3d9Deps);%(AdditionalDependencies) - $(SdlLibs);$(GlLibs);$(D3d9Libs);%(AdditionalLibraryDirectories) + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;$(SdlDeps);$(GdiDeps);%(AdditionalDependencies) + $(GlDeps);%(AdditionalDependencies) + $(D3d9Deps);%(AdditionalDependencies) + $(SdlLibs);%(AdditionalLibraryDirectories) + $(GlLibs);%(AdditionalLibraryDirectories) + $(D3d9Libs);%(AdditionalLibraryDirectories) xapilibd.lib;d3d9d.lib;d3dx9d.lib;xgraphicsd.lib;xboxkrnl.lib;xnetd.lib;xaudiod2.lib;xactd3.lib;x3daudiod.lib;xmcored.lib;xbdm.lib;vcompd.lib;%(AdditionalDependencies) xapilib.lib;d3d9.lib;d3dx9.lib;xgraphics.lib;xboxkrnl.lib;xnet.lib;xaudio2.lib;xact3.lib;x3daudio.lib;xmcore.lib;vcomp.lib;%(AdditionalDependencies) @@ -48,17 +50,7 @@ - - - set A=$(SdlLibs) - :again - for /f "tokens=1* delims=;" %%I in ("%A%") do ( - if not "%%I" == "" xcopy /y /c /d "%%I"\*.dll "$(TargetDir)" && set A=%%J - if not "%%I" == "" goto again - ) - - - + set A=$(SdlLibs) :again diff --git a/win32/Lol.Core.Vars.props b/win32/Lol.Core.Vars.props index d609ce99..4d4eccde 100644 --- a/win32/Lol.Core.Vars.props +++ b/win32/Lol.Core.Vars.props @@ -42,7 +42,8 @@ d3d9.lib;d3dx9.lib;xinput.lib d3d9.lib;d3dx9d.lib;xinput.lib - HAVE_SDL_H;USE_SDL;USE_GDIPLUS;USE_D3D9 + HAVE_SDL_H;USE_SDL;USE_GDIPLUS;HAVE_GL_2X;USE_GLEW;GLEW_STATIC + HAVE_SDL_H;USE_SDL;USE_GDIPLUS;USE_D3D9 diff --git a/win32/lolcore.vcxproj b/win32/lolcore.vcxproj index 3f661977..12dae902 100644 --- a/win32/lolcore.vcxproj +++ b/win32/lolcore.vcxproj @@ -31,7 +31,7 @@ StaticLibrary Win32Proj - + true MultiByte @@ -57,7 +57,6 @@ true MultiByte - diff --git a/win32/lolengine.sln b/win32/lolengine.sln index eaeff73c..baceb73c 100644 --- a/win32/lolengine.sln +++ b/win32/lolengine.sln @@ -70,6 +70,9 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "orbital", "orbital.vcxproj", "{EE203B88-44CF-4859-9D42-7A5F40FECB52}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Engine", "Engine", "{1AFD580B-98B8-4689-B661-38C41132C60E}" + ProjectSection(SolutionItems) = preProject + Lol.Core.Build.props = Lol.Core.Build.props + EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{3D341D8A-E400-4B1D-BC05-B5C35487D9B5}" EndProject