RPCS3/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2024-11-22 02:32:36 +01:00
Code Issues Releases Wiki Activity

Moves ffmpeg and minidx9 to 3rdparty

Browse Source
This commit is contained in:
AnnieL 2016-03-20 00:05:12 +00:00
parent afefecf1f0
commit 6182f5346d
10 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitmodules vendored
View File

@ -3,7 +3,7 @@
url = https://github.com/wxWidgets/wxWidgets url = https://github.com/wxWidgets/wxWidgets
ignore = dirty ignore = dirty
[submodule "rpcs3-ffmpeg"] [submodule "rpcs3-ffmpeg"]
path = ffmpeg path = 3rdparty/ffmpeg
url = https://github.com/hrydgard/ppsspp-ffmpeg url = https://github.com/hrydgard/ppsspp-ffmpeg
[submodule "asmjit"] [submodule "asmjit"]
path = asmjit path = asmjit
@ -14,7 +14,7 @@
url = https://github.com/llvm-mirror/llvm url = https://github.com/llvm-mirror/llvm
branch = release_36 branch = release_36
[submodule "minidx9"] [submodule "minidx9"]
path = minidx9 path = 3rdparty/minidx9
url = https://github.com/hrydgard/minidx9.git url = https://github.com/hrydgard/minidx9.git
[submodule "rsx_program_decompiler"] [submodule "rsx_program_decompiler"]
path = rsx_program_decompiler path = rsx_program_decompiler

2
.travis.yml
View File

@ -53,7 +53,7 @@ before_install:
fi; fi;
before_script: before_script:
- git submodule update --init asmjit ffmpeg rsx_program_decompiler GSL libpng Vulkan/glslang Vulkan/Vulkan-LoaderAndValidationLayers - git submodule update --init asmjit 3rdparty/ffmpeg rsx_program_decompiler GSL libpng Vulkan/glslang Vulkan/Vulkan-LoaderAndValidationLayers
- mkdir build - mkdir build
- cd build - cd build
- if [ "$TRAVIS_OS_NAME" = "linux" ]; then cmake ..; else cmake .. -DLLVM_DIR=/usr/local/opt/llvm36/lib/llvm-3.6/share/llvm/cmake; fi - if [ "$TRAVIS_OS_NAME" = "linux" ]; then cmake ..; else cmake .. -DLLVM_DIR=/usr/local/opt/llvm36/lib/llvm-3.6/share/llvm/cmake; fi

0
ffmpeg → 3rdparty/ffmpeg vendored
View File

0
minidx9 → 3rdparty/minidx9 vendored
View File

2
appveyor.yml
View File

@ -14,7 +14,7 @@ branches:
before_build: before_build:
# until git for win 2.5 release with commit checkout # until git for win 2.5 release with commit checkout
- git submodule update --init ffmpeg asmjit minidx9 rsx_program_decompiler GSL libpng Vulkan/glslang Vulkan/Vulkan-LoaderAndValidationLayers - git submodule update --init 3rdparty/ffmpeg asmjit 3rdparty/minidx9 rsx_program_decompiler GSL libpng Vulkan/glslang Vulkan/Vulkan-LoaderAndValidationLayers
- 7z x wxWidgets.7z -aos -oC:\rpcs3\wxWidgets > null - 7z x wxWidgets.7z -aos -oC:\rpcs3\wxWidgets > null
- 7z x zlib.7z -aos -oC:\rpcs3\ > null - 7z x zlib.7z -aos -oC:\rpcs3\ > null
- if %configuration%==Release (cmake -G "Visual Studio 14 Win64" -DZLIB_ROOT=C:/rpcs3/zlib/) - if %configuration%==Release (cmake -G "Visual Studio 14 Win64" -DZLIB_ROOT=C:/rpcs3/zlib/)

6
rpcs3/CMakeLists.txt
View File

