mirror of
https://github.com/mupen64plus/mupen64plus-core.git
synced 2024-06-02 19:27:51 -04:00
Move third-party code into subprojects directory.
This commit is contained in:
Bobby Smiles
parent
9f3c611a56
commit
629d8ed57a
|
|
@ -83,16 +83,11 @@
|
|||
<ClCompile Include="..\..\src\main\eventloop.c" />
|
||||
<ClCompile Include="..\..\src\main\lirc.c" />
|
||||
<ClCompile Include="..\..\src\main\main.c" />
|
||||
<ClCompile Include="..\..\src\main\xxHash\xxhash.c" />
|
||||
<ClCompile Include="..\..\src\main\md5.c" />
|
||||
<ClCompile Include="..\..\src\main\rom.c" />
|
||||
<ClCompile Include="..\..\src\main\savestates.c" />
|
||||
<ClCompile Include="..\..\src\main\sdl_key_converter.c" />
|
||||
<ClCompile Include="..\..\src\main\util.c" />
|
||||
<ClCompile Include="..\..\src\main\workqueue.c" />
|
||||
<ClCompile Include="..\..\src\main\zip\ioapi.c" />
|
||||
<ClCompile Include="..\..\src\main\zip\unzip.c" />
|
||||
<ClCompile Include="..\..\src\main\zip\zip.c" />
|
||||
<ClCompile Include="..\..\src\device\memory\memory.c" />
|
||||
<ClCompile Include="..\..\src\osal\dynamiclib_unix.c">
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
|
||||
|
|
@ -116,7 +111,6 @@
|
|||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='New_Dynarec_Release|x64'">true</ExcludedFromBuild>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\osal\files_win32.c" />
|
||||
<ClCompile Include="..\..\src\osd\OGLFT.cpp" />
|
||||
<ClCompile Include="..\..\src\osd\osd.cpp" />
|
||||
<ClCompile Include="..\..\src\osd\screenshot.c" />
|
||||
<ClCompile Include="..\..\src\device\rcp\pi\pi_controller.c" />
|
||||
|
|
@ -248,6 +242,12 @@
|
|||
<ClCompile Include="..\..\src\device\pif\cic.c" />
|
||||
<ClCompile Include="..\..\src\device\pif\n64_cic_nus_6105.c" />
|
||||
<ClCompile Include="..\..\src\device\pif\pif.c" />
|
||||
<ClCompile Include="..\..\subprojects\md5\md5.c" />
|
||||
<ClCompile Include="..\..\subprojects\minizip\ioapi.c" />
|
||||
<ClCompile Include="..\..\subprojects\minizip\unzip.c" />
|
||||
<ClCompile Include="..\..\subprojects\minizip\zip.c" />
|
||||
<ClCompile Include="..\..\subprojects\oglft\OGLFT.cpp" />
|
||||
<ClCompile Include="..\..\subprojects\xxhash\xxhash.c" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClInclude Include="..\..\src\api\callbacks.h" />
|
||||
|
|
@ -300,23 +300,16 @@
|
|||
<ClInclude Include="..\..\src\main\lirc.h" />
|
||||
<ClInclude Include="..\..\src\main\list.h" />
|
||||
<ClInclude Include="..\..\src\main\main.h" />
|
||||
<ClInclude Include="..\..\src\main\md5.h" />
|
||||
<ClInclude Include="..\..\src\main\rom.h" />
|
||||
<ClInclude Include="..\..\src\main\savestates.h" />
|
||||
<ClInclude Include="..\..\src\main\sdl_key_converter.h" />
|
||||
<ClInclude Include="..\..\src\main\util.h" />
|
||||
<ClInclude Include="..\..\src\main\version.h" />
|
||||
<ClInclude Include="..\..\src\main\workqueue.h" />
|
||||
<ClInclude Include="..\..\src\main\xxHash\xxhash.h" />
|
||||
<ClInclude Include="..\..\src\main\zip\crypt.h" />
|
||||
<ClInclude Include="..\..\src\main\zip\ioapi.h" />
|
||||
<ClInclude Include="..\..\src\main\zip\unzip.h" />
|
||||
<ClInclude Include="..\..\src\main\zip\zip.h" />
|
||||
<ClInclude Include="..\..\src\device\memory\memory.h" />
|
||||
<ClInclude Include="..\..\src\osal\dynamiclib.h" />
|
||||
<ClInclude Include="..\..\src\osal\files.h" />
|
||||
<ClInclude Include="..\..\src\osal\preproc.h" />
|
||||
<ClInclude Include="..\..\src\osd\OGLFT.h" />
|
||||
<ClInclude Include="..\..\src\osd\osd.h" />
|
||||
<ClInclude Include="..\..\src\osd\screenshot.h" />
|
||||
<ClInclude Include="..\..\src\device\rcp\pi\pi_controller.h" />
|
||||
|
|
@ -459,6 +452,13 @@
|
|||
<ClInclude Include="..\..\src\device\pif\cic.h" />
|
||||
<ClInclude Include="..\..\src\device\pif\n64_cic_nus_6105.h" />
|
||||
<ClInclude Include="..\..\src\device\pif\pif.h" />
|
||||
<ClInclude Include="..\..\subprojects\md5\md5.h" />
|
||||
<ClInclude Include="..\..\subprojects\minizip\crypt.h" />
|
||||
<ClInclude Include="..\..\subprojects\minizip\ioapi.h" />
|
||||
<ClInclude Include="..\..\subprojects\minizip\unzip.h" />
|
||||
<ClInclude Include="..\..\subprojects\minizip\zip.h" />
|
||||
<ClInclude Include="..\..\subprojects\oglft\OGLFT.h" />
|
||||
<ClInclude Include="..\..\subprojects\xxhash\xxhash.h" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<None Include="..\..\src\device\r4300\mips_instructions.def" />
|
||||
|
|
@ -671,7 +671,7 @@
|
|||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
<ClCompile>
|
||||
<Optimization>Disabled</Optimization>
|
||||
<AdditionalIncludeDirectories>..\..\src;..\..\..\mupen64plus-win32-deps\SDL-1.2.15\include;..\..\..\mupen64plus-win32-deps\zlib-1.2.8\include;..\..\..\mupen64plus-win32-deps\libpng-1.6.18\include;..\..\..\mupen64plus-win32-deps\freetype-2.6\include;..\..\..\mupen64plus-win32-deps\opencv-3.0.0\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<AdditionalIncludeDirectories>..\..\src;..\..\subprojects\md5;..\..\subprojects\minizip;..\..\subprojects\oglft;..\..\subprojects\xxhash;..\..\..\mupen64plus-win32-deps\SDL-1.2.15\include;..\..\..\mupen64plus-win32-deps\zlib-1.2.8\include;..\..\..\mupen64plus-win32-deps\libpng-1.6.18\include;..\..\..\mupen64plus-win32-deps\freetype-2.6\include;..\..\..\mupen64plus-win32-deps\opencv-3.0.0\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;DYNAREC;M64P_OSD;M64P_PARALLEL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<MinimalRebuild>true</MinimalRebuild>
|
||||
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
|
||||
|
|
@ -697,7 +697,7 @@
|
|||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
||||
<ClCompile>
|
||||
<Optimization>Disabled</Optimization>
|
||||
<AdditionalIncludeDirectories>..\..\src;..\..\..\mupen64plus-win32-deps\SDL-1.2.15\include;..\..\..\mupen64plus-win32-deps\zlib-1.2.8\include;..\..\..\mupen64plus-win32-deps\libpng-1.6.18\include;..\..\..\mupen64plus-win32-deps\freetype-2.6\include;..\..\..\mupen64plus-win32-deps\opencv-3.0.0\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<AdditionalIncludeDirectories>..\..\src;..\..\subprojects\md5;..\..\subprojects\minizip;..\..\subprojects\oglft;..\..\subprojects\xxhash;..\..\..\mupen64plus-win32-deps\SDL-1.2.15\include;..\..\..\mupen64plus-win32-deps\zlib-1.2.8\include;..\..\..\mupen64plus-win32-deps\libpng-1.6.18\include;..\..\..\mupen64plus-win32-deps\freetype-2.6\include;..\..\..\mupen64plus-win32-deps\opencv-3.0.0\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;DYNAREC;M64P_PARALLEL;M64P_OSD;__x86_64__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
|
||||
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
|
||||
|
|
@ -722,7 +722,7 @@
|
|||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='New_Dynarec_Debug|Win32'">
|
||||
<ClCompile>
|
||||
<Optimization>Disabled</Optimization>
|
||||
<AdditionalIncludeDirectories>..\..\src;..\..\..\mupen64plus-win32-deps\SDL-1.2.15\include;..\..\..\mupen64plus-win32-deps\zlib-1.2.8\include;..\..\..\mupen64plus-win32-deps\libpng-1.6.18\include;..\..\..\mupen64plus-win32-deps\freetype-2.6\include;..\..\..\mupen64plus-win32-deps\opencv-3.0.0\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<AdditionalIncludeDirectories>..\..\src;..\..\subprojects\md5;..\..\subprojects\minizip;..\..\subprojects\oglft;..\..\subprojects\xxhash;..\..\..\mupen64plus-win32-deps\SDL-1.2.15\include;..\..\..\mupen64plus-win32-deps\zlib-1.2.8\include;..\..\..\mupen64plus-win32-deps\libpng-1.6.18\include;..\..\..\mupen64plus-win32-deps\freetype-2.6\include;..\..\..\mupen64plus-win32-deps\opencv-3.0.0\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;DYNAREC;M64P_OSD;M64P_PARALLEL;NEW_DYNAREC=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<MinimalRebuild>true</MinimalRebuild>
|
||||
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
|
||||
|
|
@ -753,7 +753,7 @@
|
|||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='New_Dynarec_Debug|x64'">
|
||||
<ClCompile>
|
||||
<Optimization>Disabled</Optimization>
|
||||
<AdditionalIncludeDirectories>..\..\src;..\..\..\mupen64plus-win32-deps\SDL-1.2.15\include;..\..\..\mupen64plus-win32-deps\zlib-1.2.8\include;..\..\..\mupen64plus-win32-deps\libpng-1.6.18\include;..\..\..\mupen64plus-win32-deps\freetype-2.6\include;..\..\..\mupen64plus-win32-deps\opencv-3.0.0\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<AdditionalIncludeDirectories>..\..\src;..\..\subprojects\md5;..\..\subprojects\minizip;..\..\subprojects\oglft;..\..\subprojects\xxhash;..\..\..\mupen64plus-win32-deps\SDL-1.2.15\include;..\..\..\mupen64plus-win32-deps\zlib-1.2.8\include;..\..\..\mupen64plus-win32-deps\libpng-1.6.18\include;..\..\..\mupen64plus-win32-deps\freetype-2.6\include;..\..\..\mupen64plus-win32-deps\opencv-3.0.0\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;DYNAREC;M64P_PARALLEL;M64P_OSD;NEW_DYNAREC=1;__x86_64__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
|
||||
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
|
||||
|
|
@ -779,7 +779,7 @@
|
|||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||
<ClCompile>
|
||||
<AdditionalIncludeDirectories>..\..\src;..\..\..\mupen64plus-win32-deps\SDL-1.2.15\include;..\..\..\mupen64plus-win32-deps\zlib-1.2.8\include;..\..\..\mupen64plus-win32-deps\libpng-1.6.18\include;..\..\..\mupen64plus-win32-deps\freetype-2.6\include;..\..\..\mupen64plus-win32-deps\opencv-3.0.0\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<AdditionalIncludeDirectories>..\..\src;..\..\subprojects\md5;..\..\subprojects\minizip;..\..\subprojects\oglft;..\..\subprojects\xxhash;..\..\..\mupen64plus-win32-deps\SDL-1.2.15\include;..\..\..\mupen64plus-win32-deps\zlib-1.2.8\include;..\..\..\mupen64plus-win32-deps\libpng-1.6.18\include;..\..\..\mupen64plus-win32-deps\freetype-2.6\include;..\..\..\mupen64plus-win32-deps\opencv-3.0.0\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;DYNAREC;M64P_OSD;M64P_PARALLEL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
|
||||
<PrecompiledHeader>
|
||||
|
|
@ -803,7 +803,7 @@
|
|||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
||||
<ClCompile>
|
||||
<AdditionalIncludeDirectories>..\..\src;..\..\..\mupen64plus-win32-deps\SDL-1.2.15\include;..\..\..\mupen64plus-win32-deps\zlib-1.2.8\include;..\..\..\mupen64plus-win32-deps\libpng-1.6.18\include;..\..\..\mupen64plus-win32-deps\freetype-2.6\include;..\..\..\mupen64plus-win32-deps\opencv-3.0.0\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<AdditionalIncludeDirectories>..\..\src;..\..\subprojects\md5;..\..\subprojects\minizip;..\..\subprojects\oglft;..\..\subprojects\xxhash;..\..\..\mupen64plus-win32-deps\SDL-1.2.15\include;..\..\..\mupen64plus-win32-deps\zlib-1.2.8\include;..\..\..\mupen64plus-win32-deps\libpng-1.6.18\include;..\..\..\mupen64plus-win32-deps\freetype-2.6\include;..\..\..\mupen64plus-win32-deps\opencv-3.0.0\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;DYNAREC;M64P_PARALLEL;M64P_OSD;__x86_64__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
|
||||
<PrecompiledHeader>
|
||||
|
|
@ -826,7 +826,7 @@
|
|||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='New_Dynarec_Release|Win32'">
|
||||
<ClCompile>
|
||||
<AdditionalIncludeDirectories>..\..\src;..\..\..\mupen64plus-win32-deps\SDL-1.2.15\include;..\..\..\mupen64plus-win32-deps\zlib-1.2.8\include;..\..\..\mupen64plus-win32-deps\libpng-1.6.18\include;..\..\..\mupen64plus-win32-deps\freetype-2.6\include;..\..\..\mupen64plus-win32-deps\opencv-3.0.0\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<AdditionalIncludeDirectories>..\..\src;..\..\subprojects\md5;..\..\subprojects\minizip;..\..\subprojects\oglft;..\..\subprojects\xxhash;..\..\..\mupen64plus-win32-deps\SDL-1.2.15\include;..\..\..\mupen64plus-win32-deps\zlib-1.2.8\include;..\..\..\mupen64plus-win32-deps\libpng-1.6.18\include;..\..\..\mupen64plus-win32-deps\freetype-2.6\include;..\..\..\mupen64plus-win32-deps\opencv-3.0.0\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;DYNAREC;M64P_OSD;M64P_PARALLEL;NEW_DYNAREC=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
|
||||
<PrecompiledHeader>
|
||||
|
|
@ -850,7 +850,7 @@
|
|||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='New_Dynarec_Release|x64'">
|
||||
<ClCompile>
|
||||
<AdditionalIncludeDirectories>..\..\src;..\..\..\mupen64plus-win32-deps-deps\SDL-1.2.15\include;..\..\..\mupen64plus-win32-deps\zlib-1.2.8\include;..\..\..\mupen64plus-win32-deps\libpng-1.6.18\include;..\..\..\mupen64plus-win32-deps\freetype-2.6\include;..\..\..\mupen64plus-win32-deps\opencv-3.0.0\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<AdditionalIncludeDirectories>..\..\src;..\..\subprojects\md5;..\..\subprojects\minizip;..\..\subprojects\oglft;..\..\subprojects\xxhash;..\..\..\mupen64plus-win32-deps-deps\SDL-1.2.15\include;..\..\..\mupen64plus-win32-deps\zlib-1.2.8\include;..\..\..\mupen64plus-win32-deps\libpng-1.6.18\include;..\..\..\mupen64plus-win32-deps\freetype-2.6\include;..\..\..\mupen64plus-win32-deps\opencv-3.0.0\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;DYNAREC;M64P_PARALLEL;M64P_OSD;NEW_DYNAREC=1;__x86_64__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
|
||||
<PrecompiledHeader>
|
||||
|
|
|
|||
|
|
@ -19,9 +19,6 @@
|
|||
<Filter Include="plugin">
|
||||
<UniqueIdentifier>{f8d14190-4f81-4bfa-bb8d-5a10c2292396}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="main\zip">
|
||||
<UniqueIdentifier>{05c49d60-e191-4e2f-85bd-c972e1cf97e2}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="backends">
|
||||
<UniqueIdentifier>{4e08d3a7-cb15-4bc5-8d8a-04fea5461fb1}</UniqueIdentifier>
|
||||
</Filter>
|
||||
|
|
@ -61,9 +58,6 @@
|
|||
<Filter Include="backends\plugins_compat">
|
||||
<UniqueIdentifier>{da1e6509-b45c-44b5-b5af-22461efed567}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="main\xxHash">
|
||||
<UniqueIdentifier>{90e007c6-198a-4334-8bae-9f40b48e9569}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="device\cart">
|
||||
<UniqueIdentifier>{c5515050-4fb5-4679-be02-0d6ca91b776f}</UniqueIdentifier>
|
||||
</Filter>
|
||||
|
|
@ -103,6 +97,18 @@
|
|||
<Filter Include="device\rcp\vi">
|
||||
<UniqueIdentifier>{ba830992-ba04-4afc-aac4-7538801f1eb5}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="subprojects\md5">
|
||||
<UniqueIdentifier>{bafd976c-f27f-4d58-b4cb-880174adc9d5}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="subprojects\minizip">
|
||||
<UniqueIdentifier>{05c49d60-e191-4e2f-85bd-c972e1cf97e2}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="subprojects\oglft">
|
||||
<UniqueIdentifier>{e064708a-0ea3-4bf5-b4e1-1e74f85197c2}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="subprojects\xxhash">
|
||||
<UniqueIdentifier>{90e007c6-198a-4334-8bae-9f40b48e9569}</UniqueIdentifier>
|
||||
</Filter>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClCompile Include="..\..\src\api\callbacks.c">
|
||||
|
|
@ -123,15 +129,6 @@
|
|||
<ClCompile Include="..\..\src\api\vidext.c">
|
||||
<Filter>api</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\main\zip\ioapi.c">
|
||||
<Filter>main\zip</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\main\zip\unzip.c">
|
||||
<Filter>main\zip</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\main\zip\zip.c">
|
||||
<Filter>main\zip</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\main\cheat.c">
|
||||
<Filter>main</Filter>
|
||||
</ClCompile>
|
||||
|
|
@ -144,9 +141,6 @@
|
|||
<ClCompile Include="..\..\src\main\main.c">
|
||||
<Filter>main</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\main\md5.c">
|
||||
<Filter>main</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\main\rom.c">
|
||||
<Filter>main</Filter>
|
||||
</ClCompile>
|
||||
|
|
@ -177,9 +171,6 @@
|
|||
<ClCompile Include="..\..\src\osal\files_win32.c">
|
||||
<Filter>osal</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\osd\OGLFT.cpp">
|
||||
<Filter>osd</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\osd\osd.cpp">
|
||||
<Filter>osd</Filter>
|
||||
</ClCompile>
|
||||
|
|
@ -309,9 +300,6 @@
|
|||
<ClCompile Include="..\..\src\backends\plugins_compat\input_plugin_compat.c">
|
||||
<Filter>backends\plugins_compat</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\main\xxHash\xxhash.c">
|
||||
<Filter>main\xxHash</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\device\gb\gb_cart.c">
|
||||
<Filter>device\gb</Filter>
|
||||
</ClCompile>
|
||||
|
|
@ -384,6 +372,24 @@
|
|||
<ClCompile Include="..\..\src\device\rcp\rdp\fb.c">
|
||||
<Filter>device\rcp\rdp</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\subprojects\md5\md5.c">
|
||||
<Filter>subprojects\md5</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\subprojects\minizip\ioapi.c">
|
||||
<Filter>subprojects\minizip</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\subprojects\minizip\unzip.c">
|
||||
<Filter>subprojects\minizip</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\subprojects\minizip\zip.c">
|
||||
<Filter>subprojects\minizip</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\subprojects\oglft\OGLFT.cpp">
|
||||
<Filter>subprojects\oglft</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\subprojects\xxhash\xxhash.c">
|
||||
<Filter>subprojects\xxhash</Filter>
|
||||
</ClCompile>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClInclude Include="..\..\src\api\callbacks.h">
|
||||
|
|
@ -422,18 +428,6 @@
|
|||
<ClInclude Include="..\..\src\api\vidext_sdl2_compat.h">
|
||||
<Filter>api</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\main\zip\crypt.h">
|
||||
<Filter>main\zip</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\main\zip\ioapi.h">
|
||||
<Filter>main\zip</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\main\zip\unzip.h">
|
||||
<Filter>main\zip</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\main\zip\zip.h">
|
||||
<Filter>main\zip</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\main\cheat.h">
|
||||
<Filter>main</Filter>
|
||||
</ClInclude>
|
||||
|
|
@ -449,9 +443,6 @@
|
|||
<ClInclude Include="..\..\src\main\main.h">
|
||||
<Filter>main</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\main\md5.h">
|
||||
<Filter>main</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\main\rom.h">
|
||||
<Filter>main</Filter>
|
||||
</ClInclude>
|
||||
|
|
@ -482,9 +473,6 @@
|
|||
<ClInclude Include="..\..\src\osal\preproc.h">
|
||||
<Filter>osal</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\osd\OGLFT.h">
|
||||
<Filter>osd</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\osd\osd.h">
|
||||
<Filter>osd</Filter>
|
||||
</ClInclude>
|
||||
|
|
@ -638,9 +626,6 @@
|
|||
<ClInclude Include="..\..\src\backends\plugins_compat\plugins_compat.h">
|
||||
<Filter>backends\plugins_compat</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\main\xxHash\xxhash.h">
|
||||
<Filter>main\xxHash</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\device\gb\gb_cart.h">
|
||||
<Filter>device\gb</Filter>
|
||||
</ClInclude>
|
||||
|
|
@ -713,6 +698,27 @@
|
|||
<ClInclude Include="..\..\src\device\rcp\rdp\fb.h">
|
||||
<Filter>device\rcp\rdp</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\subprojects\md5\md5.h">
|
||||
<Filter>subprojects\md5</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\subprojects\minizip\crypt.h">
|
||||
<Filter>subprojects\minizip</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\subprojects\minizip\ioapi.h">
|
||||
<Filter>subprojects\minizip</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\subprojects\minizip\unzip.h">
|
||||
<Filter>subprojects\minizip</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\subprojects\minizip\zip.h">
|
||||
<Filter>subprojects\minizip</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\subprojects\oglft\OGLFT.h">
|
||||
<Filter>subprojects\oglft</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\subprojects\xxhash\xxhash.h">
|
||||
<Filter>subprojects\xxhash</Filter>
|
||||
</ClInclude>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<None Include="..\..\src\device\r4300\mips_instructions.def">
|
||||
|
|
|
|||
|
|
@ -446,6 +446,7 @@ endif
|
|||
|
||||
SRCDIR = ../../src
|
||||
OBJDIR = _obj$(POSTFIX)
|
||||
SUBDIR = ../../subprojects
|
||||
|
||||
# list of required source files for compilation
|
||||
SOURCE = \
|
||||
|
|
@ -504,12 +505,10 @@ SOURCE = \
|
|||
$(SRCDIR)/main/util.c \
|
||||
$(SRCDIR)/main/cheat.c \
|
||||
$(SRCDIR)/main/eventloop.c \
|
||||
$(SRCDIR)/main/md5.c \
|
||||
$(SRCDIR)/main/rom.c \
|
||||
$(SRCDIR)/main/savestates.c \
|
||||
$(SRCDIR)/main/sdl_key_converter.c \
|
||||
$(SRCDIR)/main/workqueue.c \
|
||||
$(SRCDIR)/main/xxHash/xxhash.c \
|
||||
$(SRCDIR)/plugin/plugin.c \
|
||||
$(SRCDIR)/plugin/dummy_video.c \
|
||||
$(SRCDIR)/plugin/dummy_audio.c \
|
||||
|
|
@ -517,6 +516,18 @@ SOURCE = \
|
|||
$(SRCDIR)/plugin/dummy_rsp.c \
|
||||
$(SRCDIR)/osd/screenshot.c
|
||||
|
||||
# MD5 lib
|
||||
SOURCE += \
|
||||
$(SUBDIR)/md5/md5.c
|
||||
CFLAGS += -I$(SUBDIR)/md5
|
||||
|
||||
|
||||
# xxhash
|
||||
SOURCE += \
|
||||
$(SUBDIR)/xxhash/xxhash.c
|
||||
CFLAGS += -I$(SUBDIR)/xxhash
|
||||
|
||||
|
||||
ifeq ("$(OS)","MINGW")
|
||||
SOURCE += \
|
||||
$(SRCDIR)/osal/dynamiclib_win32.c \
|
||||
|
|
@ -533,8 +544,11 @@ endif
|
|||
|
||||
ifeq ($(OSD), 1)
|
||||
SOURCE += \
|
||||
$(SRCDIR)/osd/OGLFT.cpp \
|
||||
$(SRCDIR)/osd/osd.cpp
|
||||
|
||||
# oglft
|
||||
SOURCE += $(SUBDIR)/oglft/OGLFT.cpp
|
||||
CXXFLAGS += -I$(SUBDIR)/oglft
|
||||
endif
|
||||
|
||||
# source files for optional features
|
||||
|
|
@ -599,13 +613,13 @@ endif
|
|||
|
||||
ifeq ($(shell $(PKG_CONFIG) --modversion minizip 2>/dev/null),)
|
||||
SOURCE += \
|
||||
$(SRCDIR)/main/zip/ioapi.c \
|
||||
$(SRCDIR)/main/zip/zip.c \
|
||||
$(SRCDIR)/main/zip/unzip.c
|
||||
$(SUBDIR)/minizip/ioapi.c \
|
||||
$(SUBDIR)/minizip/zip.c \
|
||||
$(SUBDIR)/minizip/unzip.c
|
||||
|
||||
CFLAGS += -DNOCRYPT -DNOUNCRYPT
|
||||
CFLAGS += -DNOCRYPT -DNOUNCRYPT -I$(SUBDIR)/minizip
|
||||
else
|
||||
CFLAGS += $(shell $(PKG_CONFIG) --cflags minizip) -DLIBMINIZIP
|
||||
CFLAGS += $(shell $(PKG_CONFIG) --cflags minizip)
|
||||
LDLIBS += $(shell $(PKG_CONFIG) --libs minizip)
|
||||
endif
|
||||
|
||||
|
|
@ -636,9 +650,11 @@ endif
|
|||
|
||||
|
||||
# generate a list of object files to build, make a temporary directory for them
|
||||
OBJECTS := $(patsubst $(SRCDIR)/%.c, $(OBJDIR)/%.o, $(filter %.c, $(SOURCE)))
|
||||
OBJECTS := $(patsubst $(SRCDIR)/%.c, $(OBJDIR)/%.o, $(filter $(SRCDIR)/%.c, $(SOURCE)))
|
||||
OBJECTS += $(patsubst $(SUBDIR)/%.c, $(OBJDIR)/subprojects/%.o, $(filter $(SUBDIR)/%.c, $(SOURCE)))
|
||||
OBJECTS += $(patsubst $(SRCDIR)/%.c, $(OBJDIR)/%.o, $(SRCDIR)/asm_defines/asm_defines.c)
|
||||
OBJECTS += $(patsubst $(SRCDIR)/%.cpp, $(OBJDIR)/%.o, $(filter %.cpp, $(SOURCE)))
|
||||
OBJECTS += $(patsubst $(SRCDIR)/%.cpp, $(OBJDIR)/%.o, $(filter $(SRCDIR)/%.cpp, $(SOURCE)))
|
||||
OBJECTS += $(patsubst $(SUBDIR)/%.cpp, $(OBJDIR)/subprojects/%.o, $(filter $(SUBDIR)/%.cpp, $(SOURCE)))
|
||||
OBJECTS += $(patsubst $(SRCDIR)/%.S, $(OBJDIR)/%.o, $(filter %.S, $(SOURCE)))
|
||||
OBJECTS += $(patsubst $(SRCDIR)/%.asm, $(OBJDIR)/%.o, $(filter %.asm, $(SOURCE)))
|
||||
OBJDIRS = $(dir $(OBJECTS))
|
||||
|
|
@ -740,6 +756,13 @@ $(OBJDIR)/%.o: $(SRCDIR)/%.c
|
|||
$(OBJDIR)/%.o: $(SRCDIR)/%.cpp
|
||||
$(COMPILE.cc) -o $@ $<
|
||||
|
||||
$(OBJDIR)/subprojects/%.o: $(SUBDIR)/%.c
|
||||
$(COMPILE.c) -o $@ $<
|
||||
|
||||
$(OBJDIR)/subprojects/%.o: $(SUBDIR)/%.cpp
|
||||
$(COMPILE.cc) -o $@ $<
|
||||
|
||||
|
||||
$(TARGET): $(OBJECTS)
|
||||
$(LINK.o) $^ $(LOADLIBES) $(LDLIBS) -o $@
|
||||
if [ "$(SONAME)" != "" ]; then ln -sf $@ $(SONAME); fi
|
||||
|
|
|
|||
|
|
@ -28,6 +28,7 @@
|
|||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <md5.h>
|
||||
|
||||
#define M64P_CORE_PROTOTYPES 1
|
||||
#include "callbacks.h"
|
||||
|
|
@ -38,7 +39,6 @@
|
|||
#include "main/cheat.h"
|
||||
#include "main/eventloop.h"
|
||||
#include "main/main.h"
|
||||
#include "main/md5.h"
|
||||
#include "main/rom.h"
|
||||
#include "main/savestates.h"
|
||||
#include "main/util.h"
|
||||
|
|
|
|||
|
|
@ -56,9 +56,10 @@
|
|||
#include "device/memory/memory.h"
|
||||
#include "device/rcp/mi/mi_controller.h"
|
||||
#include "device/rdram/rdram.h"
|
||||
#include "main/xxHash/xxhash.h"
|
||||
#include "osal/preproc.h"
|
||||
|
||||
#include <xxhash.h>
|
||||
|
||||
#include <inttypes.h>
|
||||
#include <stdint.h>
|
||||
|
||||
|
|
|
|||
|
|
@ -23,10 +23,10 @@
|
|||
#ifndef __ROM_H__
|
||||
#define __ROM_H__
|
||||
|
||||
#include <md5.h>
|
||||
#include <stdint.h>
|
||||
|
||||
#include "api/m64p_types.h"
|
||||
#include "md5.h"
|
||||
|
||||
#define BIT(bitnr) (1ULL << (bitnr))
|
||||
#ifdef __GNUC__
|
||||
|
|
|
|||
|
|
@ -31,6 +31,8 @@
|
|||
#include <string.h>
|
||||
#include <sys/types.h>
|
||||
#include <zlib.h>
|
||||
#include <unzip.h>
|
||||
#include <zip.h>
|
||||
|
||||
#define M64P_CORE_PROTOTYPES 1
|
||||
#include "api/callbacks.h"
|
||||
|
|
@ -49,14 +51,6 @@
|
|||
#include "util.h"
|
||||
#include "workqueue.h"
|
||||
|
||||
#ifdef LIBMINIZIP
|
||||
#include <unzip.h>
|
||||
#include <zip.h>
|
||||
#else
|
||||
#include "main/zip/unzip.h"
|
||||
#include "main/zip/zip.h"
|
||||
#endif
|
||||
|
||||
enum { GB_CART_FINGERPRINT_SIZE = 0x1c };
|
||||
enum { GB_CART_FINGERPRINT_OFFSET = 0x134 };
|
||||
|
||||
|
|
|
|||
|
|
@ -21,15 +21,17 @@
|
|||
|
||||
#include "osd.h"
|
||||
|
||||
#include <OGLFT.h>
|
||||
|
||||
#include <SDL.h>
|
||||
#include <SDL_opengl.h>
|
||||
#include <SDL_thread.h>
|
||||
|
||||
#include <stdarg.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
||||
#include "OGLFT.h"
|
||||
|
||||
#define M64P_CORE_PROTOTYPES 1
|
||||
#include "api/m64p_config.h"
|
||||
|
|
|
|||
Loading…
Reference in a new issue