Binary interface: Removed lua support from Windows

This commit is contained in:
Parakoopa 2020-05-14 15:02:14 +02:00
parent f7bada2526
commit 4917d177cc
3 changed files with 10 additions and 45 deletions

View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" InitialTargets="UNDUPOBJ" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
@ -157,7 +157,6 @@
<ClCompile Include="..\..\..\libretro-common\rthreads\rthreads.c" />
<ClCompile Include="..\..\..\libretro-common\streams\file_stream.c" />
<ClCompile Include="..\..\..\libretro-common\streams\memory_stream.c" />
<ClCompile Include="..\..\..\lua-engine.cpp" />
<ClCompile Include="..\..\..\matrix.cpp" />
<ClCompile Include="..\..\..\mc.cpp" />
<ClCompile Include="..\..\..\MMU.cpp" />
@ -293,7 +292,7 @@
<ClCompile Include="..\..\posix\shared\sndsdl.cpp" />
<ClCompile Include="..\..\windows\mic-win.cpp" />
<ClCompile Include="..\..\windows\winutil.cpp" />
<ClCompile Include="..\draw_sdl.cpp" />
<ClCompile Include="..\draw_sdl_window.cpp" />
<ClCompile Include="..\interface.cpp" />
</ItemGroup>
<ItemGroup>
@ -371,7 +370,6 @@
<ClInclude Include="..\..\..\libretro-common\include\boolean.h" />
<ClInclude Include="..\..\..\libretro-common\include\retro_inline.h" />
<ClInclude Include="..\..\..\libretro-common\include\retro_miscellaneous.h" />
<ClInclude Include="..\..\..\lua-engine.h" />
<ClInclude Include="..\..\..\matrix.h" />
<ClInclude Include="..\..\..\mc.h" />
<ClInclude Include="..\..\..\mem.h" />
@ -491,35 +489,9 @@
<None Include="..\..\modules\osd\agg\agg2d.inl" />
<None Include="..\thumb_tabdef.inc" />
<None Include="..\..\..\utils\AsmJit\COPYING.txt" />
<CustomBuild Include="..\..\windows\lua\lua.7z">
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">call ..\..\windows\un7z_and_touch.bat ..\..\windows\lua\lua.7z .libs\win32\lua* .libs\x64\lua* .libs\lua.tag</Command>
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">7z.exe;..\..\windows\un7z_and_touch.bat</AdditionalInputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.libs\lua.tag;</Outputs>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">call ..\..\windows\un7z_and_touch.bat ..\..\windows\lua\lua.7z .libs\win32\lua* .libs\x64\lua* .libs\lua.tag</Command>
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">7z.exe;..\..\windows\un7z_and_touch.bat</AdditionalInputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.libs\lua.tag;</Outputs>
<Command Condition="'$(Configuration)|$(Platform)'=='Dev+|Win32'">call ..\..\windows\un7z_and_touch.bat ..\..\windows\lua\lua.7z .libs\win32\lua* .libs\x64\lua* .libs\lua.tag</Command>
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Dev+|Win32'">7z.exe;..\..\windows\un7z_and_touch.bat</AdditionalInputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Dev+|Win32'">.libs\lua.tag;</Outputs>
<Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">call ..\..\windows\un7z_and_touch.bat ..\..\windows\lua\lua.7z .libs\win32\lua* .libs\x64\lua* .libs\lua.tag</Command>
<Command Condition="'$(Configuration)|$(Platform)'=='Release Fastbuild|Win32'">call ..\..\windows\un7z_and_touch.bat ..\..\windows\lua\lua.7z .libs\win32\lua* .libs\x64\lua* .libs\lua.tag</Command>
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">7z.exe;..\..\windows\un7z_and_touch.bat</AdditionalInputs>
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release Fastbuild|Win32'">7z.exe;un7z_and_touch.bat</AdditionalInputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.libs\lua.tag;</Outputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release Fastbuild|Win32'">.libs\lua.tag;</Outputs>
<Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">call ..\..\windows\un7z_and_touch.bat ..\..\windows\lua\lua.7z .libs\win32\lua* .libs\x64\lua* .libs\lua.tag</Command>
<Command Condition="'$(Configuration)|$(Platform)'=='Release Fastbuild|x64'">call ..\..\windows\un7z_and_touch.bat ..\..\windows\lua\lua.7z .libs\win32\lua* .libs\x64\lua* .libs\lua.tag</Command>
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">7z.exe;..\..\windows\un7z_and_touch.bat</AdditionalInputs>
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release Fastbuild|x64'">7z.exe;un7z_and_touch.bat</AdditionalInputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.libs\lua.tag;</Outputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release Fastbuild|x64'">.libs\lua.tag;</Outputs>
<Command Condition="'$(Configuration)|$(Platform)'=='Dev+|x64'">call ..\..\windows\un7z_and_touch.bat ..\..\windows\lua\lua.7z .libs\win32\lua* .libs\x64\lua* .libs\lua.tag</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Dev+|x64'">.libs\lua.tag;</Outputs>
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Dev+|x64'">7z.exe;..\..\windows\un7z_and_touch.bat</AdditionalInputs>
</CustomBuild>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
<Import Project="$(VCTargetsPath)\BuildCustomizations\masm.targets" />
</ImportGroup>
</Project>
</Project>