@ -106,7 +106,7 @@ ${wxWidgets_INCLUDE_DIRS}
${ZLIB_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR}
${OPENAL_INCLUDE_DIR} ${OPENAL_INCLUDE_DIR}
${LLVM_INCLUDE_DIRS} ${LLVM_INCLUDE_DIRS}
"${RPCS3_SRC_DIR}/../ffmpeg/${PLATFORM_ARCH}/include" "${RPCS3_SRC_DIR}/../3rdparty/ffmpeg/${PLATFORM_ARCH}/include"
"${RPCS3_SRC_DIR}" "${RPCS3_SRC_DIR}"
"${RPCS3_SRC_DIR}/Loader" "${RPCS3_SRC_DIR}/Loader"
"${RPCS3_SRC_DIR}/Crypto" "${RPCS3_SRC_DIR}/Crypto"
@ -124,7 +124,7 @@ ${LLVM_INCLUDE_DIRS}
"${RPCS3_SRC_DIR}/../3rdparty/stblib" "${RPCS3_SRC_DIR}/../3rdparty/stblib"
) )
if(WIN32) if(WIN32)
include_directories(BEFORE "${RPCS3_SRC_DIR}/../minidx9/Include") include_directories(BEFORE "${RPCS3_SRC_DIR}/../3rdparty/minidx9/Include")
include_directories(BEFORE "${RPCS3_SRC_DIR}/../3rdparty/minidx12/Include") include_directories(BEFORE "${RPCS3_SRC_DIR}/../3rdparty/minidx12/Include")
endif() endif()
@ -153,7 +153,7 @@ link_directories(
) )
if(MSVC OR NOT WIN32) if(MSVC OR NOT WIN32)
link_directories("${RPCS3_SRC_DIR}/../ffmpeg/${PLATFORM_ARCH}/lib") link_directories("${RPCS3_SRC_DIR}/../3rdparty/ffmpeg/${PLATFORM_ARCH}/lib")
endif() endif()
get_property(dirs DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY INCLUDE_DIRECTORIES) get_property(dirs DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY INCLUDE_DIRECTORIES)

2
rpcs3/Emu/Audio/XAudio2/XAudio2Thread.h
View File

@ -6,7 +6,7 @@
#pragma push_macro("_WIN32_WINNT") #pragma push_macro("_WIN32_WINNT")
#undef _WIN32_WINNT #undef _WIN32_WINNT
#define _WIN32_WINNT 0x0601 // This is to be sure that correct (2.7) header is included #define _WIN32_WINNT 0x0601 // This is to be sure that correct (2.7) header is included
#include "minidx9/Include/XAudio2.h" // XAudio2 2.8 available only on Win8+, used XAudio2 2.7 from dxsdk #include "3rdparty/minidx9/Include/XAudio2.h" // XAudio2 2.8 available only on Win8+, used XAudio2 2.7 from dxsdk
#pragma pop_macro("_WIN32_WINNT") #pragma pop_macro("_WIN32_WINNT")
class XAudio2Thread : public AudioThread class XAudio2Thread : public AudioThread

2
rpcs3/emucore.vcxproj
View File

@ -388,7 +388,7 @@
</ClCompile> </ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="..\stblib\stb_image.h" /> <ClInclude Include="..\3rdparty\stblib\stb_image.h" />
<ClInclude Include="..\Utilities\Atomic.h" /> <ClInclude Include="..\Utilities\Atomic.h" />
<ClInclude Include="..\Utilities\AutoPause.h" /> <ClInclude Include="..\Utilities\AutoPause.h" />
<ClInclude Include="..\Utilities\BEType.h" /> <ClInclude Include="..\Utilities\BEType.h" />

2
rpcs3/rpcs3.vcxproj
View File

@ -91,7 +91,7 @@
<UseLibraryDependencyInputs>false</UseLibraryDependencyInputs> <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
</ProjectReference> </ProjectReference>
<ClCompile> <ClCompile>
<AdditionalIncludeDirectories>..\minidx9\Include;..\Vulkan\Vulkan-LoaderAndValidationLayers\include;..\Vulkan\glslang\glslang\Public;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>..\3rdparty\minidx9\Include;..\Vulkan\Vulkan-LoaderAndValidationLayers\include;..\Vulkan\glslang\glslang\Public;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalLibraryDirectories Condition="'$(Configuration)|$(Platform)'=='Debug - MemLeak|x64'">..\Vulkan\glslang-build\SPIRV\Debug;..\Vulkan\glslang-build\OGLCompilersDLL\Debug;..\Vulkan\glslang-build\glslang\OSDependent\Windows\Debug;..\Vulkan\Vulkan-build\loader\Debug;..\Vulkan\glslang-build\glslang\Debug;..\3rdparty\OpenAL\libs\Win64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories Condition="'$(Configuration)|$(Platform)'=='Debug - MemLeak|x64'">..\Vulkan\glslang-build\SPIRV\Debug;..\Vulkan\glslang-build\OGLCompilersDLL\Debug;..\Vulkan\glslang-build\glslang\OSDependent\Windows\Debug;..\Vulkan\Vulkan-build\loader\Debug;..\Vulkan\glslang-build\glslang\Debug;..\3rdparty\OpenAL\libs\Win64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

