diff --git a/build/msbuild/lol.rules.props b/build/msbuild/lol.rules.props
index 23e1d70c..cbdce120 100644
--- a/build/msbuild/lol.rules.props
+++ b/build/msbuild/lol.rules.props
@@ -103,17 +103,10 @@
true
-
+
- set A=$(SdlLibs)
- :again
- for /f "tokens=1* delims=;" %%I in ("%A%") do (
- rem if not "%%I" == "" echo xcopy /y /c /d "%%I"\*.dll "$(TargetDir)"
- rem if not "%%I" == "" xcopy /y /c /d "%%I"\*.dll "$(TargetDir)"
- if not "%%I" == "" set A=%%J
- if not "%%I" == "" goto again
- )
+ rem do nothing
diff --git a/build/msbuild/lol.vars.props b/build/msbuild/lol.vars.props
index ad2d43b4..4e56e22e 100644
--- a/build/msbuild/lol.vars.props
+++ b/build/msbuild/lol.vars.props
@@ -4,6 +4,9 @@
$(LolDir)\external
+ i686
+ x86_64
+
$(LolDir)\src/3rdparty\pegtl\include
$(PegtlDir)
@@ -33,8 +36,7 @@
$(ExternalDir)\libcaca-0.99.beta18
$(CacaDir)\include
- $(CacaDir)\lib\i686-w64-mingw32
- $(CacaDir)\lib\x86_64-w64-mingw32
+ $(CacaDir)\lib\$(PlatformCode)-w64-mingw32
caca.lib
CACA_STATIC;$(Win32Defines)
@@ -61,10 +63,8 @@
$(ExternalDir)\glew-2.1.0
$(GlewDir)\include
- $(GlewDir)\lib\i686-w64-mingw32
- $(GlewDir)\lib\x86_64-w64-mingw32
- opengl32.lib;glew32s.lib
- opengl32.lib;glew32s.lib
+ $(GlewDir)\lib\$(PlatformCode)-w64-mingw32
+ opengl32.lib;glew32s.lib
HAVE_GL_2X;LOL_USE_GLEW;GLEW_STATIC;$(Win32Defines)
@@ -73,14 +73,12 @@
$(ExternalDir)\sdl-2.0.9
$(ExternalDir)\sdl-image-2.0.4
$(ExternalDir)\sdl-mixer-2.0.4
- $(SdlDir)\lib\i686-msvc
- $(SdlDir)\lib\x86_64-msvc
- $(SdlImageDir)\lib\i686-msvc
- $(SdlImageDir)\lib\x86_64-msvc
- $(SdlMixerDir)\lib\i686-msvc
- $(SdlMixerDir)\lib\x86_64-msvc
+ $(SdlDir)\lib\$(PlatformCode)-msvc
+ $(SdlImageDir)\lib\$(PlatformCode)-msvc
+ $(SdlMixerDir)\lib\$(PlatformCode)-msvc
$(SdlDir)\include;$(SdlImageDir)\include;$(SdlMixerDir)\include
$(SdlLibDir);$(SdlImageLibDir);$(SdlMixerLibDir)
+ 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)
@@ -89,8 +87,7 @@
$(ExternalDir)\ffmpeg-20190130
$(FfmpegDir)\include
- $(FfmpegDir)\lib\i686-msvc
- $(FfmpegDir)\lib\x86_64-msvc
+ $(FfmpegDir)\lib\$(PlatformCode)-msvc
swscale.lib;avformat.lib;avcodec.lib;swresample.lib;avutil.lib;ws2_32.lib;secur32.lib;bcrypt.lib
LOL_USE_FFMPEG;$(Win32Defines)
@@ -101,6 +98,9 @@
$(ExternalDir)
+ $(PlatformCode)
+
+
$(PegtlDir)
$(PegtlIncludes)
$(ImguiDir)