build: clean up lol-core vcxproj filters and improve DLL copying.

build/msbuild/lol.rules.props

@@ -109,8 +109,8 @@
         set A=$(SdlLibs)
         :again
         for /f "tokens=1* delims=;" %%I in ("%A%") do (
-          if not "%%I" == "" echo xcopy /y /c /d "%%I"\*.dll "$(TargetDir)"
-          if not "%%I" == "" xcopy /y /c /d "%%I"\*.dll "$(TargetDir)"
+          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
         )

build/msbuild/lol.vars.props

@@ -73,11 +73,14 @@
     <SdlDir>$(ExternalDir)\sdl-2.0.9</SdlDir>
     <SdlImageDir>$(ExternalDir)\sdl-image-2.0.4</SdlImageDir>
     <SdlMixerDir>$(ExternalDir)\sdl-mixer-2.0.4</SdlMixerDir>
+    <SdlLibDir Condition="'$(Platform)'=='Win32'">$(SdlDir)\lib\i686-msvc</SdlLibDir>
+    <SdlLibDir Condition="'$(Platform)'=='x64'">$(SdlDir)\lib\x86_64-msvc</SdlLibDir>
+    <SdlImageLibDir Condition="'$(Platform)'=='Win32'">$(SdlImageDir)\lib\i686-msvc</SdlImageLibDir>
+    <SdlImageLibDir Condition="'$(Platform)'=='x64'">$(SdlImageDir)\lib\x86_64-msvc</SdlImageLibDir>
+    <SdlMixerLibDir Condition="'$(Platform)'=='Win32'">$(SdlMixerDir)\lib\i686-msvc</SdlMixerLibDir>
+    <SdlMixerLibDir Condition="'$(Platform)'=='x64'">$(SdlMixerDir)\lib\x86_64-msvc</SdlMixerLibDir>
     <SdlIncludes>$(SdlDir)\include;$(SdlImageDir)\include;$(SdlMixerDir)\include</SdlIncludes>
-    <SdlLibs Condition="'$(Platform)'=='Win32'">$(SdlDir)\lib\i686-msvc;$(SdlImageDir)\lib\i686-msvc;$(SdlMixerDir)\lib\i686-msvc</SdlLibs>
-    <SdlLibs Condition="'$(Platform)'=='x64'">$(SdlDir)\lib\x86_64-msvc;$(SdlImageDir)\lib\x86_64-msvc;$(SdlMixerDir)\lib\x86_64-msvc</SdlLibs>
-    <SdlDeps Condition="'$(Platform)'=='Win32'">SDL2.lib;SDL2main.lib;SDL2_image.lib;SDL2_mixer.lib</SdlDeps>
-    <SdlDeps Condition="'$(Platform)'=='x64'">SDL2.lib;SDL2main.lib;SDL2_image.lib;SDL2_mixer.lib</SdlDeps>
+    <SdlLibs>$(SdlLibDir);$(SdlImageLibDir);$(SdlMixerLibDir)</SdlLibs>
     <Win32Defines>HAVE_SDL_H;LOL_USE_SDL;$(Win32Defines)</Win32Defines>
     <Win32Defines>LOL_USE_SDL_MIXER;LOL_USE_SDL_IMAGE;$(Win32Defines)</Win32Defines>
   </PropertyGroup>

src/Makefile.am

@@ -5,7 +5,7 @@ SUBDIRS = 3rdparty data . t
 
 noinst_LIBRARIES = liblol-core.a
 
-EXTRA_DIST += lol-core.vcxproj lol-core.vcxproj.filter
+EXTRA_DIST += lol-core.vcxproj lol-core.vcxproj.filters
 
 liblol_core_a_SOURCES = \
     lolgl.h scene.cpp scene.h font.cpp font.h \

src/lol-core.vcxproj

@@ -317,6 +317,54 @@
     <LolFxCompile Include="gradient.lolfx" />
   </ItemGroup>
   <ItemGroup>
+    <CopyFileToFolders Include="$(SdlLibDir)\SDL2.dll">
+      <FileType>Document</FileType>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="$(SdlImageLibDir)\libjpeg-9.dll">
+      <FileType>Document</FileType>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="$(SdlImageLibDir)\libpng16-16.dll">
+      <FileType>Document</FileType>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="$(SdlImageLibDir)\libtiff-5.dll">
+      <FileType>Document</FileType>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="$(SdlImageLibDir)\libwebp-7.dll">
+      <FileType>Document</FileType>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="$(SdlImageLibDir)\SDL2_image.dll">
+      <FileType>Document</FileType>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="$(SdlImageLibDir)\zlib1.dll">
+      <FileType>Document</FileType>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="$(SdlMixerLibDir)\libFLAC-8.dll">
+      <FileType>Document</FileType>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="$(SdlMixerLibDir)\libmodplug-1.dll">
+      <FileType>Document</FileType>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="$(SdlMixerLibDir)\libmpg123-0.dll">
+      <FileType>Document</FileType>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="$(SdlMixerLibDir)\libogg-0.dll">
+      <FileType>Document</FileType>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="$(SdlMixerLibDir)\libopus-0.dll">
+      <FileType>Document</FileType>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="$(SdlMixerLibDir)\libopusfile-0.dll">
+      <FileType>Document</FileType>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="$(SdlMixerLibDir)\libvorbis-0.dll">
+      <FileType>Document</FileType>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="$(SdlMixerLibDir)\libvorbisfile-3.dll">
+      <FileType>Document</FileType>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="$(SdlMixerLibDir)\SDL2_mixer.dll">
+      <FileType>Document</FileType>
+    </CopyFileToFolders>
     <None Include="Makefile.am">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
     </None>