4
rpcs3_default.props
View File

@ -3,11 +3,15 @@
<ImportGroup Label="PropertySheets" /> <ImportGroup Label="PropertySheets" />
<PropertyGroup Label="UserMacros" /> <PropertyGroup Label="UserMacros" />
<PropertyGroup> <PropertyGroup>
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
<IncludePath>.\;..\;..\asmjit\src\asmjit;..\wxWidgets\include\msvc;..\wxWidgets\include;..\wxWidgets\src\zlib;..\ffmpeg\WindowsInclude;..\ffmpeg\Windows\x86_64\Include;$(VC_IncludePath);$(WindowsSDK_IncludePath);$(UniversalCRT_IncludePath);..\minidx12\Include;..\glm;..\GSL\include;..\libpng</IncludePath> <IncludePath>.\;..\;..\asmjit\src\asmjit;..\wxWidgets\include\msvc;..\wxWidgets\include;..\wxWidgets\src\zlib;..\ffmpeg\WindowsInclude;..\ffmpeg\Windows\x86_64\Include;$(VC_IncludePath);$(WindowsSDK_IncludePath);$(UniversalCRT_IncludePath);..\minidx12\Include;..\glm;..\GSL\include;..\libpng</IncludePath>
======= =======
<IncludePath>.\;..\;..\asmjit\src\asmjit;..\wxWidgets\include\msvc;..\wxWidgets\include;..\ffmpeg\WindowsInclude;..\ffmpeg\Windows\x86_64\Include;$(VC_IncludePath);$(WindowsSDK_IncludePath);$(UniversalCRT_IncludePath);..\3rdparty\minidx12\Include;..\glm;..\GSL\include;..\libpng;..\3rdparty\GL;..\3rdparty\stblib;..\3rdparty\OpenAL\include</IncludePath> <IncludePath>.\;..\;..\asmjit\src\asmjit;..\wxWidgets\include\msvc;..\wxWidgets\include;..\ffmpeg\WindowsInclude;..\ffmpeg\Windows\x86_64\Include;$(VC_IncludePath);$(WindowsSDK_IncludePath);$(UniversalCRT_IncludePath);..\3rdparty\minidx12\Include;..\glm;..\GSL\include;..\libpng;..\3rdparty\GL;..\3rdparty\stblib;..\3rdparty\OpenAL\include</IncludePath>
>>>>>>> 07c1ee3... Moves GL, minidx12, OpenAL, stblib to 3rdparty >>>>>>> 07c1ee3... Moves GL, minidx12, OpenAL, stblib to 3rdparty
=======
<IncludePath>.\;..\;..\asmjit\src\asmjit;..\wxWidgets\include\msvc;..\wxWidgets\include;..\3rdparty\ffmpeg\WindowsInclude;..\ffmpeg\Windows\x86_64\Include;$(VC_IncludePath);$(WindowsSDK_IncludePath);$(UniversalCRT_IncludePath);..\3rdparty\minidx12\Include;..\glm;..\GSL\include;..\libpng;..\3rdparty\GL;..\3rdparty\stblib;..\3rdparty\OpenAL\include</IncludePath>
>>>>>>> 0283af3... Moves ffmpeg and minidx9 to 3rdparty
<OutDir>$(SolutionDir)lib\$(Configuration)-$(Platform)\</OutDir> <OutDir>$(SolutionDir)lib\$(Configuration)-$(Platform)\</OutDir>
<LibraryPath>$(SolutionDir)lib\$(Configuration)-$(Platform)\;$(UniversalCRT_LibraryPath_x64);$(LibraryPath)</LibraryPath> <LibraryPath>$(SolutionDir)lib\$(Configuration)-$(Platform)\;$(UniversalCRT_LibraryPath_x64);$(LibraryPath)</LibraryPath>
<IntDir>$(SolutionDir)tmp\$(ProjectName)-$(Configuration)-$(Platform)\</IntDir> <IntDir>$(SolutionDir)tmp\$(ProjectName)-$(Configuration)-$(Platform)\</IntDir>