diff --git a/build.config b/build.config new file mode 100644 index 00000000..a748c1c7 --- /dev/null +++ b/build.config @@ -0,0 +1,11 @@ + + + + + + yes + yes + yes + + + diff --git a/build/msbuild/config-build.xml b/build/msbuild/config-build.xml deleted file mode 100644 index 4dbf2fe9..00000000 --- a/build/msbuild/config-build.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - true - - - diff --git a/build/msbuild/lol.config.props b/build/msbuild/lol.config.props index faa5b5ab..639c9b6e 100644 --- a/build/msbuild/lol.config.props +++ b/build/msbuild/lol.config.props @@ -4,7 +4,8 @@ - + + - + set A=$(SdlLibs) :again for /f "tokens=1* delims=;" %%I in ("%A%") do ( diff --git a/build/msbuild/lol.vars.props b/build/msbuild/lol.vars.props index 23b339ab..bfbae461 100644 --- a/build/msbuild/lol.vars.props +++ b/build/msbuild/lol.vars.props @@ -18,18 +18,6 @@ $(LibGccDir)\lib\x86_64-w64-mingw32 libgcc.lib - - $(ExternalDir)\sdl-2.0.3 - $(ExternalDir)\sdl-image-2.0.0 - $(ExternalDir)\sdl-mixer-2.0.0 - $(SdlDir)\include;$(SdlImageDir)\include;$(SdlMixerDir)\include - $(SdlDir)\lib\i686-w64-mingw32;$(SdlImageDir)\lib\i686-w64-msvc;$(SdlMixerDir)\lib\i686-w64-msvc - $(SdlDir)\lib\x86_64-msvc;$(SdlImageDir)\lib\x86_64-msvc;$(SdlMixerDir)\lib\x86_64-msvc - SDL2.lib;SDL2main.lib;SDL2_image.lib;SDL2_mixer.lib - SDL2.lib;SDL2main.lib;SDL2_image.lib;SDL2_mixer.lib - HAVE_SDL_H;LOL_USE_SDL;$(Win32Defines) - LOL_USE_SDL_MIXER;LOL_USE_SDL_IMAGE;$(Win32Defines) - $(ExternalDir)\gtk-2.22.1 $(ExternalDir)\gtkglarea-2.0.1 @@ -37,16 +25,6 @@ $(GtkDir)\lib;$(GtkDir)\bin;$(GtkGlDir)\lib gobject-2.0.lib;gthread-2.0.lib;glib-2.0.lib;gdk-win32-2.0.lib;gtk-win32-2.0.lib;gtkgl-2.0.lib - - - $(ExternalDir)\assimp-3.1.1 $(AssimpDir)\include @@ -69,15 +47,6 @@ Gdiplus.lib LOL_USE_GDIPLUS;$(Win32Defines) - - $(ExternalDir)\glew-1.9.0 - $(GlewDir)\include - $(GlewDir)\lib\i686-w64-mingw32 - $(GlewDir)\lib\x86_64-w64-mingw32 - opengl32.lib;glew32s.lib - opengl32.lib;glew32s.lib - HAVE_GL_2X;LOL_USE_GLEW;GLEW_STATIC;$(Win32Defines) - $(DXSDK_DIR)\Include $(DXSDK_DIR)\Lib\x86 @@ -91,8 +60,45 @@ HAVE_STDIO_H; $(OrbisDefines) + + + + $(ExternalDir)\glew-1.9.0 + $(GlewDir)\include + $(GlewDir)\lib\i686-w64-mingw32 + $(GlewDir)\lib\x86_64-w64-mingw32 + opengl32.lib;glew32s.lib + opengl32.lib;glew32s.lib + HAVE_GL_2X;LOL_USE_GLEW;GLEW_STATIC;$(Win32Defines) + + + + $(ExternalDir)\sdl-2.0.3 + $(ExternalDir)\sdl-image-2.0.0 + $(ExternalDir)\sdl-mixer-2.0.0 + $(SdlDir)\include;$(SdlImageDir)\include;$(SdlMixerDir)\include + $(SdlDir)\lib\i686-w64-mingw32;$(SdlImageDir)\lib\i686-w64-msvc;$(SdlMixerDir)\lib\i686-w64-msvc + $(SdlDir)\lib\x86_64-msvc;$(SdlImageDir)\lib\x86_64-msvc;$(SdlMixerDir)\lib\x86_64-msvc + SDL2.lib;SDL2main.lib;SDL2_image.lib;SDL2_mixer.lib + SDL2.lib;SDL2main.lib;SDL2_image.lib;SDL2_mixer.lib + HAVE_SDL_H;LOL_USE_SDL;$(Win32Defines) + LOL_USE_SDL_MIXER;LOL_USE_SDL_IMAGE;$(Win32Defines) + + + + +