View File

@ -521,7 +521,6 @@
<ClCompile Include="..\..\..\firmware.cpp" />
<ClCompile Include="..\..\..\gfx3d.cpp" />
<ClCompile Include="..\..\..\GPU.cpp" />
<ClCompile Include="..\..\..\lua-engine.cpp" />
<ClCompile Include="..\..\..\matrix.cpp" />
<ClCompile Include="..\..\..\mc.cpp" />
<ClCompile Include="..\..\..\MMU.cpp" />
@ -558,9 +557,6 @@
<ClCompile Include="..\..\..\utils\colorspacehandler\colorspacehandler_AltiVec.cpp">
<Filter>utils\colorspacehandler</Filter>
</ClCompile>
<ClCompile Include="..\draw_sdl.cpp">
<Filter>frontend\interface</Filter>
</ClCompile>
<ClCompile Include="..\interface.cpp">
<Filter>frontend\interface</Filter>
</ClCompile>
@ -582,6 +578,9 @@
<ClCompile Include="..\..\posix\shared\sndsdl.cpp">
<Filter>frontend\posix\shared</Filter>
</ClCompile>
<ClCompile Include="..\draw_sdl_window.cpp">
<Filter>frontend\interface</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\utils\guid.h">
@ -850,7 +849,6 @@
<ClInclude Include="..\..\..\GPU.h" />
<ClInclude Include="..\..\..\instruction_attributes.h" />
<ClInclude Include="..\..\..\instructions.h" />
<ClInclude Include="..\..\..\lua-engine.h" />
<ClInclude Include="..\..\..\matrix.h" />
<ClInclude Include="..\..\..\mc.h" />
<ClInclude Include="..\..\..\mem.h" />
@ -990,7 +988,4 @@
<None Include="..\instruction_tabdef.inc" />
<None Include="..\thumb_tabdef.inc" />
</ItemGroup>
<ItemGroup>
<CustomBuild Include="..\..\windows\lua\lua.7z" />
</ItemGroup>
</Project>

View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="IntegrityChecks" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<!-- Debug: typical build with max debugging -->
@ -88,7 +88,7 @@
<ClCompile>
<AdditionalIncludeDirectories>.;..\..;..\..\..;..\..\windows;..\..\windows\lua\include;.\SDL\include;glib-2.20.1\build;..\..\windows\zlib128;..\..\windows\zziplib;..\..\windows\winpcap;userconfig;..\..\windows\agg\include;..\..\windows\agg\examples;..\..\..\libretro-common\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>.;..\..;..\..\..;..\..\windows;.\SDL\include;glib-2.20.1\build;..\..\windows\zlib128;..\..\windows\zziplib;..\..\windows\winpcap;userconfig;..\..\windows\agg\include;..\..\windows\agg\examples;..\..\..\libretro-common\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<!-- We are building the interface -->
<PreprocessorDefinitions>TARGET_INTERFACE;WIN_EXPORT</PreprocessorDefinitions>
@ -154,7 +154,7 @@
<PreprocessorDefinitions>EXPERIMENTAL_WIFI_COMM=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<!-- desmume configuration: features we always have in windows -->
<PreprocessorDefinitions>HAVE_LIBAGG=1;HAVE_JIT=1;HAVE_LUA=1;HAVE_GL_GL_H=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>HAVE_LIBAGG=1;HAVE_JIT=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
@ -174,12 +174,10 @@
<AdditionalDependencies Label="Configuration" Condition="'$(NDS_VSVER)' &gt;= '14'">legacy_stdio_definitions.lib;%(AdditionalDependencies)</AdditionalDependencies>
<!-- general deps config -->
<AdditionalDependencies>SDLmain.lib;SDL.lib;lua51.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>SDLmain.lib;SDL.lib;%(AdditionalDependencies)</AdditionalDependencies>
<!-- (and windows libs) -->
<AdditionalDependencies>vfw32.lib;winmm.lib;opengl32.lib;glu32.lib;ws2_32.lib;user32.lib;gdi32.lib;shell32.lib;comdlg32.lib;shlwapi.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<DelayLoadDLLs>lua51.dll</DelayLoadDLLs>
<!-- debugging options -->
<GenerateDebugInformation>true</GenerateDebugInformation>
<GenerateMapFile>true</GenerateMapFile>