@@ -60,10 +60,11 @@ | |||||
<Link> | <Link> | ||||
<!-- FIXME: not for the static library! --> | <!-- FIXME: not for the static library! --> | ||||
<AdditionalDependencies Condition="'$(Platform)'=='Win32' Or '$(Platform)'=='x64'">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);$(FfmpegDeps);$(GdiDeps);$(XinputDeps);%(AdditionalDependencies)</AdditionalDependencies> | |||||
<AdditionalDependencies Condition="'$(Platform)'=='Win32' Or '$(Platform)'=='x64'">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);$(FfmpegDeps);$(LibGccDeps);$(GdiDeps);$(XinputDeps);%(AdditionalDependencies)</AdditionalDependencies> | |||||
<AdditionalDependencies Condition="'$(UseOpenGL)'=='true' And ('$(Platform)'=='Win32' Or '$(Platform)'=='x64')">$(GlDeps);%(AdditionalDependencies)</AdditionalDependencies> | <AdditionalDependencies Condition="'$(UseOpenGL)'=='true' And ('$(Platform)'=='Win32' Or '$(Platform)'=='x64')">$(GlDeps);%(AdditionalDependencies)</AdditionalDependencies> | ||||
<AdditionalDependencies Condition="'$(UseOpenGL)'=='false' And ('$(Platform)'=='Win32' Or '$(Platform)'=='x64')">$(D3d9Deps);%(AdditionalDependencies)</AdditionalDependencies> | <AdditionalDependencies Condition="'$(UseOpenGL)'=='false' And ('$(Platform)'=='Win32' Or '$(Platform)'=='x64')">$(D3d9Deps);%(AdditionalDependencies)</AdditionalDependencies> | ||||
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies> | <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies> | ||||
<AdditionalLibraryDirectories Condition="'$(Platform)'=='Win32' Or '$(Platform)'=='x64'">$(LibGccLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | |||||
<AdditionalLibraryDirectories Condition="'$(Platform)'=='Win32' Or '$(Platform)'=='x64'">$(SdlLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | <AdditionalLibraryDirectories Condition="'$(Platform)'=='Win32' Or '$(Platform)'=='x64'">$(SdlLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | ||||
<AdditionalLibraryDirectories Condition="'$(Platform)'=='Win32' Or '$(Platform)'=='x64'">$(FfmpegLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | <AdditionalLibraryDirectories Condition="'$(Platform)'=='Win32' Or '$(Platform)'=='x64'">$(FfmpegLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | ||||
<AdditionalLibraryDirectories Condition="'$(Platform)'=='Win32' Or '$(Platform)'=='x64'">$(GlLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | <AdditionalLibraryDirectories Condition="'$(Platform)'=='Win32' Or '$(Platform)'=='x64'">$(GlLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | ||||
@@ -8,6 +8,12 @@ | |||||
<FlexDir>$(ExternalDir)\flex-2.5.35</FlexDir> | <FlexDir>$(ExternalDir)\flex-2.5.35</FlexDir> | ||||
<FlexIncludes>$(FlexDir)\include</FlexIncludes> | <FlexIncludes>$(FlexDir)\include</FlexIncludes> | ||||
<!-- libgcc (from mingw-w64) --> | |||||
<LibGccDir>$(ExternalDir)\libgcc-4.9</LibGccDir> | |||||
<LibGccLibs Condition="'$(Platform)'=='Win32'">$(LibGccDir)\lib\i686-w64-mingw32</LibGccLibs> | |||||
<LibGccLibs Condition="'$(Platform)'=='x64'">$(LibGccDir)\lib\x86_64-w64-mingw32</LibGccLibs> | |||||
<LibGccDeps>libgcc.lib</LibGccDeps> | |||||
<!-- SDL --> | <!-- SDL --> | ||||
<SdlDir>$(ExternalDir)\sdl-2.0.3</SdlDir> | <SdlDir>$(ExternalDir)\sdl-2.0.3</SdlDir> | ||||
<SdlImageDir>$(ExternalDir)\sdl-image-2.0.0</SdlImageDir> | <SdlImageDir>$(ExternalDir)\sdl-image-2.0.0</SdlImageDir> | ||||
@@ -101,6 +107,9 @@ | |||||
<BuildMacro Include="ExternalDir"><Value>$(ExternalDir)</Value></BuildMacro> | <BuildMacro Include="ExternalDir"><Value>$(ExternalDir)</Value></BuildMacro> | ||||
<BuildMacro Include="FlexDir"><Value>$(FlexDir)</Value></BuildMacro> | <BuildMacro Include="FlexDir"><Value>$(FlexDir)</Value></BuildMacro> | ||||
<BuildMacro Include="FlexIncludes"><Value>$(FlexIncludes)</Value></BuildMacro> | <BuildMacro Include="FlexIncludes"><Value>$(FlexIncludes)</Value></BuildMacro> | ||||
<BuildMacro Include="LibGccDir"><Value>$(LibGccDir)</Value></BuildMacro> | |||||
<BuildMacro Include="LibGccLibs"><Value>$(LibGccLibs)</Value></BuildMacro> | |||||
<BuildMacro Include="LibGccDeps"><Value>$(LibGccDeps)</Value></BuildMacro> | |||||
<BuildMacro Include="SdlDir"><Value>$(SdlDir)</Value></BuildMacro> | <BuildMacro Include="SdlDir"><Value>$(SdlDir)</Value></BuildMacro> | ||||
<BuildMacro Include="SdlImageDir"><Value>$(SdlImageDir)</Value></BuildMacro> | <BuildMacro Include="SdlImageDir"><Value>$(SdlImageDir)</Value></BuildMacro> | ||||
<BuildMacro Include="SdlMixerDir"><Value>$(SdlMixerDir)</Value></BuildMacro> | <BuildMacro Include="SdlMixerDir"><Value>$(SdlMixerDir)</Value></BuildMacro> | ||||