libretro/ppsspp
1
0
Fork 0
mirror of https://github.com/libretro/ppsspp.git synced 2024-12-18 06:37:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
853143e9df
ppsspp/CMakeLists.txt

1796 lines
53 KiB
CMake
Raw Normal View History

Add vim modeline to CMakeLists.txt
2012-11-26 22:03:44 +00:00
# vim:noexpandtab:
CMake-based build system. Tested on Windows with NMake Makefiles and Visual Studio 11 targets. Tested on Linux with GNU Makefiles target, using GCC as the compiler. Tested on FreeBSD using clang as the compiler. Tested for Android on Windows with NMake Makefiles and r8c NDK. Proxy-tested by xsacha for blackberry. The android build requires that the android/android.toolchain.cmake toolchain file is used; an error will be raised if ANDROID is defined without loading the toolchain file. When targeting ANDROID, the resulting .so files will be placed in "android/libs/$ANDROID_ABI" even when building out of tree, since it's where `ant` expects to find them. Since the Core library is expected to be named 'ppsspp_jni' on ANDROID, we also put its name in a variable that is set to 'Core' unless building on ANDROID, where it is 'ppsspp_jni'.
2012-11-18 16:00:27 +00:00
cmake_minimum_required(VERSION 2.8.8)
project(PPSSPP)
CMake: Fix up optimisations (broken for everyone except Apple?), move some Blackberry lines to toolchain, enable assembly, use add_definitions for definitions and *flags for flags, remove redundant lines.
2014-06-11 13:02:56 +00:00
enable_language(ASM)
Detect and use SDL2 with help of this Dolphin CMake module: https://github.com/dolphin-emu/dolphin/blob/master/CMakeTests/FindSDL2.cmake
2014-09-01 09:37:44 +00:00
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/CMakeTests)
CMake-based build system. Tested on Windows with NMake Makefiles and Visual Studio 11 targets. Tested on Linux with GNU Makefiles target, using GCC as the compiler. Tested on FreeBSD using clang as the compiler. Tested for Android on Windows with NMake Makefiles and r8c NDK. Proxy-tested by xsacha for blackberry. The android build requires that the android/android.toolchain.cmake toolchain file is used; an error will be raised if ANDROID is defined without loading the toolchain file. When targeting ANDROID, the resulting .so files will be placed in "android/libs/$ANDROID_ABI" even when building out of tree, since it's where `ant` expects to find them. Since the Core library is expected to be named 'ppsspp_jni' on ANDROID, we also put its name in a variable that is set to 'Core' unless building on ANDROID, where it is 'ppsspp_jni'.
2012-11-18 16:00:27 +00:00
Add "PPSSPP" definition so we can make PCMain.cpp usable for other things Yeah this is ugly (see the native change)
2013-12-13 10:04:22 +00:00
add_definitions(-DPPSSPP)
Turn off Vulkan in CMake-based and Qt-based builds, for now
2016-02-21 21:12:19 +00:00
# None of these platforms support Vulkan yet.
add_definitions(-DNO_VULKAN)
Better support for new archs.
2014-11-11 12:55:49 +00:00
if(CMAKE_SIZEOF_VOID_P EQUAL 8)
set(_ARCH_64 1)
add_definitions(-D_ARCH_64=1)
else()
set(_ARCH_32 1)
add_definitions(-D_ARCH_32=1)
endif()
CMake: Cleanup more names.
2014-06-18 06:15:47 +00:00
# Detect CPU from CMAKE configuration. Toolchains should set this up
Successful build on GCW-Zero.
2014-11-13 15:41:30 +00:00
if(CMAKE_SYSTEM_PROCESSOR)
if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "^arm")
set(ARM ON)
Fix Blackberry build.
2014-11-14 08:07:29 +00:00
if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "^armv7")
set(ARMV7 ON)
endif()
build/cmake: add amd64 alias for x86_64 Affects at least FreeBSD and OpenBSD.
2015-05-25 12:30:56 +00:00
elseif(${CMAKE_SYSTEM_PROCESSOR} MATCHES "^x86" OR
${CMAKE_SYSTEM_PROCESSOR} MATCHES "^amd64" OR
${CMAKE_SYSTEM_PROCESSOR} MATCHES "i.86")
Successful build on GCW-Zero.
2014-11-13 15:41:30 +00:00
set(X86 ON)
elseif(${CMAKE_SYSTEM_PROCESSOR} MATCHES "^mips")
set(MIPS ON)
endif()
Better support for new archs.
2014-11-11 12:55:49 +00:00
endif()
Maemo5 support
2013-03-22 07:15:00 +00:00
Enable ccache in CMakeLists directly. This makes cmake/clang use ccache on Travis, as well as Blackberry.
2016-05-21 15:45:23 +00:00
# Using ccache greatly improves the speed of our CI builds, let's enable for all.
# Without this, our CI can't use ccache for clang, for some reason.
find_program(CCACHE_FOUND ccache)
if(CCACHE_FOUND)
cmake: Fix ccache setup
2016-10-10 22:49:25 +00:00
set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ${CCACHE_FOUND})
set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ${CCACHE_FOUND})
Enable ccache in CMakeLists directly. This makes cmake/clang use ccache on Travis, as well as Blackberry.
2016-05-21 15:45:23 +00:00
# ccache uses -I when compiling without preprocessor, which makes clang complain.
if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Qunused-arguments -fcolor-diagnostics")
set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Qunused-arguments -fcolor-diagnostics")
endif()
endif(CCACHE_FOUND)
CMake: Cleanup more names.
2014-06-18 06:15:47 +00:00
# Remove soon?
set(USE_FFMPEG ON)
Add MIPS/Loongson support
2013-03-10 03:24:05 +00:00
Blackberry: Add simulator support.
2013-11-26 02:18:15 +00:00
if(ARM OR SIMULATOR)
CMake: Make the code more platform-agnostic and cleaner.
2014-05-30 15:22:11 +00:00
set(USING_EGL ON)
CMake: Cleanup more names.
2014-06-18 06:15:47 +00:00
endif()
CMake-based build system. Tested on Windows with NMake Makefiles and Visual Studio 11 targets. Tested on Linux with GNU Makefiles target, using GCC as the compiler. Tested on FreeBSD using clang as the compiler. Tested for Android on Windows with NMake Makefiles and r8c NDK. Proxy-tested by xsacha for blackberry. The android build requires that the android/android.toolchain.cmake toolchain file is used; an error will be raised if ANDROID is defined without loading the toolchain file. When targeting ANDROID, the resulting .so files will be placed in "android/libs/$ANDROID_ABI" even when building out of tree, since it's where `ant` expects to find them. Since the Core library is expected to be named 'ppsspp_jni' on ANDROID, we also put its name in a variable that is set to 'Core' unless building on ANDROID, where it is 'ppsspp_jni'.
2012-11-18 16:00:27 +00:00
Update CMakeLists.txt
2015-02-17 19:15:08 +00:00
if(EXISTS "/opt/vc/include/bcm_host.h")
message(STATUS "RaspberryPI VC Found")
set(RPI ON)
fix building for rpi2 by disabling armv7. added missing rpi include correct cflags for rpi1/rpi2 (although rpi2 will build for armv6 for now) only build Common/ColorConvNEON.cpp on armv7
2015-10-25 17:40:04 +00:00
set(USING_GLES2 ON)
set(USING_FBDEV ON)
Update CMakeLists.txt
2015-02-17 19:15:08 +00:00
endif()
CMake: Add RPI method. Fixes #1695 Qt: Add bitness define. Fixes #6306
2014-06-17 16:48:10 +00:00
CMakeLists.txt: Add BB as a supported board * Some of the configuration needs to be tweaked when building for a Beaglebone and Beaglebone Black. * Unlike the Raspberry PI there aren't any files to check against to determine at build time if this is being built for the Raspberry PI. Therefore, create a variable that the user has to pass in (-DBB:BOOL=ON) that will tell CMAKE to build PPSSPPSDL for the BB/BBB. * This will also make it alot easier for users to cross compile for this device Signed-off-by: Franklin S Cooper Jr <fcooper27@gmail.com>
2014-09-27 00:02:32 +00:00
if(BB)
set(ARMV7 ON)
set(USING_FBDEV ON)
endif()
Clean up CMakeLists with regards to FFMPEG.
2013-06-21 05:33:29 +00:00
if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
set(LINUX ON)
CMake: Fix up optimisations (broken for everyone except Apple?), move some Blackberry lines to toolchain, enable assembly, use add_definitions for definitions and *flags for flags, remove redundant lines.
2014-06-11 13:02:56 +00:00
add_definitions(-D__STDC_CONSTANT_MACROS)
Clean up CMakeLists with regards to FFMPEG.
2013-06-21 05:33:29 +00:00
endif()
Fix PPSSPPSDL on MacOSX, link ffmpeg.
2013-06-15 12:50:47 +00:00
if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
set(MACOSX ON)
endif()
CMake: Cleanup more names.
2014-06-18 06:15:47 +00:00
if (X86 AND NOT MIPS)
Better support for new archs.
2014-11-11 12:55:49 +00:00
if(_ARCH_64)
CMake: Fix up optimisations (broken for everyone except Apple?), move some Blackberry lines to toolchain, enable assembly, use add_definitions for definitions and *flags for flags, remove redundant lines.
2014-06-11 13:02:56 +00:00
add_definitions(-D_M_X64)
Mac buildfix
2014-04-13 15:14:45 +00:00
else()
CMake: Fix up optimisations (broken for everyone except Apple?), move some Blackberry lines to toolchain, enable assembly, use add_definitions for definitions and *flags for flags, remove redundant lines.
2014-06-11 13:02:56 +00:00
add_definitions(-D_M_IX86)
Mac buildfix
2014-04-13 15:14:45 +00:00
endif()
endif()
Fix cmake headless build.
2013-10-20 00:35:46 +00:00
if(NOT DEFINED HEADLESS)
iOS Support Preliminary iOS support using new framework.
2012-11-26 04:06:35 +00:00
set(HEADLESS OFF)
CMake-based build system. Tested on Windows with NMake Makefiles and Visual Studio 11 targets. Tested on Linux with GNU Makefiles target, using GCC as the compiler. Tested on FreeBSD using clang as the compiler. Tested for Android on Windows with NMake Makefiles and r8c NDK. Proxy-tested by xsacha for blackberry. The android build requires that the android/android.toolchain.cmake toolchain file is used; an error will be raised if ANDROID is defined without loading the toolchain file. When targeting ANDROID, the resulting .so files will be placed in "android/libs/$ANDROID_ABI" even when building out of tree, since it's where `ant` expects to find them. Since the Core library is expected to be named 'ppsspp_jni' on ANDROID, we also put its name in a variable that is set to 'Core' unless building on ANDROID, where it is 'ppsspp_jni'.
2012-11-18 16:00:27 +00:00
endif()
Don't build unittest by default, it doesn't link on some platforms.
2014-01-11 11:18:57 +00:00
# Doesn't link on some platforms
#if(NOT DEFINED UNITTEST)
# set(UNITTEST OFF)
#endif()
Make the unittest build using CMake
2014-01-09 11:09:07 +00:00
CMake-based build system. Tested on Windows with NMake Makefiles and Visual Studio 11 targets. Tested on Linux with GNU Makefiles target, using GCC as the compiler. Tested on FreeBSD using clang as the compiler. Tested for Android on Windows with NMake Makefiles and r8c NDK. Proxy-tested by xsacha for blackberry. The android build requires that the android/android.toolchain.cmake toolchain file is used; an error will be raised if ANDROID is defined without loading the toolchain file. When targeting ANDROID, the resulting .so files will be placed in "android/libs/$ANDROID_ABI" even when building out of tree, since it's where `ant` expects to find them. Since the Core library is expected to be named 'ppsspp_jni' on ANDROID, we also put its name in a variable that is set to 'Core' unless building on ANDROID, where it is 'ppsspp_jni'.
2012-11-18 16:00:27 +00:00
# User-editable options (go into CMakeCache.txt)
CMake: Make the code more platform-agnostic and cleaner.
2014-05-30 15:22:11 +00:00
# :: Processors
CMake: Cleanup more names.
2014-06-18 06:15:47 +00:00
option(ARMV7 "Set to ON if targeting an ARMv7 processor" ${ARMV7})
CMake-based build system. Tested on Windows with NMake Makefiles and Visual Studio 11 targets. Tested on Linux with GNU Makefiles target, using GCC as the compiler. Tested on FreeBSD using clang as the compiler. Tested for Android on Windows with NMake Makefiles and r8c NDK. Proxy-tested by xsacha for blackberry. The android build requires that the android/android.toolchain.cmake toolchain file is used; an error will be raised if ANDROID is defined without loading the toolchain file. When targeting ANDROID, the resulting .so files will be placed in "android/libs/$ANDROID_ABI" even when building out of tree, since it's where `ant` expects to find them. Since the Core library is expected to be named 'ppsspp_jni' on ANDROID, we also put its name in a variable that is set to 'Core' unless building on ANDROID, where it is 'ppsspp_jni'.
2012-11-18 16:00:27 +00:00
option(ARM "Set to ON if targeting an ARM processor" ${ARM})
Add MIPS/Loongson support
2013-03-10 03:24:05 +00:00
option(MIPS "Set to ON if targeting a MIPS processor" ${MIPS})
CMakeLists cleanup. Tabified CMakeLists. Introduced USING_GLES2 and X86 option and exposed USING_GLES2 to C++. Removed some redundancies and messiness.
2012-11-26 02:41:57 +00:00
option(X86 "Set to ON if targeting an X86 processor" ${X86})
CMake: Make the code more platform-agnostic and cleaner.
2014-05-30 15:22:11 +00:00
# :: Platforms
CMakeLists cleanup. Tabified CMakeLists. Introduced USING_GLES2 and X86 option and exposed USING_GLES2 to C++. Removed some redundancies and messiness.
2012-11-26 02:41:57 +00:00
option(ANDROID "Set to ON if targeting an Android device" ${ANDROID})
option(BLACKBERRY "Set to ON if targeting a Blackberry device" ${BLACKBERRY})
iOS Support Preliminary iOS support using new framework.
2012-11-26 04:06:35 +00:00
option(IOS "Set to ON if targeting an iOS device" ${IOS})
CMake: Make the code more platform-agnostic and cleaner.
2014-05-30 15:22:11 +00:00
option(MAEMO "Set to ON if targeting a Maemo (N900) device" ${MAEMO})
CMakeLists.txt: Add BB as a supported board * Some of the configuration needs to be tweaked when building for a Beaglebone and Beaglebone Black. * Unlike the Raspberry PI there aren't any files to check against to determine at build time if this is being built for the Raspberry PI. Therefore, create a variable that the user has to pass in (-DBB:BOOL=ON) that will tell CMAKE to build PPSSPPSDL for the BB/BBB. * This will also make it alot easier for users to cross compile for this device Signed-off-by: Franklin S Cooper Jr <fcooper27@gmail.com>
2014-09-27 00:02:32 +00:00
option(BB "Set to ON if targeting a Beaglebone/Beaglebone Black device" ${BB})
CMake: Make the code more platform-agnostic and cleaner.
2014-05-30 15:22:11 +00:00
# :: Environments
option(USING_EGL "Set to ON if target environment uses EGL" ${USING_EGL})
option(USING_FBDEV "Set to ON if target environment uses fbdev (eg. Pandora)" ${USING_FBDEV})
CMakeLists cleanup. Tabified CMakeLists. Introduced USING_GLES2 and X86 option and exposed USING_GLES2 to C++. Removed some redundancies and messiness.
2012-11-26 02:41:57 +00:00
option(USING_GLES2 "Set to ON if target device uses OpenGL ES 2.0" ${USING_GLES2})
add RASPBIAN options to workaround threading issues when building for ARMV7 on Raspbian raspbian is built for an armv6 target, so when building for armv7, there is a problem with the ABI compatibility for threaded applications. /usr/include/c++/*/ext/concurrence.h - undefining __GCC_HAVE_SYNC_COMPARE_AND_SWAP_2 makes it use _S_mutex as it would when ppsspp is built for an armv6 target see https://github.com/raspberrypi/firmware/issues/491#issuecomment-151723041 fixes problems found by users on #7479
2015-10-28 05:12:46 +00:00
option(RASPBIAN "Set to ON to workaround threading issues when building for ARMV7 on Raspbian" ${RASPBIAN})
CMake: Make the code more platform-agnostic and cleaner.
2014-05-30 15:22:11 +00:00
# :: Frontends
Qt UI in CMake (for future)
2012-12-16 11:17:13 +00:00
option(USING_QT_UI "Set to ON if you wish to use the Qt frontend wrapper" ${USING_QT_UI})
Switch from USING_GLES2 to MOBILE_DEVICE. Still using USING_GLES2 for, well, GLES2. But for things that are really about mobile, we need a new define. Devices are coming that don't use GLES2.
2014-02-08 18:29:22 +00:00
option(MOBILE_DEVICE "Set to ON when targetting a mobile device" ${MOBILE_DEVICE})
CMake-based build system. Tested on Windows with NMake Makefiles and Visual Studio 11 targets. Tested on Linux with GNU Makefiles target, using GCC as the compiler. Tested on FreeBSD using clang as the compiler. Tested for Android on Windows with NMake Makefiles and r8c NDK. Proxy-tested by xsacha for blackberry. The android build requires that the android/android.toolchain.cmake toolchain file is used; an error will be raised if ANDROID is defined without loading the toolchain file. When targeting ANDROID, the resulting .so files will be placed in "android/libs/$ANDROID_ABI" even when building out of tree, since it's where `ant` expects to find them. Since the Core library is expected to be named 'ppsspp_jni' on ANDROID, we also put its name in a variable that is set to 'Core' unless building on ANDROID, where it is 'ppsspp_jni'.
2012-11-18 16:00:27 +00:00
option(HEADLESS "Set to OFF to not generate the PPSSPPHeadless target" ${HEADLESS})
Don't build unittest by default, it doesn't link on some platforms.
2014-01-11 11:18:57 +00:00
option(UNITTEST "Set to ON to generate the unittest target" ${UNITTEST})
Blackberry: Add simulator support.
2013-11-26 02:18:15 +00:00
option(SIMULATOR "Set to ON when targeting an x86 simulator of an ARM platform" ${SIMULATOR})
CMake: Make the code more platform-agnostic and cleaner.
2014-05-30 15:22:11 +00:00
# :: Options
Buildfix Symbian and Blackberry from the ffmpeg merge. Fix a header issue on Blackberry. Fix a UINT64_C define issue. FFMPEG is no longer 'beta'.
2013-10-20 06:41:34 +00:00
option(USE_FFMPEG "Build with FFMPEG support" ${USE_FFMPEG})
Try to dynamically link against system ffmpeg when possible
2015-06-01 13:29:54 +00:00
option(USE_SYSTEM_FFMPEG "Dynamically link against system FFMPEG" ${USE_SYSTEM_FFMPEG})
CMake-based build system. Tested on Windows with NMake Makefiles and Visual Studio 11 targets. Tested on Linux with GNU Makefiles target, using GCC as the compiler. Tested on FreeBSD using clang as the compiler. Tested for Android on Windows with NMake Makefiles and r8c NDK. Proxy-tested by xsacha for blackberry. The android build requires that the android/android.toolchain.cmake toolchain file is used; an error will be raised if ANDROID is defined without loading the toolchain file. When targeting ANDROID, the resulting .so files will be placed in "android/libs/$ANDROID_ABI" even when building out of tree, since it's where `ant` expects to find them. Since the Core library is expected to be named 'ppsspp_jni' on ANDROID, we also put its name in a variable that is set to 'Core' unless building on ANDROID, where it is 'ppsspp_jni'.
2012-11-18 16:00:27 +00:00
Build scripts: Use strict error checking to propogate errors to underlying shell (hint: travis). Stops builds from showing success when there was an error. Had to workaround grep's issue of returning '1' when there is no matches. There is unfortunately no alternative. Removed bin/bash header as it could restrict alternative shells. Used set -e to break script whenever a non-zero return is encountered. CMake was returning non-zero on CMAKE_TOOLCHAIN_FILE not being required. Now check for that in CMake instead of platform/abi. If the abi is missing and toolchain is not, that would have been the wrong advice anyway.
2013-11-29 13:24:12 +00:00
if(ANDROID OR BLACKBERRY OR IOS)
if (NOT CMAKE_TOOLCHAIN_FILE)
if (ANDROID)
set(CMAKE_TOOLCHAIN_FILE ${CMAKE_SOURCE_DIR}/android/android.toolchain.cmake)
elseif(BLACKBERRY)
set(CMAKE_TOOLCHAIN_FILE ${CMAKE_SOURCE_DIR}/Blackberry/bb.toolchain.cmake)
elseif(IOS)
set(CMAKE_TOOLCHAIN_FILE ${CMAKE_SOURCE_DIR}/ios/ios.toolchain.cmake)
endif()
CMakeLists cleanup. Tabified CMakeLists. Introduced USING_GLES2 and X86 option and exposed USING_GLES2 to C++. Removed some redundancies and messiness.
2012-11-26 02:41:57 +00:00
message(FATAL_ERROR "CMAKE_TOOLCHAIN_FILE was not set!\n"
Build scripts: Use strict error checking to propogate errors to underlying shell (hint: travis). Stops builds from showing success when there was an error. Had to workaround grep's issue of returning '1' when there is no matches. There is unfortunately no alternative. Removed bin/bash header as it could restrict alternative shells. Used set -e to break script whenever a non-zero return is encountered. CMake was returning non-zero on CMAKE_TOOLCHAIN_FILE not being required. Now check for that in CMake instead of platform/abi. If the abi is missing and toolchain is not, that would have been the wrong advice anyway.
2013-11-29 13:24:12 +00:00
"Delete the CMakeCache.txt file and CMakeFiles directory.\n"
"Re-run ${CMAKE_COMMAND} with:\n"
"\"-DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}\"")
CMakeLists cleanup. Tabified CMakeLists. Introduced USING_GLES2 and X86 option and exposed USING_GLES2 to C++. Removed some redundancies and messiness.
2012-11-26 02:41:57 +00:00
endif()
Only set MOBILE_DEVICE and USING_GLES2 on ARM for known mobiles (iOS, Android, Blackberry). The others are usually Linux and use windowed environments.
2014-11-18 04:48:53 +00:00
set(MOBILE_DEVICE ON)
set(USING_GLES2 ON)
Build scripts: Use strict error checking to propogate errors to underlying shell (hint: travis). Stops builds from showing success when there was an error. Had to workaround grep's issue of returning '1' when there is no matches. There is unfortunately no alternative. Removed bin/bash header as it could restrict alternative shells. Used set -e to break script whenever a non-zero return is encountered. CMake was returning non-zero on CMAKE_TOOLCHAIN_FILE not being required. Now check for that in CMake instead of platform/abi. If the abi is missing and toolchain is not, that would have been the wrong advice anyway.
2013-11-29 13:24:12 +00:00
endif()
if(ANDROID)
CMakeLists cleanup. Tabified CMakeLists. Introduced USING_GLES2 and X86 option and exposed USING_GLES2 to C++. Removed some redundancies and messiness.
2012-11-26 02:41:57 +00:00
set(CoreLibName ppsspp_jni)
set(CoreLinkType SHARED)
CMake-based build system. Tested on Windows with NMake Makefiles and Visual Studio 11 targets. Tested on Linux with GNU Makefiles target, using GCC as the compiler. Tested on FreeBSD using clang as the compiler. Tested for Android on Windows with NMake Makefiles and r8c NDK. Proxy-tested by xsacha for blackberry. The android build requires that the android/android.toolchain.cmake toolchain file is used; an error will be raised if ANDROID is defined without loading the toolchain file. When targeting ANDROID, the resulting .so files will be placed in "android/libs/$ANDROID_ABI" even when building out of tree, since it's where `ant` expects to find them. Since the Core library is expected to be named 'ppsspp_jni' on ANDROID, we also put its name in a variable that is set to 'Core' unless building on ANDROID, where it is 'ppsspp_jni'.
2012-11-18 16:00:27 +00:00
else()
CMakeLists cleanup. Tabified CMakeLists. Introduced USING_GLES2 and X86 option and exposed USING_GLES2 to C++. Removed some redundancies and messiness.
2012-11-26 02:41:57 +00:00
set(CoreLibName Core)
set(CoreLinkType STATIC)
CMake-based build system. Tested on Windows with NMake Makefiles and Visual Studio 11 targets. Tested on Linux with GNU Makefiles target, using GCC as the compiler. Tested on FreeBSD using clang as the compiler. Tested for Android on Windows with NMake Makefiles and r8c NDK. Proxy-tested by xsacha for blackberry. The android build requires that the android/android.toolchain.cmake toolchain file is used; an error will be raised if ANDROID is defined without loading the toolchain file. When targeting ANDROID, the resulting .so files will be placed in "android/libs/$ANDROID_ABI" even when building out of tree, since it's where `ant` expects to find them. Since the Core library is expected to be named 'ppsspp_jni' on ANDROID, we also put its name in a variable that is set to 'Core' unless building on ANDROID, where it is 'ppsspp_jni'.
2012-11-18 16:00:27 +00:00
endif()
Native merge part 2: update build files. And a couple minor stragglers.
2015-09-06 19:52:33 +00:00
include_directories(ext/native)
CMakeLists cleanup
2014-11-20 08:53:07 +00:00
CMake: Add RPI method. Fixes #1695 Qt: Add bitness define. Fixes #6306
2014-06-17 16:48:10 +00:00
if(RPI)
fix building for rpi2 by disabling armv7. added missing rpi include correct cflags for rpi1/rpi2 (although rpi2 will build for armv6 for now) only build Common/ColorConvNEON.cpp on armv7
2015-10-25 17:40:04 +00:00
include_directories(/opt/vc/include /opt/vc/include/interface/vcos/pthreads /opt/vc/include/interface/vmcs_host/linux)
CMake: Add RPI method. Fixes #1695 Qt: Add bitness define. Fixes #6306
2014-06-17 16:48:10 +00:00
link_directories(/opt/vc/lib)
set(OPENGL_LIBRARIES GLESv2 bcm_host)
CMake: Cleanup more names.
2014-06-18 06:15:47 +00:00
elseif(USING_GLES2 AND NOT IOS)
set(OPENGL_LIBRARIES GLESv2)
elseif(NOT IOS)
include(FindOpenGL REQUIRED)
endif()
if(MAEMO)
#Maemo's gcc-4.7.2 is strict
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive")
CMake: Add RPI method. Fixes #1695 Qt: Add bitness define. Fixes #6306
2014-06-17 16:48:10 +00:00
endif()
CMake: Cleanup more names.
2014-06-18 06:15:47 +00:00
Fix for iOS CMake Update toolchain file to reflect that we want to use clang (rock88 is using clang). Set target in the CMake. Fix for packaging and signing (thanks rock88). Update linking to include audio and GLKit (thanks rock88). Update README
2013-02-24 03:23:04 +00:00
if (NOT BLACKBERRY AND NOT ANDROID AND NOT IOS)
Detect and use SDL2 with help of this Dolphin CMake module: https://github.com/dolphin-emu/dolphin/blob/master/CMakeTests/FindSDL2.cmake
2014-09-01 09:37:44 +00:00
include(FindSDL2)
CMake-based build system. Tested on Windows with NMake Makefiles and Visual Studio 11 targets. Tested on Linux with GNU Makefiles target, using GCC as the compiler. Tested on FreeBSD using clang as the compiler. Tested for Android on Windows with NMake Makefiles and r8c NDK. Proxy-tested by xsacha for blackberry. The android build requires that the android/android.toolchain.cmake toolchain file is used; an error will be raised if ANDROID is defined without loading the toolchain file. When targeting ANDROID, the resulting .so files will be placed in "android/libs/$ANDROID_ABI" even when building out of tree, since it's where `ant` expects to find them. Since the Core library is expected to be named 'ppsspp_jni' on ANDROID, we also put its name in a variable that is set to 'Core' unless building on ANDROID, where it is 'ppsspp_jni'.
2012-11-18 16:00:27 +00:00
endif()
include(FindThreads)
CMake: Cleanup more names.
2014-06-18 06:15:47 +00:00
Support building PPSSPPHeadless on APPLE
2012-11-26 22:06:18 +00:00
if(APPLE)
find_library(COCOA_LIBRARY Cocoa)
endif()
CMake-based build system. Tested on Windows with NMake Makefiles and Visual Studio 11 targets. Tested on Linux with GNU Makefiles target, using GCC as the compiler. Tested on FreeBSD using clang as the compiler. Tested for Android on Windows with NMake Makefiles and r8c NDK. Proxy-tested by xsacha for blackberry. The android build requires that the android/android.toolchain.cmake toolchain file is used; an error will be raised if ANDROID is defined without loading the toolchain file. When targeting ANDROID, the resulting .so files will be placed in "android/libs/$ANDROID_ABI" even when building out of tree, since it's where `ant` expects to find them. Since the Core library is expected to be named 'ppsspp_jni' on ANDROID, we also put its name in a variable that is set to 'Core' unless building on ANDROID, where it is 'ppsspp_jni'.
2012-11-18 16:00:27 +00:00
CMakeLists cleanup. Tabified CMakeLists. Introduced USING_GLES2 and X86 option and exposed USING_GLES2 to C++. Removed some redundancies and messiness.
2012-11-26 02:41:57 +00:00
# Needed for Globals.h
CMake-based build system. Tested on Windows with NMake Makefiles and Visual Studio 11 targets. Tested on Linux with GNU Makefiles target, using GCC as the compiler. Tested on FreeBSD using clang as the compiler. Tested for Android on Windows with NMake Makefiles and r8c NDK. Proxy-tested by xsacha for blackberry. The android build requires that the android/android.toolchain.cmake toolchain file is used; an error will be raised if ANDROID is defined without loading the toolchain file. When targeting ANDROID, the resulting .so files will be placed in "android/libs/$ANDROID_ABI" even when building out of tree, since it's where `ant` expects to find them. Since the Core library is expected to be named 'ppsspp_jni' on ANDROID, we also put its name in a variable that is set to 'Core' unless building on ANDROID, where it is 'ppsspp_jni'.
2012-11-18 16:00:27 +00:00
include_directories("${CMAKE_SOURCE_DIR}")
CMake: Make the code more platform-agnostic and cleaner.
2014-05-30 15:22:11 +00:00
if(ARM)
add_definitions(-DARM)
endif()
if(MIPS)
add_definitions(-DMIPS)
CMake-based build system. Tested on Windows with NMake Makefiles and Visual Studio 11 targets. Tested on Linux with GNU Makefiles target, using GCC as the compiler. Tested on FreeBSD using clang as the compiler. Tested for Android on Windows with NMake Makefiles and r8c NDK. Proxy-tested by xsacha for blackberry. The android build requires that the android/android.toolchain.cmake toolchain file is used; an error will be raised if ANDROID is defined without loading the toolchain file. When targeting ANDROID, the resulting .so files will be placed in "android/libs/$ANDROID_ABI" even when building out of tree, since it's where `ant` expects to find them. Since the Core library is expected to be named 'ppsspp_jni' on ANDROID, we also put its name in a variable that is set to 'Core' unless building on ANDROID, where it is 'ppsspp_jni'.
2012-11-18 16:00:27 +00:00
endif()
if(ANDROID)
CMakeLists cleanup. Tabified CMakeLists. Introduced USING_GLES2 and X86 option and exposed USING_GLES2 to C++. Removed some redundancies and messiness.
2012-11-26 02:41:57 +00:00
add_definitions(-DANDROID)
CMake-based build system. Tested on Windows with NMake Makefiles and Visual Studio 11 targets. Tested on Linux with GNU Makefiles target, using GCC as the compiler. Tested on FreeBSD using clang as the compiler. Tested for Android on Windows with NMake Makefiles and r8c NDK. Proxy-tested by xsacha for blackberry. The android build requires that the android/android.toolchain.cmake toolchain file is used; an error will be raised if ANDROID is defined without loading the toolchain file. When targeting ANDROID, the resulting .so files will be placed in "android/libs/$ANDROID_ABI" even when building out of tree, since it's where `ant` expects to find them. Since the Core library is expected to be named 'ppsspp_jni' on ANDROID, we also put its name in a variable that is set to 'Core' unless building on ANDROID, where it is 'ppsspp_jni'.
2012-11-18 16:00:27 +00:00
endif()
CMake: Make the code more platform-agnostic and cleaner.
2014-05-30 15:22:11 +00:00
if(BLACKBERRY)
add_definitions(-DBLACKBERRY=${BLACKBERRY})
endif()
iOS Support Preliminary iOS support using new framework.
2012-11-26 04:06:35 +00:00
if(IOS)
add_definitions(-DIOS)
CMake-based build system. Tested on Windows with NMake Makefiles and Visual Studio 11 targets. Tested on Linux with GNU Makefiles target, using GCC as the compiler. Tested on FreeBSD using clang as the compiler. Tested for Android on Windows with NMake Makefiles and r8c NDK. Proxy-tested by xsacha for blackberry. The android build requires that the android/android.toolchain.cmake toolchain file is used; an error will be raised if ANDROID is defined without loading the toolchain file. When targeting ANDROID, the resulting .so files will be placed in "android/libs/$ANDROID_ABI" even when building out of tree, since it's where `ant` expects to find them. Since the Core library is expected to be named 'ppsspp_jni' on ANDROID, we also put its name in a variable that is set to 'Core' unless building on ANDROID, where it is 'ppsspp_jni'.
2012-11-18 16:00:27 +00:00
endif()
Maemo5 support
2013-03-22 07:15:00 +00:00
if(MAEMO)
add_definitions(-DMAEMO)
endif()
CMake: Add RPI method. Fixes #1695 Qt: Add bitness define. Fixes #6306
2014-06-17 16:48:10 +00:00
if(RPI)
add_definitions(-DRPI)
endif()
Maemo5 support
2013-03-22 07:15:00 +00:00
CMake: Make the code more platform-agnostic and cleaner.
2014-05-30 15:22:11 +00:00
if(USING_EGL)
add_definitions(-DUSING_EGL)
Pandora port. Thanks to ptitSeb.
2013-01-12 15:15:46 +00:00
endif()
CMake: Make the code more platform-agnostic and cleaner.
2014-05-30 15:22:11 +00:00
if(USING_FBDEV)
add_definitions(-DUSING_FBDEV)
CMake-based build system. Tested on Windows with NMake Makefiles and Visual Studio 11 targets. Tested on Linux with GNU Makefiles target, using GCC as the compiler. Tested on FreeBSD using clang as the compiler. Tested for Android on Windows with NMake Makefiles and r8c NDK. Proxy-tested by xsacha for blackberry. The android build requires that the android/android.toolchain.cmake toolchain file is used; an error will be raised if ANDROID is defined without loading the toolchain file. When targeting ANDROID, the resulting .so files will be placed in "android/libs/$ANDROID_ABI" even when building out of tree, since it's where `ant` expects to find them. Since the Core library is expected to be named 'ppsspp_jni' on ANDROID, we also put its name in a variable that is set to 'Core' unless building on ANDROID, where it is 'ppsspp_jni'.
2012-11-18 16:00:27 +00:00
endif()
Qt UI in CMake (for future)
2012-12-16 11:17:13 +00:00
if(USING_GLES2)
CMakeLists cleanup. Tabified CMakeLists. Introduced USING_GLES2 and X86 option and exposed USING_GLES2 to C++. Removed some redundancies and messiness.
2012-11-26 02:41:57 +00:00
add_definitions(-DUSING_GLES2)
CMake-based build system. Tested on Windows with NMake Makefiles and Visual Studio 11 targets. Tested on Linux with GNU Makefiles target, using GCC as the compiler. Tested on FreeBSD using clang as the compiler. Tested for Android on Windows with NMake Makefiles and r8c NDK. Proxy-tested by xsacha for blackberry. The android build requires that the android/android.toolchain.cmake toolchain file is used; an error will be raised if ANDROID is defined without loading the toolchain file. When targeting ANDROID, the resulting .so files will be placed in "android/libs/$ANDROID_ABI" even when building out of tree, since it's where `ant` expects to find them. Since the Core library is expected to be named 'ppsspp_jni' on ANDROID, we also put its name in a variable that is set to 'Core' unless building on ANDROID, where it is 'ppsspp_jni'.
2012-11-18 16:00:27 +00:00
endif()
Switch from USING_GLES2 to MOBILE_DEVICE. Still using USING_GLES2 for, well, GLES2. But for things that are really about mobile, we need a new define. Devices are coming that don't use GLES2.
2014-02-08 18:29:22 +00:00
if(MOBILE_DEVICE)
add_definitions(-DMOBILE_DEVICE)
endif()
add RASPBIAN options to workaround threading issues when building for ARMV7 on Raspbian raspbian is built for an armv6 target, so when building for armv7, there is a problem with the ABI compatibility for threaded applications. /usr/include/c++/*/ext/concurrence.h - undefining __GCC_HAVE_SYNC_COMPARE_AND_SWAP_2 makes it use _S_mutex as it would when ppsspp is built for an armv6 target see https://github.com/raspberrypi/firmware/issues/491#issuecomment-151723041 fixes problems found by users on #7479
2015-10-28 05:12:46 +00:00
if(ARMV7 AND RASPBIAN)
add_definitions(-U__GCC_HAVE_SYNC_COMPARE_AND_SWAP_2)
endif()
CMake-based build system. Tested on Windows with NMake Makefiles and Visual Studio 11 targets. Tested on Linux with GNU Makefiles target, using GCC as the compiler. Tested on FreeBSD using clang as the compiler. Tested for Android on Windows with NMake Makefiles and r8c NDK. Proxy-tested by xsacha for blackberry. The android build requires that the android/android.toolchain.cmake toolchain file is used; an error will be raised if ANDROID is defined without loading the toolchain file. When targeting ANDROID, the resulting .so files will be placed in "android/libs/$ANDROID_ABI" even when building out of tree, since it's where `ant` expects to find them. Since the Core library is expected to be named 'ppsspp_jni' on ANDROID, we also put its name in a variable that is set to 'Core' unless building on ANDROID, where it is 'ppsspp_jni'.
2012-11-18 16:00:27 +00:00
CMake: Use a default build (Release). Put Blackberry cflags back to Lists, otherwise overwritten.
2014-06-11 13:28:51 +00:00
if (NOT CMAKE_BUILD_TYPE)
message(STATUS "No build type selected, default to Release")
set(CMAKE_BUILD_TYPE "Release")
endif()
Blackberry: Link with pie (required for 10.3?). Fix debug build. Cmake: Show compile type (debug, release) in output.
2014-07-06 13:50:48 +00:00
if(ARMV7)
message("Building for ARMv7, ${CMAKE_BUILD_TYPE}")
elseif(ARM)
message("Building for ARMv6, ${CMAKE_BUILD_TYPE}")
Update for CMake.
2014-11-13 13:23:53 +00:00
elseif(MIPS AND X86)
Blackberry: Link with pie (required for 10.3?). Fix debug build. Cmake: Show compile type (debug, release) in output.
2014-07-06 13:50:48 +00:00
message("Building for MIPS in x86 mode, ${CMAKE_BUILD_TYPE}")
Update for CMake.
2014-11-13 13:23:53 +00:00
elseif(MIPS)
message("Buildings for MIPS, ${CMAKE_BUILD_TYPE}")
Blackberry: Link with pie (required for 10.3?). Fix debug build. Cmake: Show compile type (debug, release) in output.
2014-07-06 13:50:48 +00:00
elseif(X86)
message("Building for x86, ${CMAKE_BUILD_TYPE}")
else()
message("Building for Generic, ${CMAKE_BUILD_TYPE}")
endif()
CMakeLists cleanup. Tabified CMakeLists. Introduced USING_GLES2 and X86 option and exposed USING_GLES2 to C++. Removed some redundancies and messiness.
2012-11-26 02:41:57 +00:00
if(NOT MSVC)
CMake: Use a default build (Release). Put Blackberry cflags back to Lists, otherwise overwritten.
2014-06-11 13:28:51 +00:00
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -g -D_DEBUG")
set(CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL} -Os -D_NDEBUG")
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3 -D_NDEBUG")
set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -O2 -g -D_NDEBUG")
set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -g -D_DEBUG")
set(CMAKE_C_FLAGS_MINSIZEREL "${CMAKE_C_FLAGS_MINSIZEREL} -Os -D_NDEBUG")
set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -O3 -D_NDEBUG")
set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -O2 -g -D_NDEBUG")
CMake: Fix up optimisations (broken for everyone except Apple?), move some Blackberry lines to toolchain, enable assembly, use add_definitions for definitions and *flags for flags, remove redundant lines.
2014-06-11 13:02:56 +00:00
Improve portability to future platforms. Make use of new USING_GLES2 define throughout PPSSPP. Also use ARM definition where suitable. Remove some redundancy with includes.
2012-11-26 03:25:14 +00:00
# Disable some warnings
add_definitions(-Wno-multichar)
CMakeLists cleanup. Tabified CMakeLists. Introduced USING_GLES2 and X86 option and exposed USING_GLES2 to C++. Removed some redundancies and messiness.
2012-11-26 02:41:57 +00:00
add_definitions(-fno-strict-aliasing)
Command line warning fix on intel compiler under Linux.
2013-05-30 12:26:43 +00:00
if (CMAKE_C_COMPILER_ID STREQUAL "Intel")
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -parallel -fopenmp")
endif()
CMakeLists cleanup. Tabified CMakeLists. Introduced USING_GLES2 and X86 option and exposed USING_GLES2 to C++. Removed some redundancies and messiness.
2012-11-26 02:41:57 +00:00
Add MIPS/Loongson support
2013-03-10 03:24:05 +00:00
if(X86 AND NOT MIPS)
CMakeLists cleanup. Tabified CMakeLists. Introduced USING_GLES2 and X86 option and exposed USING_GLES2 to C++. Removed some redundancies and messiness.
2012-11-26 02:41:57 +00:00
# enable sse2 code generation
add_definitions(-msse2)
endif()
CMake: Use a default build (Release). Put Blackberry cflags back to Lists, otherwise overwritten.
2014-06-11 13:28:51 +00:00
if (BLACKBERRY AND ARM)
set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -march=armv7-a -mfpu=neon -mcpu=cortex-a9")
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=armv7-a -mfpu=neon -mcpu=cortex-a9")
endif()
Build fix for iOS. Now compiles.
2013-02-24 12:17:52 +00:00
if(IOS)
CMake: Fix up optimisations (broken for everyone except Apple?), move some Blackberry lines to toolchain, enable assembly, use add_definitions for definitions and *flags for flags, remove redundant lines.
2014-06-11 13:02:56 +00:00
add_definitions(-DGL_ETC1_RGB8_OES=0)
use libc++ for iOS to avoid additional directives
2014-12-06 00:44:14 +00:00
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++ -U__STRICT_ANSI__")
set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LIBRARY "libc++")
iOS Audio fixes
2013-06-25 21:18:16 +00:00
# armv7s (without resorting to FastMemory) is still a work in progress
# comment out the next line to enable default/"standard" architectures (which is a fat armv7/armv7s binary)
set(CMAKE_OSX_ARCHITECTURES "armv7")
Build fix for iOS. Now compiles.
2013-02-24 12:17:52 +00:00
elseif(APPLE)
Fixed build on Mac OS X.
2015-11-06 03:13:59 +00:00
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mmacosx-version-min=10.7 -stdlib=libc++ -U__STRICT_ANSI__")
Re-add -mmacosx-version-min=10.7 to CMAKE_CXX_FLAGS (because someone removed it at some point?)
2015-11-04 23:09:46 +00:00
# Karen/angelXwind: -mmacosx-version-min=10.7 is needed in order to produce binaries that OS X 10.7 Lion can execute. However, it seems that PPSSPP won't support 10.6 or lower without getting rid of -stdlib=libc++ ...which probably won't end well. So I guess PPSSPP will strictly be a 10.7+ app.
Some Mac build fixes from vit9696 and some more. Update submodules.
2013-05-06 22:08:57 +00:00
# vit9696: OSX 10.6 builds are possible: http://forums.ppsspp.org/showthread.php?tid=1826&pid=18875#pid18875
Force libc++ on Mac, needed for Xcode 4.6 at least.
2013-03-02 19:19:40 +00:00
set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LIBRARY "libc++")
CMakeLists cleanup. Tabified CMakeLists. Introduced USING_GLES2 and X86 option and exposed USING_GLES2 to C++. Removed some redundancies and messiness.
2012-11-26 02:41:57 +00:00
else()
CMake: Fix up optimisations (broken for everyone except Apple?), move some Blackberry lines to toolchain, enable assembly, use add_definitions for definitions and *flags for flags, remove redundant lines.
2014-06-11 13:02:56 +00:00
if (NOT CMAKE_C_COMPILER_ID STREQUAL "Intel" AND NOT CMAKE_C_COMPILER_ID STREQUAL "Clang")
add_definitions(-Wno-psabi)
endif()
Blackberry: Fix build. Blackberry doesn't support XOPEN_SOURCE=700.
2015-06-17 07:32:13 +00:00
if (BLACKBERRY)
add_definitions(-D_XOPEN_SOURCE=600)
else()
add_definitions(-D_XOPEN_SOURCE=700)
endif()
add_definitions(-D_XOPEN_SOURCE_EXTENDED -D__BSD_VISIBLE=1)
CMake: Fix up optimisations (broken for everyone except Apple?), move some Blackberry lines to toolchain, enable assembly, use add_definitions for definitions and *flags for flags, remove redundant lines.
2014-06-11 13:02:56 +00:00
add_definitions(-D_LARGEFILE64_SOURCE=1 -D_FILE_OFFSET_BITS=64)
CMakeLists cleanup. Tabified CMakeLists. Introduced USING_GLES2 and X86 option and exposed USING_GLES2 to C++. Removed some redundancies and messiness.
2012-11-26 02:41:57 +00:00
endif()
CMake: Fix up optimisations (broken for everyone except Apple?), move some Blackberry lines to toolchain, enable assembly, use add_definitions for definitions and *flags for flags, remove redundant lines.
2014-06-11 13:02:56 +00:00
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
CMakeLists cleanup. Tabified CMakeLists. Introduced USING_GLES2 and X86 option and exposed USING_GLES2 to C++. Removed some redundancies and messiness.
2012-11-26 02:41:57 +00:00
else()
# Disable warnings about MS-specific _s variants of libc functions
add_definitions(-D_CRT_SECURE_NO_WARNINGS)
CMake: Fix up optimisations (broken for everyone except Apple?), move some Blackberry lines to toolchain, enable assembly, use add_definitions for definitions and *flags for flags, remove redundant lines.
2014-06-11 13:02:56 +00:00
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D_DEBUG")
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -D_NDEBUG")
CMake-based build system. Tested on Windows with NMake Makefiles and Visual Studio 11 targets. Tested on Linux with GNU Makefiles target, using GCC as the compiler. Tested on FreeBSD using clang as the compiler. Tested for Android on Windows with NMake Makefiles and r8c NDK. Proxy-tested by xsacha for blackberry. The android build requires that the android/android.toolchain.cmake toolchain file is used; an error will be raised if ANDROID is defined without loading the toolchain file. When targeting ANDROID, the resulting .so files will be placed in "android/libs/$ANDROID_ABI" even when building out of tree, since it's where `ant` expects to find them. Since the Core library is expected to be named 'ppsspp_jni' on ANDROID, we also put its name in a variable that is set to 'Core' unless building on ANDROID, where it is 'ppsspp_jni'.
2012-11-18 16:00:27 +00:00
endif()
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib")
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib")
if(ANDROID)
CMakeLists cleanup. Tabified CMakeLists. Introduced USING_GLES2 and X86 option and exposed USING_GLES2 to C++. Removed some redundancies and messiness.
2012-11-26 02:41:57 +00:00
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/android/libs/${ANDROID_ABI}")
CMake-based build system. Tested on Windows with NMake Makefiles and Visual Studio 11 targets. Tested on Linux with GNU Makefiles target, using GCC as the compiler. Tested on FreeBSD using clang as the compiler. Tested for Android on Windows with NMake Makefiles and r8c NDK. Proxy-tested by xsacha for blackberry. The android build requires that the android/android.toolchain.cmake toolchain file is used; an error will be raised if ANDROID is defined without loading the toolchain file. When targeting ANDROID, the resulting .so files will be placed in "android/libs/$ANDROID_ABI" even when building out of tree, since it's where `ant` expects to find them. Since the Core library is expected to be named 'ppsspp_jni' on ANDROID, we also put its name in a variable that is set to 'Core' unless building on ANDROID, where it is 'ppsspp_jni'.
2012-11-18 16:00:27 +00:00
endif()
# This sets up the MSVC project dirs according to the physical project dirs
macro(setup_target_project TargetName ProjectDir)
CMakeLists cleanup. Tabified CMakeLists. Introduced USING_GLES2 and X86 option and exposed USING_GLES2 to C++. Removed some redundancies and messiness.
2012-11-26 02:41:57 +00:00
get_property(TargetSources TARGET "${TargetName}" PROPERTY SOURCES)
foreach(Source ${TargetSources})
# Figure out the file's path relative to the ProjectDir
# NOTE: &#$@ double-quoted regexps
string(REGEX REPLACE "${ProjectDir}" "" RelativePath "${Source}")
string(REGEX REPLACE "[\\\\/][^\\\\/]*$" "" RelativePath "${RelativePath}")
string(REGEX REPLACE "^[\\\\/]" "" RelativePath "${RelativePath}")
string(REGEX REPLACE "/" "\\\\\\\\" RelativePath "${RelativePath}")
# put the source file in a source_group equivalent to the relative path
source_group("${RelativePath}" FILES ${Source})
endforeach()
CMake-based build system. Tested on Windows with NMake Makefiles and Visual Studio 11 targets. Tested on Linux with GNU Makefiles target, using GCC as the compiler. Tested on FreeBSD using clang as the compiler. Tested for Android on Windows with NMake Makefiles and r8c NDK. Proxy-tested by xsacha for blackberry. The android build requires that the android/android.toolchain.cmake toolchain file is used; an error will be raised if ANDROID is defined without loading the toolchain file. When targeting ANDROID, the resulting .so files will be placed in "android/libs/$ANDROID_ABI" even when building out of tree, since it's where `ant` expects to find them. Since the Core library is expected to be named 'ppsspp_jni' on ANDROID, we also put its name in a variable that is set to 'Core' unless building on ANDROID, where it is 'ppsspp_jni'.
2012-11-18 16:00:27 +00:00
endmacro()
# Commented-out files are files that don't compile
# and were disabled in the original MSVC project anyway
set(CommonExtra)
if(ARM)
CMakeLists cleanup. Tabified CMakeLists. Introduced USING_GLES2 and X86 option and exposed USING_GLES2 to C++. Removed some redundancies and messiness.
2012-11-26 02:41:57 +00:00
set(CommonExtra ${CommonExtra}
Add CodeBlockCommon base class to remove further arch-specificity in JitBlockCache Remove unused ArmThunk.
2016-05-01 09:13:51 +00:00
Common/ArmCPUDetect.cpp)
fix building for rpi2 by disabling armv7. added missing rpi include correct cflags for rpi1/rpi2 (although rpi2 will build for armv6 for now) only build Common/ColorConvNEON.cpp on armv7
2015-10-25 17:40:04 +00:00
if(ARMV7)
set(CommonExtra ${CommonExtra}
Add structure for NEON color conversion funcs.
2015-05-17 20:54:41 +00:00
Common/ColorConvNEON.cpp)
fix building for rpi2 by disabling armv7. added missing rpi include correct cflags for rpi1/rpi2 (although rpi2 will build for armv6 for now) only build Common/ColorConvNEON.cpp on armv7
2015-10-25 17:40:04 +00:00
endif()
CMakeLists cleanup. Tabified CMakeLists. Introduced USING_GLES2 and X86 option and exposed USING_GLES2 to C++. Removed some redundancies and messiness.
2012-11-26 02:41:57 +00:00
elseif(X86)
set(CommonExtra ${CommonExtra}
Common/ABI.cpp
Common/ABI.h
Common/CPUDetect.cpp
Common/CPUDetect.h
Common/Thunk.cpp
Common/Thunk.h
Common/x64Analyzer.cpp
Common/x64Analyzer.h
Common/x64Emitter.cpp
Common/x64Emitter.h)
Integrate new MIPS emitter.
2014-11-18 08:35:37 +00:00
elseif(MIPS)
set(CommonExtra ${CommonExtra}
Add Mips CPU Detection.
2014-11-18 22:21:16 +00:00
Common/MipsCPUDetect.cpp
Integrate new MIPS emitter.
2014-11-18 08:35:37 +00:00
Common/MipsEmitter.cpp
Common/MipsEmitter.h)
Update for CMake.
2014-11-13 13:23:53 +00:00
else()
set(CommonExtra ${CommonExtra}
Common/FakeCPUDetect.cpp
Common/FakeEmitter.h)
CMake-based build system. Tested on Windows with NMake Makefiles and Visual Studio 11 targets. Tested on Linux with GNU Makefiles target, using GCC as the compiler. Tested on FreeBSD using clang as the compiler. Tested for Android on Windows with NMake Makefiles and r8c NDK. Proxy-tested by xsacha for blackberry. The android build requires that the android/android.toolchain.cmake toolchain file is used; an error will be raised if ANDROID is defined without loading the toolchain file. When targeting ANDROID, the resulting .so files will be placed in "android/libs/$ANDROID_ABI" even when building out of tree, since it's where `ant` expects to find them. Since the Core library is expected to be named 'ppsspp_jni' on ANDROID, we also put its name in a variable that is set to 'Core' unless building on ANDROID, where it is 'ppsspp_jni'.
2012-11-18 16:00:27 +00:00
endif()
Quickfix blackberry build
2015-04-04 07:39:29 +00:00
Make the unittests build on mac
2015-04-03 21:50:51 +00:00
if(UNITTEST)
Update for CMake.
2014-11-13 13:23:53 +00:00
set(CommonExtra ${CommonExtra}
Make the unittests build on mac
2015-04-03 21:50:51 +00:00
Common/Arm64Emitter.h
Common/Arm64Emitter.cpp
Update for CMake.
2014-11-13 13:23:53 +00:00
Common/ArmEmitter.h
Make the unittests build on mac
2015-04-03 21:50:51 +00:00
Common/ArmEmitter.cpp
Core/Util/DisArm64.cpp)
Quickfix blackberry build
2015-04-04 07:39:29 +00:00
else()
#Blackberry appears to depend on this being here, should clean it up.
set(CommonExtra ${CommonExtra}
Common/ArmEmitter.h
Common/ArmEmitter.cpp)
Make the unittests build on mac
2015-04-03 21:50:51 +00:00
endif()
Update for CMake.
2014-11-13 13:23:53 +00:00
CMake-based build system. Tested on Windows with NMake Makefiles and Visual Studio 11 targets. Tested on Linux with GNU Makefiles target, using GCC as the compiler. Tested on FreeBSD using clang as the compiler. Tested for Android on Windows with NMake Makefiles and r8c NDK. Proxy-tested by xsacha for blackberry. The android build requires that the android/android.toolchain.cmake toolchain file is used; an error will be raised if ANDROID is defined without loading the toolchain file. When targeting ANDROID, the resulting .so files will be placed in "android/libs/$ANDROID_ABI" even when building out of tree, since it's where `ant` expects to find them. Since the Core library is expected to be named 'ppsspp_jni' on ANDROID, we also put its name in a variable that is set to 'Core' unless building on ANDROID, where it is 'ppsspp_jni'.
2012-11-18 16:00:27 +00:00
if(WIN32)
CMakeLists cleanup. Tabified CMakeLists. Introduced USING_GLES2 and X86 option and exposed USING_GLES2 to C++. Removed some redundancies and messiness.
2012-11-26 02:41:57 +00:00
set(CommonExtra ${CommonExtra}
Common/stdafx.cpp
Common/stdafx.h)
CMake-based build system. Tested on Windows with NMake Makefiles and Visual Studio 11 targets. Tested on Linux with GNU Makefiles target, using GCC as the compiler. Tested on FreeBSD using clang as the compiler. Tested for Android on Windows with NMake Makefiles and r8c NDK. Proxy-tested by xsacha for blackberry. The android build requires that the android/android.toolchain.cmake toolchain file is used; an error will be raised if ANDROID is defined without loading the toolchain file. When targeting ANDROID, the resulting .so files will be placed in "android/libs/$ANDROID_ABI" even when building out of tree, since it's where `ant` expects to find them. Since the Core library is expected to be named 'ppsspp_jni' on ANDROID, we also put its name in a variable that is set to 'Core' unless building on ANDROID, where it is 'ppsspp_jni'.
2012-11-18 16:00:27 +00:00
endif()
add_library(Common STATIC
CMakeLists cleanup. Tabified CMakeLists. Introduced USING_GLES2 and X86 option and exposed USING_GLES2 to C++. Removed some redundancies and messiness.
2012-11-26 02:41:57 +00:00
${CommonExtra}
Add ColorConv.cpp/h to a bunch of project files
2015-04-08 18:23:27 +00:00
Common/ColorConv.cpp
Common/ColorConv.h
Move parts of ChunkFile into a cpp, cleanup.
2013-10-07 04:26:08 +00:00
Common/ChunkFile.cpp
Common/ChunkFile.h
CMakeLists cleanup. Tabified CMakeLists. Introduced USING_GLES2 and X86 option and exposed USING_GLES2 to C++. Removed some redundancies and messiness.
2012-11-26 02:41:57 +00:00
Common/ConsoleListener.cpp
Common/ConsoleListener.h
Common/Crypto/md5.cpp
Common/Crypto/md5.h
Common/Crypto/sha1.cpp
Common/Crypto/sha1.h
Implement sceSha256Digest (untested)
2014-12-07 18:25:45 +00:00
Common/Crypto/sha256.cpp
Common/Crypto/sha256.h
CMakeLists cleanup. Tabified CMakeLists. Introduced USING_GLES2 and X86 option and exposed USING_GLES2 to C++. Removed some redundancies and messiness.
2012-11-26 02:41:57 +00:00
Common/FileUtil.cpp
Common/FileUtil.h
Add KeyMap key translation layer
2013-04-20 04:52:54 +00:00
Common/KeyMap.cpp
Common/KeyMap.h
CMakeLists cleanup. Tabified CMakeLists. Introduced USING_GLES2 and X86 option and exposed USING_GLES2 to C++. Removed some redundancies and messiness.
2012-11-26 02:41:57 +00:00
Common/LogManager.cpp
Common/LogManager.h
Common/MemArena.cpp
Common/MemArena.h
Common/MemoryUtil.cpp
Common/MemoryUtil.h
Common/Misc.cpp
Common/MsgHandler.cpp
Common/MsgHandler.h
Avoid name collision with StringUtil on Windows hosts. Fixes all Linux/Unix cross-compiles from Windows, including Harmattan and Blackberry.
2013-05-03 06:22:15 +00:00
Common/StringUtils.cpp
Common/StringUtils.h
Avoid name collision with ThreadPool on Windows hosts. Fixes all Linux/Unix cross-compiles from Windows, including Harmattan and Blackberry.
2013-05-03 06:31:53 +00:00
Common/ThreadPools.cpp
Common/ThreadPools.h
Cleanup and comments in sceGe.cpp
2015-07-24 17:52:42 +00:00
Common/ThreadSafeList.h
CMakeLists cleanup. Tabified CMakeLists. Introduced USING_GLES2 and X86 option and exposed USING_GLES2 to C++. Removed some redundancies and messiness.
2012-11-26 02:41:57 +00:00
Common/Timer.cpp
Removed unused files from Common.
2013-09-27 14:47:21 +00:00
Common/Timer.h)
CMake-based build system. Tested on Windows with NMake Makefiles and Visual Studio 11 targets. Tested on Linux with GNU Makefiles target, using GCC as the compiler. Tested on FreeBSD using clang as the compiler. Tested for Android on Windows with NMake Makefiles and r8c NDK. Proxy-tested by xsacha for blackberry. The android build requires that the android/android.toolchain.cmake toolchain file is used; an error will be raised if ANDROID is defined without loading the toolchain file. When targeting ANDROID, the resulting .so files will be placed in "android/libs/$ANDROID_ABI" even when building out of tree, since it's where `ant` expects to find them. Since the Core library is expected to be named 'ppsspp_jni' on ANDROID, we also put its name in a variable that is set to 'Core' unless building on ANDROID, where it is 'ppsspp_jni'.
2012-11-18 16:00:27 +00:00
include_directories(Common)
setup_target_project(Common Common)
if(WIN32)
CMakeLists cleanup. Tabified CMakeLists. Introduced USING_GLES2 and X86 option and exposed USING_GLES2 to C++. Removed some redundancies and messiness.
2012-11-26 02:41:57 +00:00
target_link_libraries(Common winmm)
CMake-based build system. Tested on Windows with NMake Makefiles and Visual Studio 11 targets. Tested on Linux with GNU Makefiles target, using GCC as the compiler. Tested on FreeBSD using clang as the compiler. Tested for Android on Windows with NMake Makefiles and r8c NDK. Proxy-tested by xsacha for blackberry. The android build requires that the android/android.toolchain.cmake toolchain file is used; an error will be raised if ANDROID is defined without loading the toolchain file. When targeting ANDROID, the resulting .so files will be placed in "android/libs/$ANDROID_ABI" even when building out of tree, since it's where `ant` expects to find them. Since the Core library is expected to be named 'ppsspp_jni' on ANDROID, we also put its name in a variable that is set to 'Core' unless building on ANDROID, where it is 'ppsspp_jni'.
2012-11-18 16:00:27 +00:00
endif()
Mac buildfix (the zlib include path made it include the system glew)
2013-12-05 15:24:40 +00:00
if(NOT USING_GLES2)
include_directories(${OPENGL_INCLUDE_DIR})
Add option to shared libzip and libsnappy in CMakeLists.txt.
2015-09-16 01:46:51 +00:00
find_package(GLEW)
if(NOT GLEW_FOUND)
add_definitions(-DGLEW_STATIC)
add_library(glew STATIC
ext/native/ext/glew/GL/glew.h
ext/native/ext/glew/GL/glxew.h
ext/native/ext/glew/GL/wglew.h
ext/native/ext/glew/glew.c)
target_link_libraries(glew ${OPENGL_LIBRARIES})
include_directories(ext/native/ext/glew)
set(GLEW_LIBRARIES glew)
endif()
else()
find_package(X11)
endif()
Mac buildfix (the zlib include path made it include the system glew)
2013-12-05 15:24:40 +00:00
Add option to shared libzip and libsnappy in CMakeLists.txt.
2015-09-16 01:46:51 +00:00
find_package(Snappy)
Improve detection of for shared libs in both sdl and Qt (zlib, libzip, snappy and glew).
2015-09-16 03:59:31 +00:00
if(SNAPPY_FOUND)
add_definitions(-DSHARED_SNAPPY)
else()
add_subdirectory(ext/snappy)
Mac buildfix (the zlib include path made it include the system glew)
2013-12-05 15:24:40 +00:00
endif()
CMakeLists cleanup
2014-11-20 08:53:07 +00:00
add_subdirectory(ext/udis86)
Add udis86 b24baf1 (1.7.3?), not yet used. Linked even on arm to avoid dependency complexity, might skip later.
2014-10-11 15:42:01 +00:00
Buildfix cmake
2013-11-26 17:18:30 +00:00
add_library(vjson STATIC
Native merge part 2: update build files. And a couple minor stragglers.
2015-09-06 19:52:33 +00:00
ext/native/ext/vjson/json.cpp
ext/native/ext/vjson/json.h
ext/native/ext/vjson/block_allocator.cpp
ext/native/ext/vjson/block_allocator.h
Buildfix cmake
2013-11-26 17:18:30 +00:00
)
CMakelist update
2013-03-29 23:10:18 +00:00
add_library(rg_etc1 STATIC
Native merge part 2: update build files. And a couple minor stragglers.
2015-09-06 19:52:33 +00:00
ext/native/ext/rg_etc1/rg_etc1.cpp
ext/native/ext/rg_etc1/rg_etc1.h)
include_directories(ext/native/ext/rg_etc1)
CMake-based build system. Tested on Windows with NMake Makefiles and Visual Studio 11 targets. Tested on Linux with GNU Makefiles target, using GCC as the compiler. Tested on FreeBSD using clang as the compiler. Tested for Android on Windows with NMake Makefiles and r8c NDK. Proxy-tested by xsacha for blackberry. The android build requires that the android/android.toolchain.cmake toolchain file is used; an error will be raised if ANDROID is defined without loading the toolchain file. When targeting ANDROID, the resulting .so files will be placed in "android/libs/$ANDROID_ABI" even when building out of tree, since it's where `ant` expects to find them. Since the Core library is expected to be named 'ppsspp_jni' on ANDROID, we also put its name in a variable that is set to 'Core' unless building on ANDROID, where it is 'ppsspp_jni'.
2012-11-18 16:00:27 +00:00
Try to dynamically link against system ffmpeg when possible
2015-06-01 13:29:54 +00:00
if(USE_FFMPEG)
if(USE_SYSTEM_FFMPEG)
Improve FFmpeg detection on debian systems; fix build when git is installed but there is no .git folder.
2015-09-16 22:07:25 +00:00
find_package(FFMPEG)
Another attempt at reordering stuff in the CMakeLists.txt. So fragile.
2013-12-06 11:08:19 +00:00
else()
Try to dynamically link against system ffmpeg when possible
2015-06-01 13:29:54 +00:00
set(FFMPEG_FOUND OFF)
endif()
if(NOT FFMPEG_FOUND)
if(NOT DEFINED FFMPEG_BUILDDIR)
if(ANDROID)
if(ARMV7)
set(PLATFORM_ARCH "android/armv7")
elseif(ARM)
set(PLATFORM_ARCH "android/arm")
elseif(X86)
set(PLATFORM_ARCH "android/x86")
endif()
elseif(BLACKBERRY)
set(PLATFORM_ARCH "blackberry/armv7")
elseif(IOS)
set(PLATFORM_ARCH "ios/universal")
elseif(MACOSX)
set(PLATFORM_ARCH "macosx/x86_64")
elseif(LINUX)
if(ARMV7)
set(PLATFORM_ARCH "linux/armv7")
elseif(ARM)
set(PLATFORM_ARCH "linux/arm")
elseif(MIPS)
set(PLATFORM_ARCH "linux/mips32")
elseif(CMAKE_SIZEOF_VOID_P EQUAL 8)
set(PLATFORM_ARCH "linux/x86_64")
else()
set(PLATFORM_ARCH "linux/x86")
endif()
endif()
# Using static libraries
if (DEFINED PLATFORM_ARCH)
include_directories(ffmpeg/${PLATFORM_ARCH}/include)
link_directories(ffmpeg/${PLATFORM_ARCH}/lib)
set(FFMPEG_LIBRARIES libavformat.a libavcodec.a libavutil.a libswresample.a libswscale.a)
else()
# Manual definition of system library locations by the user.
if (DEFINED FFMPEG_INCLUDE_PATH)
include_directories(ffmpeg ${FFMPEG_INCLUDE_PATH})
endif()
if (DEFINED AVFORMAT_PATH)
add_library(libavformat STATIC IMPORTED)
set_target_properties(libavformat PROPERTIES IMPORTED_LOCATION ${AVFORMAT_PATH})
SET (FFMPEG_LIBRARIES ${FFMPEG_LIBRARIES} libavformat)
endif()
if (DEFINED AVCODEC_PATH)
add_library(libavcodec STATIC IMPORTED)
set_target_properties(libavcodec PROPERTIES IMPORTED_LOCATION ${AVCODEC_PATH})
SET (FFMPEG_LIBRARIES ${FFMPEG_LIBRARIES} libavcodec)
endif()
if (DEFINED AVUTIL_PATH)
add_library(libavutil STATIC IMPORTED)
set_target_properties(libavutil PROPERTIES IMPORTED_LOCATION ${AVUTIL_PATH})
SET (FFMPEG_LIBRARIES ${FFMPEG_LIBRARIES} libavutil)
endif()
if (DEFINED SWRESAMPLE_PATH)
add_library(libswresample STATIC IMPORTED)
set_target_properties(libswresample PROPERTIES IMPORTED_LOCATION ${SWRESAMPLE_PATH})
SET (FFMPEG_LIBRARIES ${FFMPEG_LIBRARIES} libswresample)
endif()
if (DEFINED SWSCALE_PATH)
add_library(libswscale STATIC IMPORTED)
set_target_properties(libswscale PROPERTIES IMPORTED_LOCATION ${SWSCALE_PATH})
SET (FFMPEG_LIBRARIES ${FFMPEG_LIBRARIES} libswscale)
endif()
endif(DEFINED PLATFORM_ARCH)
else(NOT DEFINED FFMPEG_BUILDDIR)
# Using shared libraries
include_directories(ffmpeg ${FFMPEG_BUILDDIR})
Another attempt at reordering stuff in the CMakeLists.txt. So fragile.
2013-12-06 11:08:19 +00:00
add_library(libavformat STATIC IMPORTED)
Try to dynamically link against system ffmpeg when possible
2015-06-01 13:29:54 +00:00
set_target_properties(libavformat PROPERTIES IMPORTED_LOCATION ${FFMPEG_BUILDDIR}/libavformat/libavformat.a)
Another attempt at reordering stuff in the CMakeLists.txt. So fragile.
2013-12-06 11:08:19 +00:00
add_library(libavcodec STATIC IMPORTED)
Try to dynamically link against system ffmpeg when possible
2015-06-01 13:29:54 +00:00
set_target_properties(libavcodec PROPERTIES IMPORTED_LOCATION ${FFMPEG_BUILDDIR}/libavcodec/libavcodec.a)
Another attempt at reordering stuff in the CMakeLists.txt. So fragile.
2013-12-06 11:08:19 +00:00
add_library(libavutil STATIC IMPORTED)
Try to dynamically link against system ffmpeg when possible
2015-06-01 13:29:54 +00:00
set_target_properties(libavutil PROPERTIES IMPORTED_LOCATION ${FFMPEG_BUILDDIR}/libavutil/libavutil.a)
Another attempt at reordering stuff in the CMakeLists.txt. So fragile.
2013-12-06 11:08:19 +00:00
add_library(libswresample STATIC IMPORTED)
Try to dynamically link against system ffmpeg when possible
2015-06-01 13:29:54 +00:00
set_target_properties(libswresample PROPERTIES IMPORTED_LOCATION ${FFMPEG_BUILDDIR}/libswresample/libswresample.a)
Another attempt at reordering stuff in the CMakeLists.txt. So fragile.
2013-12-06 11:08:19 +00:00
add_library(libswscale STATIC IMPORTED)
Try to dynamically link against system ffmpeg when possible
2015-06-01 13:29:54 +00:00
set_target_properties(libswscale PROPERTIES IMPORTED_LOCATION ${FFMPEG_BUILDDIR}/libswscale/libswscale.a)
SET (FFMPEG_LIBRARIES
libavformat
libavcodec
libavutil
libswresample
libswscale
)
endif(NOT DEFINED FFMPEG_BUILDDIR)
endif(NOT FFMPEG_FOUND)
Another attempt at reordering stuff in the CMakeLists.txt. So fragile.
2013-12-06 11:08:19 +00:00
Use iconv if it exists. Some Linux systems need it and other don't.
2014-11-18 06:19:15 +00:00
find_library(ICONV_LIBRARY NAMES iconv)
if (ICONV_LIBRARY)
set(FFMPEG_LIBRARIES ${FFMPEG_LIBRARIES} ${ICONV_LIBRARY})
Another attempt at reordering stuff in the CMakeLists.txt. So fragile.
2013-12-06 11:08:19 +00:00
endif()
if(APPLE)
set(FFMPEG_LIBRARIES ${FFMPEG_LIBRARIES} bz2 "-framework CoreVideo")
if (NOT IOS)
set(FFMPEG_LIBRARIES ${FFMPEG_LIBRARIES} "-framework VideoDecodeAcceleration")
endif()
endif(APPLE)
Try to dynamically link against system ffmpeg when possible
2015-06-01 13:29:54 +00:00
if(FFMPEG_FOUND)
set(nativeExtraLibs ${nativeExtraLibs} ${FFMPEG_LIBRARIES})
else()
set(LinkCommon ${LinkCommon} ${FFMPEG_LIBRARIES})
endif()
target_link_libraries(Common ${FFMPEG_LIBRARIES})
Another attempt at reordering stuff in the CMakeLists.txt. So fragile.
2013-12-06 11:08:19 +00:00
add_definitions(-DUSE_FFMPEG)
endif(USE_FFMPEG)
# Modification to show where we are pulling the ffmpeg libraries from.
if(USE_FFMPEG AND DEFINED FFMPEG_LIBRARIES)
message(STATUS "FFMPEG library locations:")
Try to dynamically link against system ffmpeg when possible
2015-06-01 13:29:54 +00:00
if(FFMPEG_FOUND)
Improve FFmpeg detection on debian systems; fix build when git is installed but there is no .git folder.
2015-09-16 22:07:25 +00:00
message(STATUS " libavcodec location: ${FFMPEG_avcodec_LIBRARY}")
message(STATUS " libavformat location: ${FFMPEG_avformat_LIBRARY}")
message(STATUS " libavutil location: ${FFMPEG_avutil_LIBRARY}")
message(STATUS " libswresample location: ${FFMPEG_swresample_LIBRARY}")
message(STATUS " libswscale location: ${FFMPEG_swscale_LIBRARY}")
Try to dynamically link against system ffmpeg when possible
2015-06-01 13:29:54 +00:00
elseif(DEFINED PLATFORM_ARCH)
Another attempt at reordering stuff in the CMakeLists.txt. So fragile.
2013-12-06 11:08:19 +00:00
set(TEMP ${CMAKE_SOURCE_DIR}/ffmpeg/${PLATFORM_ARCH}/lib)
Improve FFmpeg detection on debian systems; fix build when git is installed but there is no .git folder.
2015-09-16 22:07:25 +00:00
message(STATUS " libavcodec location: ${TEMP}/libavcodec.a")
message(STATUS " libavformat location: ${TEMP}/libavformat.a")
message(STATUS " libavutil location: ${TEMP}/libavutil.a")
message(STATUS " libswresample location: ${TEMP}/libswresample.a")
message(STATUS " libswscale location: ${TEMP}/libswscale.a")
Another attempt at reordering stuff in the CMakeLists.txt. So fragile.
2013-12-06 11:08:19 +00:00
else()
get_target_property(TEMP libavcodec IMPORTED_LOCATION)
Improve FFmpeg detection on debian systems; fix build when git is installed but there is no .git folder.
2015-09-16 22:07:25 +00:00
message(STATUS " libavcodec location: ${TEMP}")
Another attempt at reordering stuff in the CMakeLists.txt. So fragile.
2013-12-06 11:08:19 +00:00
get_target_property(TEMP libavformat IMPORTED_LOCATION)
Improve FFmpeg detection on debian systems; fix build when git is installed but there is no .git folder.
2015-09-16 22:07:25 +00:00
message(STATUS " libavformat location: ${TEMP}")
Another attempt at reordering stuff in the CMakeLists.txt. So fragile.
2013-12-06 11:08:19 +00:00
get_target_property(TEMP libavutil IMPORTED_LOCATION)
Improve FFmpeg detection on debian systems; fix build when git is installed but there is no .git folder.
2015-09-16 22:07:25 +00:00
message(STATUS " libavutil location: ${TEMP}")
Another attempt at reordering stuff in the CMakeLists.txt. So fragile.
2013-12-06 11:08:19 +00:00
get_target_property(TEMP libswresample IMPORTED_LOCATION)
Improve FFmpeg detection on debian systems; fix build when git is installed but there is no .git folder.
2015-09-16 22:07:25 +00:00
message(STATUS " libswresample location: ${TEMP}")
Another attempt at reordering stuff in the CMakeLists.txt. So fragile.
2013-12-06 11:08:19 +00:00
get_target_property(TEMP libswscale IMPORTED_LOCATION)
Improve FFmpeg detection on debian systems; fix build when git is installed but there is no .git folder.
2015-09-16 22:07:25 +00:00
message(STATUS " libswscale location: ${TEMP}")
Try to dynamically link against system ffmpeg when possible
2015-06-01 13:29:54 +00:00
endif()
Another attempt at reordering stuff in the CMakeLists.txt. So fragile.
2013-12-06 11:08:19 +00:00
else()
message(STATUS "ERROR: No FFMPEG library locations")
endif()
if(USE_FFMPEG AND NOT DEFINED FFMPEG_LIBRARIES)
message(WARNING "FFMPEG_BUILDDIR variable or manual path definition is required to enable FFmpeg. Disabling it.")
unset(USE_FFMPEG)
endif()
find_package(ZLIB)
if(ZLIB_FOUND)
include_directories(${ZLIB_INCLUDE_DIR})
Improve detection of for shared libs in both sdl and Qt (zlib, libzip, snappy and glew).
2015-09-16 03:59:31 +00:00
add_definitions(-DSHARED_ZLIB)
Another attempt at reordering stuff in the CMakeLists.txt. So fragile.
2013-12-06 11:08:19 +00:00
else()
add_library(zlib STATIC
ext/zlib/adler32.c
ext/zlib/compress.c
ext/zlib/crc32.c
ext/zlib/crc32.h
ext/zlib/deflate.c
ext/zlib/deflate.h
ext/zlib/gzclose.c
ext/zlib/gzguts.h
ext/zlib/gzlib.c
ext/zlib/gzread.c
ext/zlib/gzwrite.c
ext/zlib/infback.c
ext/zlib/inffast.c
ext/zlib/inffast.h
ext/zlib/inffixed.h
ext/zlib/inflate.c
ext/zlib/inflate.h
ext/zlib/inftrees.c
ext/zlib/inftrees.h
ext/zlib/make_vms.com
ext/zlib/trees.c
ext/zlib/trees.h
ext/zlib/uncompr.c
ext/zlib/zconf.h
ext/zlib/zlib.h
ext/zlib/zutil.c
ext/zlib/zutil.h
)
include_directories(ext/zlib)
set(ZLIB_LIBRARY zlib)
endif()
Add CityHash back to Linux/iOS/etc. This reverts commit ecfe43c1493d6cfec4e4af99f74ea7d286cf33de.
2013-12-14 23:46:11 +00:00
add_library(cityhash STATIC
Native merge part 2: update build files. And a couple minor stragglers.
2015-09-06 19:52:33 +00:00
ext/native/ext/cityhash/city.cpp
ext/native/ext/cityhash/city.h
ext/native/ext/cityhash/citycrc.h
Add CityHash back to Linux/iOS/etc. This reverts commit ecfe43c1493d6cfec4e4af99f74ea7d286cf33de.
2013-12-14 23:46:11 +00:00
)
include_directories(ext/cityhash)
Another attempt at reordering stuff in the CMakeLists.txt. So fragile.
2013-12-06 11:08:19 +00:00
CMake: Fix up optimisations (broken for everyone except Apple?), move some Blackberry lines to toolchain, enable assembly, use add_definitions for definitions and *flags for flags, remove redundant lines.
2014-06-11 13:02:56 +00:00
if (NOT MSVC)
# These can be fast even for debug.
Add option to shared libzip and libsnappy in CMakeLists.txt.
2015-09-16 01:46:51 +00:00
if(NOT SNAPPY_FOUND)
set_target_properties(snappy PROPERTIES COMPILE_FLAGS "-O3")
endif()
Add udis86 b24baf1 (1.7.3?), not yet used. Linked even on arm to avoid dependency complexity, might skip later.
2014-10-11 15:42:01 +00:00
set_target_properties(udis86 PROPERTIES COMPILE_FLAGS "-O3")
CMake: Fix up optimisations (broken for everyone except Apple?), move some Blackberry lines to toolchain, enable assembly, use add_definitions for definitions and *flags for flags, remove redundant lines.
2014-06-11 13:02:56 +00:00
set_target_properties(cityhash PROPERTIES COMPILE_FLAGS "-O3")
if(NOT ZLIB_FOUND)
set_target_properties(zlib PROPERTIES COMPILE_FLAGS "-O3")
endif()
endif()
Add option to shared libzip and libsnappy in CMakeLists.txt.
2015-09-16 01:46:51 +00:00
find_package(LibZip)
Improve detection of for shared libs in both sdl and Qt (zlib, libzip, snappy and glew).
2015-09-16 03:59:31 +00:00
if(LIBZIP_FOUND)
add_definitions(-DSHARED_LIBZIP)
else()
Add option to shared libzip and libsnappy in CMakeLists.txt.
2015-09-16 01:46:51 +00:00
add_library(libzip STATIC
ext/native/ext/libzip/zip.h
ext/native/ext/libzip/mkstemp.c
ext/native/ext/libzip/zip_add.c
ext/native/ext/libzip/zip_add_dir.c
ext/native/ext/libzip/zip_close.c
ext/native/ext/libzip/zip_delete.c
ext/native/ext/libzip/zip_dirent.c
ext/native/ext/libzip/zip_entry_free.c
ext/native/ext/libzip/zip_entry_new.c
ext/native/ext/libzip/zip_err_str.c
ext/native/ext/libzip/zip_error.c
ext/native/ext/libzip/zip_error_clear.c
ext/native/ext/libzip/zip_error_get.c
ext/native/ext/libzip/zip_error_get_sys_type.c
ext/native/ext/libzip/zip_error_strerror.c
ext/native/ext/libzip/zip_error_to_str.c
ext/native/ext/libzip/zip_fclose.c
ext/native/ext/libzip/zip_file_error_clear.c
ext/native/ext/libzip/zip_file_error_get.c
ext/native/ext/libzip/zip_file_get_offset.c
ext/native/ext/libzip/zip_file_strerror.c
ext/native/ext/libzip/zip_filerange_crc.c
ext/native/ext/libzip/zip_fopen.c
ext/native/ext/libzip/zip_fopen_index.c
ext/native/ext/libzip/zip_fread.c
ext/native/ext/libzip/zip_free.c
ext/native/ext/libzip/zip_get_archive_comment.c
ext/native/ext/libzip/zip_get_archive_flag.c
ext/native/ext/libzip/zip_get_file_comment.c
ext/native/ext/libzip/zip_get_name.c
ext/native/ext/libzip/zip_get_num_files.c
ext/native/ext/libzip/zip_memdup.c
ext/native/ext/libzip/zip_name_locate.c
ext/native/ext/libzip/zip_new.c
ext/native/ext/libzip/zip_open.c
ext/native/ext/libzip/zip_rename.c
ext/native/ext/libzip/zip_replace.c
ext/native/ext/libzip/zip_set_archive_comment.c
ext/native/ext/libzip/zip_set_archive_flag.c
ext/native/ext/libzip/zip_set_file_comment.c
ext/native/ext/libzip/zip_set_name.c
ext/native/ext/libzip/zip_source_buffer.c
ext/native/ext/libzip/zip_source_file.c
ext/native/ext/libzip/zip_source_filep.c
ext/native/ext/libzip/zip_source_free.c
ext/native/ext/libzip/zip_source_function.c
ext/native/ext/libzip/zip_source_zip.c
ext/native/ext/libzip/zip_stat.c
ext/native/ext/libzip/zip_stat_index.c
ext/native/ext/libzip/zip_stat_init.c
ext/native/ext/libzip/zip_strerror.c
ext/native/ext/libzip/zip_unchange.c
ext/native/ext/libzip/zip_unchange_all.c
ext/native/ext/libzip/zip_unchange_archive.c
ext/native/ext/libzip/zip_unchange_data.c)
target_link_libraries(libzip)
include_directories(ext/native/ext/libzip)
set(LIBZIP_LIBRARY libzip)
endif()
CMake-based build system. Tested on Windows with NMake Makefiles and Visual Studio 11 targets. Tested on Linux with GNU Makefiles target, using GCC as the compiler. Tested on FreeBSD using clang as the compiler. Tested for Android on Windows with NMake Makefiles and r8c NDK. Proxy-tested by xsacha for blackberry. The android build requires that the android/android.toolchain.cmake toolchain file is used; an error will be raised if ANDROID is defined without loading the toolchain file. When targeting ANDROID, the resulting .so files will be placed in "android/libs/$ANDROID_ABI" even when building out of tree, since it's where `ant` expects to find them. Since the Core library is expected to be named 'ppsspp_jni' on ANDROID, we also put its name in a variable that is set to 'Core' unless building on ANDROID, where it is 'ppsspp_jni'.
2012-11-18 16:00:27 +00:00
Blackberry: buildfix. Give up on supporting multiple libpng. FindPNG doesn't report the specific include dir it uses and the library name doesn't always match. So use libpng17 on Linux/Blackberry too.
2014-05-31 21:55:45 +00:00
# FindPNG does a few things we don't want. So do it ourselves. Fixed to libpng17
find_path(PNG_PNG_INCLUDE_DIR NAMES "libpng17/png.h")
find_library(PNG_LIBRARY NAMES png17 libpng17)
Proper fix for libpng16 includes. Improve Blackberry CMake toolchain.
2013-12-09 16:14:43 +00:00
find_package(PackageHandleStandardArgs)
find_package_handle_standard_args(PNG REQUIRED_VARS PNG_LIBRARY PNG_PNG_INCLUDE_DIR)
if (PNG_FOUND)
include_directories(${PNG_PNG_INCLUDE_DIR})
Use libpng to load PNGs. Fixes #4689.
2013-12-07 15:42:17 +00:00
else()
Switch to libpng17 to resolve NEON issue on iOS + other bug fixes.
2014-05-30 18:36:13 +00:00
if(ARM)
Native merge part 2: update build files. And a couple minor stragglers.
2015-09-06 19:52:33 +00:00
file(GLOB PNG_ARM_INCLUDES ext/native/ext/libpng17/arm/*)
Switch to libpng17 to resolve NEON issue on iOS + other bug fixes.
2014-05-30 18:36:13 +00:00
endif()
add_library(png17 STATIC
Native merge part 2: update build files. And a couple minor stragglers.
2015-09-06 19:52:33 +00:00
ext/native/ext/libpng17/pngconf.h
ext/native/ext/libpng17/pngdebug.h
ext/native/ext/libpng17/png.c
ext/native/ext/libpng17/png.h
ext/native/ext/libpng17/pngerror.c
ext/native/ext/libpng17/pngget.c
ext/native/ext/libpng17/pnginfo.h
ext/native/ext/libpng17/pnglibconf.h
ext/native/ext/libpng17/pngmem.c
ext/native/ext/libpng17/pngpread.c
ext/native/ext/libpng17/pngpriv.h
ext/native/ext/libpng17/pngread.c
ext/native/ext/libpng17/pngrio.c
ext/native/ext/libpng17/pngrtran.c
ext/native/ext/libpng17/pngrutil.c
ext/native/ext/libpng17/pngset.c
ext/native/ext/libpng17/pngstruct.h
ext/native/ext/libpng17/pngtest.c
ext/native/ext/libpng17/pngtrans.c
ext/native/ext/libpng17/pngwio.c
ext/native/ext/libpng17/pngwrite.c
ext/native/ext/libpng17/pngwtran.c
ext/native/ext/libpng17/pngwutil.c
Switch to libpng17 to resolve NEON issue on iOS + other bug fixes.
2014-05-30 18:36:13 +00:00
${PNG_ARM_INCLUDES} )
set(PNG_LIBRARY png17)
Native merge part 2: update build files. And a couple minor stragglers.
2015-09-06 19:52:33 +00:00
include_directories(ext/native/ext)
Use libpng to load PNGs. Fixes #4689.
2013-12-07 15:42:17 +00:00
endif()
Update OS X iconset. The iconset has been updated to include retina versions at all resolutions and has been rasterized from the svg icons available in the assets/unix-icons directory. icon-512.svg was used for all resolutions except 16x16 and 16x16@2x, which were sourced from icon-16.svg
2015-02-02 08:17:03 +00:00
CMake-based build system. Tested on Windows with NMake Makefiles and Visual Studio 11 targets. Tested on Linux with GNU Makefiles target, using GCC as the compiler. Tested on FreeBSD using clang as the compiler. Tested for Android on Windows with NMake Makefiles and r8c NDK. Proxy-tested by xsacha for blackberry. The android build requires that the android/android.toolchain.cmake toolchain file is used; an error will be raised if ANDROID is defined without loading the toolchain file. When targeting ANDROID, the resulting .so files will be placed in "android/libs/$ANDROID_ABI" even when building out of tree, since it's where `ant` expects to find them. Since the Core library is expected to be named 'ppsspp_jni' on ANDROID, we also put its name in a variable that is set to 'Core' unless building on ANDROID, where it is 'ppsspp_jni'.
2012-11-18 16:00:27 +00:00
set(nativeExtra)
Blackberry 10 Port * Replace SDL with asound backend (removes the only dependency) * Remove all references to SDL in bar-descriptor.xml, blackberry_build.sh * Greatly simplify blackberry_build.sh * Modify CMakeLists.txt to account for removal of SDL * Remove redundancy in CMakeLists.txt (EGLv2) * Refactor nativeExtra's and setting targets * Remove android/CMakeLists.txt (unrelated file) * Update for latest Blackberry NDK (1088) * Handle bug with VSync in latest NDK * Update bar-descriptor.xml to version 0.4 * Fix define on iOS in FragmentShaderGenerator.cpp * Specify NDK used in Credits by target platform, add contributor, remove redundancy
2012-12-02 04:48:00 +00:00
set(nativeExtraLibs)
Fix CMake build
2014-03-22 14:18:01 +00:00
CMake: Cleanup more names.
2014-06-18 06:15:47 +00:00
if(ARMV7)
CMakeLists.txt: Add BB as a supported board * Some of the configuration needs to be tweaked when building for a Beaglebone and Beaglebone Black. * Unlike the Raspberry PI there aren't any files to check against to determine at build time if this is being built for the Raspberry PI. Therefore, create a variable that the user has to pass in (-DBB:BOOL=ON) that will tell CMAKE to build PPSSPPSDL for the BB/BBB. * This will also make it alot easier for users to cross compile for this device Signed-off-by: Franklin S Cooper Jr <fcooper27@gmail.com>
2014-09-27 00:02:32 +00:00
if(BB)
set (CMAKE_ASM_FLAGS "${CMAKE_ASM_FLAGS} -march=armv7-a -mfpu=neon -mcpu=cortex-a8")
fix building for rpi2 by disabling armv7. added missing rpi include correct cflags for rpi1/rpi2 (although rpi2 will build for armv6 for now) only build Common/ColorConvNEON.cpp on armv7
2015-10-25 17:40:04 +00:00
elseif(RPI)
set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mcpu=cortex-a7 -mfpu=neon -mfloat-abi=hard")
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mcpu=cortex-a7 -mfpu=neon -mfloat-abi=hard")
set (CMAKE_ASM_FLAGS "${CMAKE_ASM_FLAGS} -mcpu=cortex-a7 -mfpu=neon -mfloat-abi=hard")
CMakeLists.txt: Add BB as a supported board * Some of the configuration needs to be tweaked when building for a Beaglebone and Beaglebone Black. * Unlike the Raspberry PI there aren't any files to check against to determine at build time if this is being built for the Raspberry PI. Therefore, create a variable that the user has to pass in (-DBB:BOOL=ON) that will tell CMAKE to build PPSSPPSDL for the BB/BBB. * This will also make it alot easier for users to cross compile for this device Signed-off-by: Franklin S Cooper Jr <fcooper27@gmail.com>
2014-09-27 00:02:32 +00:00
else()
Fix ARM build for SDL.
2015-02-03 19:11:21 +00:00
set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -march=armv7-a -mfpu=neon -mcpu=cortex-a9")
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=armv7-a -mfpu=neon -mcpu=cortex-a9")
CMakeLists.txt: Add BB as a supported board * Some of the configuration needs to be tweaked when building for a Beaglebone and Beaglebone Black. * Unlike the Raspberry PI there aren't any files to check against to determine at build time if this is being built for the Raspberry PI. Therefore, create a variable that the user has to pass in (-DBB:BOOL=ON) that will tell CMAKE to build PPSSPPSDL for the BB/BBB. * This will also make it alot easier for users to cross compile for this device Signed-off-by: Franklin S Cooper Jr <fcooper27@gmail.com>
2014-09-27 00:02:32 +00:00
set (CMAKE_ASM_FLAGS "${CMAKE_ASM_FLAGS} -march=armv7-a -mfpu=neon -mcpu=cortex-a9")
endif()
Fix CMake build
2014-03-22 14:18:01 +00:00
set(nativeExtra ${nativeExtra}
Native merge part 2: update build files. And a couple minor stragglers.
2015-09-06 19:52:33 +00:00
ext/native/math/fast/fast_matrix_neon.S)
fix building for rpi2 by disabling armv7. added missing rpi include correct cflags for rpi1/rpi2 (although rpi2 will build for armv6 for now) only build Common/ColorConvNEON.cpp on armv7
2015-10-25 17:40:04 +00:00
elseif(RPI)
set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mfpu=vfp -march=armv6j -mfloat-abi=hard")
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mfpu=vfp -march=armv6j -mfloat-abi=hard")
set (CMAKE_ASM_FLAGS "${CMAKE_ASM_FLAGS} -mfpu=vfp -march=armv6j -mfloat-abi=hard")
Misc fixes. CMake: Don't compile neon on armv6 (rpi). Qt: Correct path for lrelease. SDL: Fix a warning.
2014-06-17 17:28:33 +00:00
endif()
CMake: Support compiling a 'generic' architecture target. Will have to disable JIT first.
2014-06-18 07:12:21 +00:00
if(X86 AND NOT MIPS)
Fix CMake build
2014-03-22 14:18:01 +00:00
set(nativeExtra ${nativeExtra}
Native merge part 2: update build files. And a couple minor stragglers.
2015-09-06 19:52:33 +00:00
ext/native/math/fast/fast_matrix_sse.c)
Fix CMake build
2014-03-22 14:18:01 +00:00
endif()
CMake-based build system. Tested on Windows with NMake Makefiles and Visual Studio 11 targets. Tested on Linux with GNU Makefiles target, using GCC as the compiler. Tested on FreeBSD using clang as the compiler. Tested for Android on Windows with NMake Makefiles and r8c NDK. Proxy-tested by xsacha for blackberry. The android build requires that the android/android.toolchain.cmake toolchain file is used; an error will be raised if ANDROID is defined without loading the toolchain file. When targeting ANDROID, the resulting .so files will be placed in "android/libs/$ANDROID_ABI" even when building out of tree, since it's where `ant` expects to find them. Since the Core library is expected to be named 'ppsspp_jni' on ANDROID, we also put its name in a variable that is set to 'Core' unless building on ANDROID, where it is 'ppsspp_jni'.
2012-11-18 16:00:27 +00:00
if(ANDROID)
CMakeLists cleanup. Tabified CMakeLists. Introduced USING_GLES2 and X86 option and exposed USING_GLES2 to C++. Removed some redundancies and messiness.
2012-11-26 02:41:57 +00:00
set(nativeExtra ${nativeExtra}
Native merge part 2: update build files. And a couple minor stragglers.
2015-09-06 19:52:33 +00:00
ext/native/base/NativeApp.h
Fix CMake build for Android. Seems like some files have been moved.
2016-01-21 21:37:13 +00:00
android/jni/app-android.cpp
android/jni/native_audio.cpp
android/jni/native_audio.h)
CMakeLists cleanup. Tabified CMakeLists. Introduced USING_GLES2 and X86 option and exposed USING_GLES2 to C++. Removed some redundancies and messiness.
2012-11-26 02:41:57 +00:00
add_library(native_audio SHARED
Fix CMake build for Android. Seems like some files have been moved.
2016-01-21 21:37:13 +00:00
android/jni/native-audio-so.cpp
android/jni/native-audio-so.h)
Android: Fixes for CMake and Qt.
2014-06-27 16:49:50 +00:00
target_link_libraries(native_audio OpenSLES log)
Blackberry 10 Port * Replace SDL with asound backend (removes the only dependency) * Remove all references to SDL in bar-descriptor.xml, blackberry_build.sh * Greatly simplify blackberry_build.sh * Modify CMakeLists.txt to account for removal of SDL * Remove redundancy in CMakeLists.txt (EGLv2) * Refactor nativeExtra's and setting targets * Remove android/CMakeLists.txt (unrelated file) * Update for latest Blackberry NDK (1088) * Handle bug with VSync in latest NDK * Update bar-descriptor.xml to version 0.4 * Fix define on iOS in FragmentShaderGenerator.cpp * Specify NDK used in Credits by target platform, add contributor, remove redundancy
2012-12-02 04:48:00 +00:00
# No target
iOS Objective-C code dump. ViewController courtesy of rock88. Made modifications for simplification and code-style. Still missing some files (eg. images). Also, CMake is not set up correctly yet.
2013-02-17 14:04:44 +00:00
elseif(IOS)
set(nativeExtra ${nativeExtra}
iOS buildfix.
2013-08-19 03:17:33 +00:00
ios/main.mm
Properly post lost_focus and got_focus notifications when iOS app resigns active state and gains active state. Fixes #7758
2015-05-27 06:35:09 +00:00
ios/AppDelegate.mm
iOS Objective-C code dump. ViewController courtesy of rock88. Made modifications for simplification and code-style. Still missing some files (eg. images). Also, CMake is not set up correctly yet.
2013-02-17 14:04:44 +00:00
ios/AppDelegate.h
ios/ViewController.mm
IOS: added audio output
2013-03-16 14:50:55 +00:00
ios/ViewController.h
Updated CMakeLists to include new iOS Audio files
2013-06-25 21:38:30 +00:00
ios/iOSCoreAudio.cpp
ios/iOSCoreAudio.h
Added iCade support to the iOS build
2013-05-31 01:58:41 +00:00
ios/iCade/iCadeReaderView.h
ios/iCade/iCadeReaderView.m
ios/iCade/iCadeState.h)
Buildfix for iOS SDK < 7. Correct controller reconnection handling.
2014-01-27 14:32:19 +00:00
set(nativeExtraLibs ${nativeExtraLibs} "-framework Foundation -framework AudioToolbox -framework CoreGraphics -framework QuartzCore -framework OpenGLES -framework UIKit -framework GLKit -framework OpenAL")
CMake: Make the code more platform-agnostic and cleaner.
2014-05-30 15:22:11 +00:00
if(EXISTS "${CMAKE_IOS_SDK_ROOT}/System/Library/Frameworks/GameController.framework")
set(nativeExtraLibs ${nativeExtraLibs} "-weak_framework GameController")
endif()
Update CMakeLists.txt Buildfix for Xcode 7(adding iconv library) In IOS 9, the Default-568h.png file must be located in root app directory.
2015-10-08 04:43:33 +00:00
Update CMakeLists.txt iconv_library check
2015-10-08 05:27:15 +00:00
if(NOT ICONV_LIBRARY)
set(nativeExtraLibs ${nativeExtraLibs} iconv)
endif()
CMake: Make the code more platform-agnostic and cleaner.
2014-05-30 15:22:11 +00:00
Properly post lost_focus and got_focus notifications when iOS app resigns active state and gains active state. Fixes #7758
2015-05-27 06:35:09 +00:00
set_source_files_properties(ios/AppDelegate.mm PROPERTIES COMPILE_FLAGS -fobjc-arc)
CMake: Make the code more platform-agnostic and cleaner.
2014-05-30 15:22:11 +00:00
set_source_files_properties(ios/ViewController.mm PROPERTIES COMPILE_FLAGS -fobjc-arc)
iOS: Enable ARC for PPSSPP target & for few files in native lib
2014-05-17 05:53:40 +00:00
Fix for iOS CMake Update toolchain file to reflect that we want to use clang (rock88 is using clang). Set target in the CMake. Fix for packaging and signing (thanks rock88). Update linking to include audio and GLKit (thanks rock88). Update README
2013-02-24 03:23:04 +00:00
set(TargetBin PPSSPP)
Qt UI in CMake (for future)
2012-12-16 11:17:13 +00:00
elseif(USING_QT_UI)
# Currently unused
Error when attempting to use Qt via CMake. Otherwise it will build successfully but not actually run, confusing users.
2014-07-17 19:01:20 +00:00
message(FATAL_ERROR "Cmake does not yet support Qt. Please use qmake instead.")
Qt UI in CMake (for future)
2012-12-16 11:17:13 +00:00
find_package(Qt4 COMPONENTS QtMultimedia QtOpenGL QtGui QtCore)
include(${QT_USE_FILE})
Native merge part 2: update build files. And a couple minor stragglers.
2015-09-06 19:52:33 +00:00
qt4_wrap_cpp(nativeQtHeader ext/native/base/QtMain.h)
set(nativeExtra ${nativeExtra} ext/native/base/QtMain.cpp ${nativeQtHeader})
CMake: Support compiling a 'generic' architecture target. Will have to disable JIT first.
2014-06-18 07:12:21 +00:00
if(NOT MOBILE_DEVICE)
qt4_wrap_cpp(nativeQtHeader Qt/mainwindow.h)
set(nativeExtra ${nativeExtra} Qt/mainwindow.cpp)
endif()
Qt UI in CMake (for future)
2012-12-16 11:17:13 +00:00
set(nativeExtraLibs ${nativeExtraLibs} ${QT_LIBRARIES})
set(TargetBin PPSSPPQt)
Fix linkingproblem on OSX missing -framework CoreFundation
2013-08-18 13:58:43 +00:00
if(APPLE)
set(nativeExtraLibs ${nativeExtraLibs} "-framework CoreFoundation")
endif()
Blackberry 10 Port * Replace SDL with asound backend (removes the only dependency) * Remove all references to SDL in bar-descriptor.xml, blackberry_build.sh * Greatly simplify blackberry_build.sh * Modify CMakeLists.txt to account for removal of SDL * Remove redundancy in CMakeLists.txt (EGLv2) * Refactor nativeExtra's and setting targets * Remove android/CMakeLists.txt (unrelated file) * Update for latest Blackberry NDK (1088) * Handle bug with VSync in latest NDK * Update bar-descriptor.xml to version 0.4 * Fix define on iOS in FragmentShaderGenerator.cpp * Specify NDK used in Credits by target platform, add contributor, remove redundancy
2012-12-02 04:48:00 +00:00
elseif(BLACKBERRY)
CMake 3.0: Fix DL_LIBS being reset for Blackberry.
2014-06-23 06:07:26 +00:00
unset(CMAKE_DL_LIBS)
Native merge part 2: update build files. And a couple minor stragglers.
2015-09-06 19:52:33 +00:00
set(nativeExtra ${nativeExtra} ext/native/base/BlackberryMain.cpp ext/native/base/BlackberryDisplay.cpp)
Use libpng to load PNGs. Fixes #4689.
2013-12-07 15:42:17 +00:00
set(nativeExtraLibs ${nativeExtraLibs} OpenAL bps screen socket EGL)
Blackberry 10 Port * Replace SDL with asound backend (removes the only dependency) * Remove all references to SDL in bar-descriptor.xml, blackberry_build.sh * Greatly simplify blackberry_build.sh * Modify CMakeLists.txt to account for removal of SDL * Remove redundancy in CMakeLists.txt (EGLv2) * Refactor nativeExtra's and setting targets * Remove android/CMakeLists.txt (unrelated file) * Update for latest Blackberry NDK (1088) * Handle bug with VSync in latest NDK * Update bar-descriptor.xml to version 0.4 * Fix define on iOS in FragmentShaderGenerator.cpp * Specify NDK used in Credits by target platform, add contributor, remove redundancy
2012-12-02 04:48:00 +00:00
set(TargetBin PPSSPPBlackberry)
Detect and use SDL2 with help of this Dolphin CMake module: https://github.com/dolphin-emu/dolphin/blob/master/CMakeTests/FindSDL2.cmake
2014-09-01 09:37:44 +00:00
elseif(SDL2_FOUND)
Fix PPSSPPSDL on MacOSX, link ffmpeg.
2013-06-15 12:50:47 +00:00
set(TargetBin PPSSPPSDL)
Qt UI in CMake (for future)
2012-12-16 11:17:13 +00:00
# Require SDL
Detect and use SDL2 with help of this Dolphin CMake module: https://github.com/dolphin-emu/dolphin/blob/master/CMakeTests/FindSDL2.cmake
2014-09-01 09:37:44 +00:00
include_directories(${SDL2_INCLUDE_DIR})
Pass -D SDL when SDL is used Update the Qt build to use the same define so that common files can use it.
2014-12-18 22:59:22 +00:00
add_definitions(-DSDL)
Update OS X iconset. The iconset has been updated to include retina versions at all resolutions and has been rasterized from the svg icons available in the assets/unix-icons directory. icon-512.svg was used for all resolutions except 16x16 and 16x16@2x, which were sourced from icon-16.svg
2015-02-02 08:17:03 +00:00
set(nativeExtra ${nativeExtra}
enable SDL Joystick support to Qt Cmake file update add new SDL joystick files
2013-11-05 12:49:23 +00:00
SDL/SDLJoystick.h
SDL/SDLJoystick.cpp
Native merge part 2: update build files. And a couple minor stragglers.
2015-09-06 19:52:33 +00:00
ext/native/base/PCMain.cpp)
Detect and use SDL2 with help of this Dolphin CMake module: https://github.com/dolphin-emu/dolphin/blob/master/CMakeTests/FindSDL2.cmake
2014-09-01 09:37:44 +00:00
set(nativeExtraLibs ${nativeExtraLibs} ${SDL2_LIBRARY})
Blackberry 10 Port * Replace SDL with asound backend (removes the only dependency) * Remove all references to SDL in bar-descriptor.xml, blackberry_build.sh * Greatly simplify blackberry_build.sh * Modify CMakeLists.txt to account for removal of SDL * Remove redundancy in CMakeLists.txt (EGLv2) * Refactor nativeExtra's and setting targets * Remove android/CMakeLists.txt (unrelated file) * Update for latest Blackberry NDK (1088) * Handle bug with VSync in latest NDK * Update bar-descriptor.xml to version 0.4 * Fix define on iOS in FragmentShaderGenerator.cpp * Specify NDK used in Credits by target platform, add contributor, remove redundancy
2012-12-02 04:48:00 +00:00
if(APPLE)
set(nativeExtra ${nativeExtra} SDL/SDLMain.h SDL/SDLMain.mm)
set(nativeExtraLibs ${nativeExtraLibs} ${COCOA_LIBRARY})
CMake: Make the code more platform-agnostic and cleaner.
2014-05-30 15:22:11 +00:00
elseif(USING_EGL)
set(nativeExtraLibs ${nativeExtraLibs} pthread EGL)
Blackberry 10 Port * Replace SDL with asound backend (removes the only dependency) * Remove all references to SDL in bar-descriptor.xml, blackberry_build.sh * Greatly simplify blackberry_build.sh * Modify CMakeLists.txt to account for removal of SDL * Remove redundancy in CMakeLists.txt (EGLv2) * Refactor nativeExtra's and setting targets * Remove android/CMakeLists.txt (unrelated file) * Update for latest Blackberry NDK (1088) * Handle bug with VSync in latest NDK * Update bar-descriptor.xml to version 0.4 * Fix define on iOS in FragmentShaderGenerator.cpp * Specify NDK used in Credits by target platform, add contributor, remove redundancy
2012-12-02 04:48:00 +00:00
endif()
iOS Objective-C code dump. ViewController courtesy of rock88. Made modifications for simplification and code-style. Still missing some files (eg. images). Also, CMake is not set up correctly yet.
2013-02-17 14:04:44 +00:00
set(TargetBin PPSSPPSDL)
Blackberry 10 Port * Replace SDL with asound backend (removes the only dependency) * Remove all references to SDL in bar-descriptor.xml, blackberry_build.sh * Greatly simplify blackberry_build.sh * Modify CMakeLists.txt to account for removal of SDL * Remove redundancy in CMakeLists.txt (EGLv2) * Refactor nativeExtra's and setting targets * Remove android/CMakeLists.txt (unrelated file) * Update for latest Blackberry NDK (1088) * Handle bug with VSync in latest NDK * Update bar-descriptor.xml to version 0.4 * Fix define on iOS in FragmentShaderGenerator.cpp * Specify NDK used in Credits by target platform, add contributor, remove redundancy
2012-12-02 04:48:00 +00:00
else()
Detect and use SDL2 with help of this Dolphin CMake module: https://github.com/dolphin-emu/dolphin/blob/master/CMakeTests/FindSDL2.cmake
2014-09-01 09:37:44 +00:00
message(FATAL_ERROR "Could not find SDL2. Failing.")
CMake-based build system. Tested on Windows with NMake Makefiles and Visual Studio 11 targets. Tested on Linux with GNU Makefiles target, using GCC as the compiler. Tested on FreeBSD using clang as the compiler. Tested for Android on Windows with NMake Makefiles and r8c NDK. Proxy-tested by xsacha for blackberry. The android build requires that the android/android.toolchain.cmake toolchain file is used; an error will be raised if ANDROID is defined without loading the toolchain file. When targeting ANDROID, the resulting .so files will be placed in "android/libs/$ANDROID_ABI" even when building out of tree, since it's where `ant` expects to find them. Since the Core library is expected to be named 'ppsspp_jni' on ANDROID, we also put its name in a variable that is set to 'Core' unless building on ANDROID, where it is 'ppsspp_jni'.
2012-11-18 16:00:27 +00:00
endif()
Android: Fixes for CMake and Qt.
2014-06-27 16:49:50 +00:00
set(NativeAppSource
Mac buildfix
2014-08-23 12:24:24 +00:00
android/jni/TestRunner.cpp
Android: Fixes for CMake and Qt.
2014-06-27 16:49:50 +00:00
UI/NativeApp.cpp
UI/BackgroundAudio.cpp
UI/DevScreens.cpp
Add Display layout editor to use for example on tablets, but also includes automatic screen cropping for 16:9 cases(default). //Rebased & removed atlas stuff which was added with #8096 //squashed with some improvements
2015-10-24 12:40:29 +00:00
UI/DisplayLayoutEditor.cpp
UI/DisplayLayoutScreen.cpp
Android: Fixes for CMake and Qt.
2014-06-27 16:49:50 +00:00
UI/EmuScreen.cpp
UI/GameInfoCache.cpp
UI/MainScreen.cpp
UI/MiscScreens.cpp
Move GamePauseScreen into its own file
2014-12-22 09:48:17 +00:00
UI/PauseScreen.cpp
Android: Fixes for CMake and Qt.
2014-06-27 16:49:50 +00:00
UI/GameScreen.cpp
UI/GameSettingsScreen.cpp
UI/TiltAnalogSettingsScreen.cpp
UI/TiltEventProcessor.cpp
UI/TouchControlLayoutScreen.cpp
UI/TouchControlVisibilityScreen.cpp
UI/GamepadEmu.cpp
UI/OnScreenDisplay.cpp
UI/ControlMappingScreen.cpp
http: Add a screen under tools for the server.
2016-07-03 17:24:33 +00:00
UI/RemoteISOScreen.cpp
Initial attempt at a compat report screen.
2014-02-10 09:24:40 +00:00
UI/ReportScreen.cpp
Make GameInfoCache understand PSP savedata as a "game" type. Use it to create a basic savedata listing screen.
2015-06-11 18:22:16 +00:00
UI/SavedataScreen.cpp
Android: Fixes for CMake and Qt.
2014-06-27 16:49:50 +00:00
UI/Store.cpp
UI/CwCheatScreen.cpp
UI/InstallZipScreen.cpp
Add new shader viewing tool
2015-10-14 15:45:21 +00:00
UI/ProfilerDraw.cpp
Implement on-screen touch combo keys. Replace A,B,cross1,square1,triangle1 with number images 1-6 Rebuild the atlas, update the code to use combo keys 1-5 Also add psp_display.png from pull request #8082.
2015-06-28 05:34:05 +00:00
UI/ui_atlas.cpp
UI/ComboKeyMappingScreen.cpp)
Android: Fixes for CMake and Qt.
2014-06-27 16:49:50 +00:00
if(ANDROID)
if (ARM)
set(NativeAppSource ${NativeAppSource} android/jni/ArmEmitterTest.cpp)
endif()
set(nativeExtra ${nativeExtra} ${NativeAppSource})
endif()
CMake-based build system. Tested on Windows with NMake Makefiles and Visual Studio 11 targets. Tested on Linux with GNU Makefiles target, using GCC as the compiler. Tested on FreeBSD using clang as the compiler. Tested for Android on Windows with NMake Makefiles and r8c NDK. Proxy-tested by xsacha for blackberry. The android build requires that the android/android.toolchain.cmake toolchain file is used; an error will be raised if ANDROID is defined without loading the toolchain file. When targeting ANDROID, the resulting .so files will be placed in "android/libs/$ANDROID_ABI" even when building out of tree, since it's where `ant` expects to find them. Since the Core library is expected to be named 'ppsspp_jni' on ANDROID, we also put its name in a variable that is set to 'Core' unless building on ANDROID, where it is 'ppsspp_jni'.
2012-11-18 16:00:27 +00:00
add_library(native STATIC
CMakeLists cleanup. Tabified CMakeLists. Introduced USING_GLES2 and X86 option and exposed USING_GLES2 to C++. Removed some redundancies and messiness.
2012-11-26 02:41:57 +00:00
${nativeExtra}
Native merge part 2: update build files. And a couple minor stragglers.
2015-09-06 19:52:33 +00:00
ext/native/base/backtrace.cpp
ext/native/base/backtrace.h
ext/native/base/basictypes.h
ext/native/base/buffer.cpp
ext/native/base/buffer.h
ext/native/base/colorutil.cpp
ext/native/base/colorutil.h
ext/native/base/display.cpp
ext/native/base/display.h
ext/native/base/functional.h
ext/native/base/linked_ptr.h
ext/native/base/logging.h
ext/native/base/mutex.h
ext/native/base/stringutil.cpp
ext/native/base/stringutil.h
ext/native/base/timeutil.cpp
ext/native/base/timeutil.h
ext/native/data/compression.cpp
ext/native/data/compression.h
ext/native/ext/vjson/json.cpp
ext/native/ext/vjson/json.h
ext/native/ext/vjson/block_allocator.cpp
ext/native/ext/vjson/block_allocator.h
ext/native/file/chunk_file.cpp
ext/native/file/chunk_file.h
ext/native/file/fd_util.cpp
ext/native/file/fd_util.h
ext/native/file/file_util.cpp
ext/native/file/file_util.h
Measure free disk space to size block count.
2015-11-16 05:57:35 +00:00
ext/native/file/free.cpp
ext/native/file/free.h
Native merge part 2: update build files. And a couple minor stragglers.
2015-09-06 19:52:33 +00:00
ext/native/file/ini_file.cpp
ext/native/file/ini_file.h
ext/native/file/path.cpp
ext/native/file/path.h
ext/native/file/vfs.h
ext/native/file/zip_read.cpp
ext/native/file/zip_read.h
ext/native/gfx/gl_common.h
ext/native/gfx/gl_debug_log.cpp
ext/native/gfx/gl_debug_log.h
ext/native/gfx/gl_lost_manager.cpp
ext/native/gfx/gl_lost_manager.h
ext/native/gfx/texture_atlas.cpp
ext/native/gfx/texture_atlas.h
ext/native/gfx_es2/draw_buffer.cpp
ext/native/gfx_es2/draw_buffer.h
ext/native/gfx_es2/draw_text.cpp
ext/native/gfx_es2/draw_text.h
ext/native/gfx_es2/gpu_features.cpp
ext/native/gfx_es2/gpu_features.h
ext/native/gfx_es2/glsl_program.cpp
ext/native/gfx_es2/glsl_program.h
ext/native/gfx_es2/gl3stub.c
ext/native/gfx_es2/gl3stub.h
ext/native/i18n/i18n.cpp
ext/native/i18n/i18n.h
ext/native/image/png_load.cpp
ext/native/image/png_load.h
ext/native/image/zim_load.cpp
ext/native/image/zim_load.h
ext/native/image/zim_save.cpp
ext/native/image/zim_save.h
ext/native/input/gesture_detector.cpp
ext/native/input/gesture_detector.h
ext/native/input/keycodes.h
ext/native/input/input_state.h
ext/native/input/input_state.cpp
ext/native/math/fast/fast_math.c
ext/native/math/fast/fast_matrix.c
ext/native/math/curves.cpp
ext/native/math/curves.h
ext/native/math/expression_parser.cpp
ext/native/math/expression_parser.h
ext/native/math/lin/matrix4x4.cpp
ext/native/math/lin/matrix4x4.h
ext/native/math/lin/plane.cpp
ext/native/math/lin/plane.h
ext/native/math/lin/quat.cpp
ext/native/math/lin/quat.h
ext/native/math/lin/ray.h
ext/native/math/lin/vec3.cpp
ext/native/math/lin/vec3.h
ext/native/math/math_util.cpp
ext/native/math/math_util.h
ext/native/net/http_client.cpp
ext/native/net/http_client.h
http: Allow binding a random port, timeout. The timeout is useful to allow for shutdown of the thread.
2016-07-03 17:18:54 +00:00
ext/native/net/http_headers.cpp
ext/native/net/http_headers.h
ext/native/net/http_server.cpp
ext/native/net/http_server.h
Native merge part 2: update build files. And a couple minor stragglers.
2015-09-06 19:52:33 +00:00
ext/native/net/resolve.cpp
ext/native/net/resolve.h
http: Switch to using input/output sinks. This should be more performant than reading one byte at a time in a loop.
2016-05-26 02:02:38 +00:00
ext/native/net/sinks.cpp
ext/native/net/sinks.h
Native merge part 2: update build files. And a couple minor stragglers.
2015-09-06 19:52:33 +00:00
ext/native/net/url.cpp
ext/native/net/url.h
ext/native/profiler/profiler.cpp
ext/native/profiler/profiler.h
ext/native/thin3d/thin3d.cpp
ext/native/thin3d/thin3d.h
ext/native/thin3d/thin3d_gl.cpp
http: Allow binding a random port, timeout. The timeout is useful to allow for shutdown of the thread.
2016-07-03 17:18:54 +00:00
ext/native/thread/executor.cpp
ext/native/thread/executor.h
Native merge part 2: update build files. And a couple minor stragglers.
2015-09-06 19:52:33 +00:00
ext/native/thread/prioritizedworkqueue.cpp
ext/native/thread/prioritizedworkqueue.h
ext/native/thread/threadutil.cpp
ext/native/thread/threadutil.h
ext/native/thread/threadpool.cpp
ext/native/thread/threadpool.h
ext/native/ui/screen.cpp
ext/native/ui/screen.h
ext/native/ui/ui.cpp
ext/native/ui/ui.h
ext/native/ui/ui_context.cpp
ext/native/ui/ui_context.h
ext/native/ui/ui_screen.cpp
ext/native/ui/ui_screen.h
ext/native/ui/view.cpp
ext/native/ui/view.h
ext/native/ui/viewgroup.cpp
ext/native/ui/viewgroup.h
ext/native/ui/virtual_input.cpp
ext/native/ui/virtual_input.h
ext/native/util/hash/hash.cpp
ext/native/util/hash/hash.h
ext/native/util/random/rng.h
ext/native/util/text/utf8.h
ext/native/util/text/utf8.cpp
ext/native/util/text/parsers.h
ext/native/util/text/parsers.cpp
UI: Add a generic word wrapper class.
2016-07-04 17:52:43 +00:00
ext/native/util/text/wrap_text.h
ext/native/util/text/wrap_text.cpp
Native merge part 2: update build files. And a couple minor stragglers.
2015-09-06 19:52:33 +00:00
ext/native/util/const_map.h
ext/native/ext/jpge/jpgd.cpp
ext/native/ext/jpge/jpgd.h
ext/native/ext/jpge/jpge.cpp
ext/native/ext/jpge/jpge.h)
include_directories(ext/native)
Exclude rt on Mac SDL port
2013-12-19 10:10:46 +00:00
Android: Fixes for CMake and Qt.
2014-06-27 16:49:50 +00:00
if (LINUX AND NOT ANDROID)
Exclude rt on Mac SDL port
2013-12-19 10:10:46 +00:00
SET(RT_LIB rt)
endif()
Remove native audio mixer (Unused in PPSSPP) and stb_vorbis
2015-09-19 08:40:45 +00:00
target_link_libraries(native ${LIBZIP_LIBRARY} ${ZLIB_LIBRARY} ${PNG_LIBRARY} rg_etc1 vjson snappy udis86 ${RT_LIB} ${GLEW_LIBRARIES})
Remove unnecessary compiles from CMake, Qt.
2013-10-27 14:28:18 +00:00
CMake-based build system. Tested on Windows with NMake Makefiles and Visual Studio 11 targets. Tested on Linux with GNU Makefiles target, using GCC as the compiler. Tested on FreeBSD using clang as the compiler. Tested for Android on Windows with NMake Makefiles and r8c NDK. Proxy-tested by xsacha for blackberry. The android build requires that the android/android.toolchain.cmake toolchain file is used; an error will be raised if ANDROID is defined without loading the toolchain file. When targeting ANDROID, the resulting .so files will be placed in "android/libs/$ANDROID_ABI" even when building out of tree, since it's where `ant` expects to find them. Since the Core library is expected to be named 'ppsspp_jni' on ANDROID, we also put its name in a variable that is set to 'Core' unless building on ANDROID, where it is 'ppsspp_jni'.
2012-11-18 16:00:27 +00:00
if(ANDROID)
Android: Fixes for CMake and Qt.
2014-06-27 16:49:50 +00:00
target_link_libraries(native log EGL)
Remove unnecessary compiles from CMake, Qt.
2013-10-27 14:28:18 +00:00
elseif(WIN32)
CMakeLists cleanup. Tabified CMakeLists. Introduced USING_GLES2 and X86 option and exposed USING_GLES2 to C++. Removed some redundancies and messiness.
2012-11-26 02:41:57 +00:00
target_link_libraries(native ws2_32 winmm)
CMake-based build system. Tested on Windows with NMake Makefiles and Visual Studio 11 targets. Tested on Linux with GNU Makefiles target, using GCC as the compiler. Tested on FreeBSD using clang as the compiler. Tested for Android on Windows with NMake Makefiles and r8c NDK. Proxy-tested by xsacha for blackberry. The android build requires that the android/android.toolchain.cmake toolchain file is used; an error will be raised if ANDROID is defined without loading the toolchain file. When targeting ANDROID, the resulting .so files will be placed in "android/libs/$ANDROID_ABI" even when building out of tree, since it's where `ant` expects to find them. Since the Core library is expected to be named 'ppsspp_jni' on ANDROID, we also put its name in a variable that is set to 'Core' unless building on ANDROID, where it is 'ppsspp_jni'.
2012-11-18 16:00:27 +00:00
endif()
Remove unnecessary compiles from CMake, Qt.
2013-10-27 14:28:18 +00:00
setup_target_project(native native)
CMake-based build system. Tested on Windows with NMake Makefiles and Visual Studio 11 targets. Tested on Linux with GNU Makefiles target, using GCC as the compiler. Tested on FreeBSD using clang as the compiler. Tested for Android on Windows with NMake Makefiles and r8c NDK. Proxy-tested by xsacha for blackberry. The android build requires that the android/android.toolchain.cmake toolchain file is used; an error will be raised if ANDROID is defined without loading the toolchain file. When targeting ANDROID, the resulting .so files will be placed in "android/libs/$ANDROID_ABI" even when building out of tree, since it's where `ant` expects to find them. Since the Core library is expected to be named 'ppsspp_jni' on ANDROID, we also put its name in a variable that is set to 'Core' unless building on ANDROID, where it is 'ppsspp_jni'.
2012-11-18 16:00:27 +00:00
add_library(kirk STATIC
CMakeLists cleanup. Tabified CMakeLists. Introduced USING_GLES2 and X86 option and exposed USING_GLES2 to C++. Removed some redundancies and messiness.
2012-11-26 02:41:57 +00:00
ext/libkirk/AES.c
ext/libkirk/AES.h
Build fix for most platforms. New libkirk file.
2013-02-24 14:45:10 +00:00
ext/libkirk/amctrl.c
ext/libkirk/amctrl.h
CMakeLists cleanup. Tabified CMakeLists. Introduced USING_GLES2 and X86 option and exposed USING_GLES2 to C++. Removed some redundancies and messiness.
2012-11-26 02:41:57 +00:00
ext/libkirk/SHA1.c
ext/libkirk/SHA1.h
ext/libkirk/bn.c
ext/libkirk/ec.c
ext/libkirk/kirk_engine.c
ext/libkirk/kirk_engine.h)
CMake-based build system. Tested on Windows with NMake Makefiles and Visual Studio 11 targets. Tested on Linux with GNU Makefiles target, using GCC as the compiler. Tested on FreeBSD using clang as the compiler. Tested for Android on Windows with NMake Makefiles and r8c NDK. Proxy-tested by xsacha for blackberry. The android build requires that the android/android.toolchain.cmake toolchain file is used; an error will be raised if ANDROID is defined without loading the toolchain file. When targeting ANDROID, the resulting .so files will be placed in "android/libs/$ANDROID_ABI" even when building out of tree, since it's where `ant` expects to find them. Since the Core library is expected to be named 'ppsspp_jni' on ANDROID, we also put its name in a variable that is set to 'Core' unless building on ANDROID, where it is 'ppsspp_jni'.
2012-11-18 16:00:27 +00:00
include_directories(ext/libkirk)
Implement sceSfmt19937 module.
2015-02-15 05:22:20 +00:00
add_library(sfmt19937 STATIC
ext/sfmt19937/SFMT.c
ext/sfmt19937/SFMT.h
ext/sfmt19937/SFMT-common.h
ext/sfmt19937/SFMT-params.h
ext/sfmt19937/SFMT-params19937.h
)
include_directories(ext/sfmt19937)
Buildfix
2013-04-30 16:44:20 +00:00
add_library(xbrz STATIC
ext/xbrz/xbrz.cpp
ext/xbrz/xbrz.h
)
include_directories(ext/xbrz)
Add xxHash-r32 to build (not used yet.)
2013-08-17 05:58:38 +00:00
add_library(xxhash STATIC
ext/xxhash.c
ext/xxhash.h
)
include_directories(ext/xxhash)
CMake-based build system. Tested on Windows with NMake Makefiles and Visual Studio 11 targets. Tested on Linux with GNU Makefiles target, using GCC as the compiler. Tested on FreeBSD using clang as the compiler. Tested for Android on Windows with NMake Makefiles and r8c NDK. Proxy-tested by xsacha for blackberry. The android build requires that the android/android.toolchain.cmake toolchain file is used; an error will be raised if ANDROID is defined without loading the toolchain file. When targeting ANDROID, the resulting .so files will be placed in "android/libs/$ANDROID_ABI" even when building out of tree, since it's where `ant` expects to find them. Since the Core library is expected to be named 'ppsspp_jni' on ANDROID, we also put its name in a variable that is set to 'Core' unless building on ANDROID, where it is 'ppsspp_jni'.
2012-11-18 16:00:27 +00:00
set(CoreExtra)
Fix a build error on linux platforms Due to dl* function usage in Core/HW/atrac3plus.cpp on non-windows platforms, Core library needs to be linked with -ldl flag on these platforms. Added a CoreExtraLibs variable in CMakeLists.txt to handle all platform-dependent dependencies of Core, and added dl to this variable on non-win32 platforms.
2013-06-07 02:54:59 +00:00
set(CoreExtraLibs)
Move the IR interpreter out into its own file. Rename it in the UI. First CMake and Android fixes.
2016-05-08 19:56:52 +00:00
set(CoreExtra ${CoreExtra}
Core/MIPS/IR/IRCompALU.cpp
Core/MIPS/IR/IRCompBranch.cpp
Core/MIPS/IR/IRCompFPU.cpp
Core/MIPS/IR/IRCompLoadStore.cpp
Core/MIPS/IR/IRCompVFPU.cpp
Complete the separation of the IR compiler frontend from the "Jit"
2016-05-09 18:05:06 +00:00
Core/MIPS/IR/IRFrontend.cpp
Core/MIPS/IR/IRFrontend.h
Move the IR interpreter out into its own file. Rename it in the UI. First CMake and Android fixes.
2016-05-08 19:56:52 +00:00
Core/MIPS/IR/IRInst.cpp
Core/MIPS/IR/IRInst.h
Core/MIPS/IR/IRInterpreter.cpp
Core/MIPS/IR/IRInterpreter.h
Core/MIPS/IR/IRJit.cpp
Core/MIPS/IR/IRJit.h
Core/MIPS/IR/IRPassSimplify.cpp
Core/MIPS/IR/IRPassSimplify.h
Core/MIPS/IR/IRRegCache.cpp
Core/MIPS/IR/IRRegCache.h
)
CMake-based build system. Tested on Windows with NMake Makefiles and Visual Studio 11 targets. Tested on Linux with GNU Makefiles target, using GCC as the compiler. Tested on FreeBSD using clang as the compiler. Tested for Android on Windows with NMake Makefiles and r8c NDK. Proxy-tested by xsacha for blackberry. The android build requires that the android/android.toolchain.cmake toolchain file is used; an error will be raised if ANDROID is defined without loading the toolchain file. When targeting ANDROID, the resulting .so files will be placed in "android/libs/$ANDROID_ABI" even when building out of tree, since it's where `ant` expects to find them. Since the Core library is expected to be named 'ppsspp_jni' on ANDROID, we also put its name in a variable that is set to 'Core' unless building on ANDROID, where it is 'ppsspp_jni'.
2012-11-18 16:00:27 +00:00
if(ARM)
CMakeLists cleanup. Tabified CMakeLists. Introduced USING_GLES2 and X86 option and exposed USING_GLES2 to C++. Removed some redundancies and messiness.
2012-11-26 02:41:57 +00:00
set(CoreExtra ${CoreExtra}
Update project files for changes in armjit. CMake and Qt.
2013-01-13 10:52:41 +00:00
Core/MIPS/ARM/ArmAsm.cpp
Core/MIPS/ARM/ArmCompALU.cpp
Core/MIPS/ARM/ArmCompBranch.cpp
Core/MIPS/ARM/ArmCompFPU.cpp
Core/MIPS/ARM/ArmCompLoadStore.cpp
Core/MIPS/ARM/ArmCompVFPU.cpp
Some scaffolding for a future VFPU-on-NEON implementation
2013-11-19 15:25:38 +00:00
Core/MIPS/ARM/ArmCompVFPUNEON.cpp
Update CMakeLists.txt
2014-12-06 23:32:14 +00:00
Core/MIPS/ARM/ArmCompVFPUNEONUtil.cpp
Play around with function replacement. Turned off by default of course.
2013-12-17 22:40:27 +00:00
Core/MIPS/ARM/ArmCompReplace.cpp
Update project files for changes in armjit. CMake and Qt.
2013-01-13 10:52:41 +00:00
Core/MIPS/ARM/ArmJit.cpp
Core/MIPS/ARM/ArmJit.h
Core/MIPS/ARM/ArmRegCache.cpp
Core/MIPS/ARM/ArmRegCache.h
ARM buildfix with cmake.
2013-03-03 09:56:12 +00:00
Core/MIPS/ARM/ArmRegCacheFPU.cpp
Core/MIPS/ARM/ArmRegCacheFPU.h
Move vertexdecoder files into GPU/Common
2014-09-10 08:44:22 +00:00
GPU/Common/VertexDecoderArm.cpp
Update project files for changes in armjit. CMake and Qt.
2013-01-13 10:52:41 +00:00
ext/disarm.cpp)
Update CMakeLists for ARM64 (untested)
2015-03-18 16:41:13 +00:00
elseif(ARM64)
set(CoreExtra ${CoreExtra}
Core/MIPS/ARM64/Arm64Asm.cpp
Core/MIPS/ARM64/Arm64CompALU.cpp
Core/MIPS/ARM64/Arm64CompBranch.cpp
Core/MIPS/ARM64/Arm64CompFPU.cpp
Core/MIPS/ARM64/Arm64CompLoadStore.cpp
Core/MIPS/ARM64/Arm64CompVFPU.cpp
Core/MIPS/ARM64/Arm64CompReplace.cpp
Core/MIPS/ARM64/Arm64Jit.cpp
Core/MIPS/ARM64/Arm64Jit.h
Core/MIPS/ARM64/Arm64RegCache.cpp
Core/MIPS/ARM64/Arm64RegCache.h
Core/MIPS/ARM64/Arm64RegCacheFPU.cpp
Core/MIPS/ARM64/Arm64RegCacheFPU.h
GPU/Common/VertexDecoderArm.cpp
Core/Util/DisArm64.cpp)
CMakeLists cleanup. Tabified CMakeLists. Introduced USING_GLES2 and X86 option and exposed USING_GLES2 to C++. Removed some redundancies and messiness.
2012-11-26 02:41:57 +00:00
elseif(X86)
set(CoreExtra ${CoreExtra}
Core/MIPS/x86/Asm.cpp
Core/MIPS/x86/CompALU.cpp
Core/MIPS/x86/CompBranch.cpp
Core/MIPS/x86/CompFPU.cpp
Core/MIPS/x86/CompLoadStore.cpp
Core/MIPS/x86/CompVFPU.cpp
Play around with function replacement. Turned off by default of course.
2013-12-17 22:40:27 +00:00
Core/MIPS/x86/CompReplace.cpp
CMakeLists cleanup. Tabified CMakeLists. Introduced USING_GLES2 and X86 option and exposed USING_GLES2 to C++. Removed some redundancies and messiness.
2012-11-26 02:41:57 +00:00
Core/MIPS/x86/Jit.cpp
Core/MIPS/x86/Jit.h
x86jit: Use a faster safemem fallback. Really helps performance in games that use uncached addresses a lot, without really impacting performance of most games which don't. Of course, fastmem is faster.
2014-05-04 22:59:58 +00:00
Core/MIPS/x86/JitSafeMem.cpp
Core/MIPS/x86/JitSafeMem.h
CMakeLists cleanup. Tabified CMakeLists. Introduced USING_GLES2 and X86 option and exposed USING_GLES2 to C++. Removed some redundancies and messiness.
2012-11-26 02:41:57 +00:00
Core/MIPS/x86/RegCache.cpp
Split out the FPU reg cache into its own file too.
2013-01-25 22:09:11 +00:00
Core/MIPS/x86/RegCache.h
Core/MIPS/x86/RegCacheFPU.cpp
Make the ARM stuff build on clang so we can later get the unit test to work there. also fixes the build.
2013-09-29 17:59:55 +00:00
Core/MIPS/x86/RegCacheFPU.h
Move vertexdecoder files into GPU/Common
2014-09-10 08:44:22 +00:00
GPU/Common/VertexDecoderX86.cpp
Make the ARM stuff build on clang so we can later get the unit test to work there. also fixes the build.
2013-09-29 17:59:55 +00:00
ext/disarm.cpp)
Integrate new MIPS emitter.
2014-11-18 08:35:37 +00:00
elseif(MIPS)
set(CoreExtra ${CoreExtra}
Core/MIPS/MIPS/MipsJit.cpp
Core/MIPS/MIPS/MipsJit.h
GPU/Common/VertexDecoderFake.cpp
ext/disarm.cpp)
Update for CMake.
2014-11-13 13:23:53 +00:00
else()
set(CoreExtra ${CoreExtra}
Core/MIPS/fake/FakeJit.cpp
Core/MIPS/fake/FakeJit.h
GPU/Common/VertexDecoderFake.cpp
ext/disarm.cpp)
CMake-based build system. Tested on Windows with NMake Makefiles and Visual Studio 11 targets. Tested on Linux with GNU Makefiles target, using GCC as the compiler. Tested on FreeBSD using clang as the compiler. Tested for Android on Windows with NMake Makefiles and r8c NDK. Proxy-tested by xsacha for blackberry. The android build requires that the android/android.toolchain.cmake toolchain file is used; an error will be raised if ANDROID is defined without loading the toolchain file. When targeting ANDROID, the resulting .so files will be placed in "android/libs/$ANDROID_ABI" even when building out of tree, since it's where `ant` expects to find them. Since the Core library is expected to be named 'ppsspp_jni' on ANDROID, we also put its name in a variable that is set to 'Core' unless building on ANDROID, where it is 'ppsspp_jni'.
2012-11-18 16:00:27 +00:00
endif()
Fix builds for non-Win32
2016-09-02 00:09:56 +00:00
if (NOT MOBILE_DEVICE)
set(CoreExtra ${CoreExtra}
Core/AVIDump.cpp
Clean up various files
2016-09-03 22:26:01 +00:00
Core/AVIDump.h
Core/WaveFile.cpp
Core/WaveFile.h)
Fix builds for non-Win32
2016-09-02 00:09:56 +00:00
endif()
Add a NEON method to apply the volume.
2015-01-11 21:50:52 +00:00
if(ARMV7)
set(CORE_NEON Core/Util/AudioFormatNEON.cpp Core/Util/AudioFormatNEON.h)
endif()
CMake-based build system. Tested on Windows with NMake Makefiles and Visual Studio 11 targets. Tested on Linux with GNU Makefiles target, using GCC as the compiler. Tested on FreeBSD using clang as the compiler. Tested for Android on Windows with NMake Makefiles and r8c NDK. Proxy-tested by xsacha for blackberry. The android build requires that the android/android.toolchain.cmake toolchain file is used; an error will be raised if ANDROID is defined without loading the toolchain file. When targeting ANDROID, the resulting .so files will be placed in "android/libs/$ANDROID_ABI" even when building out of tree, since it's where `ant` expects to find them. Since the Core library is expected to be named 'ppsspp_jni' on ANDROID, we also put its name in a variable that is set to 'Core' unless building on ANDROID, where it is 'ppsspp_jni'.
2012-11-18 16:00:27 +00:00
# 'ppsspp_jni' on ANDROID, 'Core' everywhere else
# SHARED on ANDROID, STATIC everywhere else
add_library(${CoreLibName} ${CoreLinkType}
CMakeLists cleanup. Tabified CMakeLists. Introduced USING_GLES2 and X86 option and exposed USING_GLES2 to C++. Removed some redundancies and messiness.
2012-11-26 02:41:57 +00:00
${CoreExtra}
Core/Config.cpp
Core/Config.h
Core/Core.cpp
Core/Core.h
Introduce "Compatibility Flags". These should be used very restrictively, see comment in Compatibility.h. Should help #8004, by disabling depth rounding in Fight Night round 3.
2015-09-26 14:01:16 +00:00
Core/Compatibility.cpp
Core/Compatibility.h
CMakeLists cleanup. Tabified CMakeLists. Introduced USING_GLES2 and X86 option and exposed USING_GLES2 to C++. Removed some redundancies and messiness.
2012-11-26 02:41:57 +00:00
Core/CoreParameter.h
Core/CoreTiming.cpp
Core/CoreTiming.h
Buildfix for Linux, fixes #1994.
2013-05-31 05:42:27 +00:00
Core/CwCheat.cpp
Core/CwCheat.h
Add HDRemaster.cpp/.h to Android.mk and CMakeLists.txt.
2013-06-23 04:25:55 +00:00
Core/HDRemaster.cpp
Core/HDRemaster.h
Move ThreadEventQueue to its own file.
2013-08-10 16:08:31 +00:00
Core/ThreadEventQueue.h
CMakeLists cleanup. Tabified CMakeLists. Introduced USING_GLES2 and X86 option and exposed USING_GLES2 to C++. Removed some redundancies and messiness.
2012-11-26 02:41:57 +00:00
Core/Debugger/Breakpoints.cpp
Core/Debugger/Breakpoints.h
Core/Debugger/DebugInterface.h
Core/Debugger/SymbolMap.cpp
Core/Debugger/SymbolMap.h
More include cleanup, hopefully buildfix Symbian
2013-12-29 23:23:04 +00:00
Core/Debugger/DisassemblyManager.cpp
Core/Debugger/DisassemblyManager.h
* Create class for Save and Message dialog for cleaner code. * Update Save dialog to work more like the real one on PSP * Correct some return value for Save Dialog.
2012-12-10 12:08:54 +00:00
Core/Dialog/PSPDialog.cpp
Core/Dialog/PSPDialog.h
fix style again
2013-09-13 23:50:22 +00:00
Core/Dialog/PSPGamedataInstallDialog.cpp
Add GamedataInstallDialog to CMakeLists and Android.mk
2013-09-13 15:19:53 +00:00
Core/Dialog/PSPGamedataInstallDialog.h
* Create class for Save and Message dialog for cleaner code. * Update Save dialog to work more like the real one on PSP * Correct some return value for Save Dialog.
2012-12-10 12:08:54 +00:00
Core/Dialog/PSPMsgDialog.cpp
Core/Dialog/PSPMsgDialog.h
Add new files to cmake and Android.mk
2013-10-13 02:32:56 +00:00
Core/Dialog/PSPNetconfDialog.cpp
Core/Dialog/PSPNetconfDialog.h
Buildfix - osk stuff missing from main CMakeLists.
2012-12-15 23:31:43 +00:00
Core/Dialog/PSPOskDialog.cpp
Core/Dialog/PSPOskDialog.h
* Create class for Save and Message dialog for cleaner code. * Update Save dialog to work more like the real one on PSP * Correct some return value for Save Dialog.
2012-12-10 12:08:54 +00:00
Core/Dialog/PSPPlaceholderDialog.cpp
Core/Dialog/PSPPlaceholderDialog.h
Core/Dialog/PSPSaveDialog.cpp
Core/Dialog/PSPSaveDialog.h
Fixes #5779 with new PSPScreenShotDiag class
2014-04-28 13:54:52 +00:00
Core/Dialog/PSPScreenshotDialog.cpp
Core/Dialog/PSPScreenshotDialog.h
* Create class for Save and Message dialog for cleaner code. * Update Save dialog to work more like the real one on PSP * Correct some return value for Save Dialog.
2012-12-10 12:08:54 +00:00
Core/Dialog/SavedataParam.cpp
Core/Dialog/SavedataParam.h
CMakeLists cleanup. Tabified CMakeLists. Introduced USING_GLES2 and X86 option and exposed USING_GLES2 to C++. Removed some redundancies and messiness.
2012-11-26 02:41:57 +00:00
Core/ELF/ElfReader.cpp
Core/ELF/ElfReader.h
Core/ELF/ElfTypes.h
Load icon and bg from PBP files.
2013-04-08 19:46:41 +00:00
Core/ELF/PBPReader.cpp
Core/ELF/PBPReader.h
CMakeLists cleanup. Tabified CMakeLists. Introduced USING_GLES2 and X86 option and exposed USING_GLES2 to C++. Removed some redundancies and messiness.
2012-11-26 02:41:57 +00:00
Core/ELF/PrxDecrypter.cpp
Core/ELF/PrxDecrypter.h
Parse PARAM.SFO to get the disc ID, show in title bar on Windows
2012-11-30 20:49:59 +00:00
Core/ELF/ParamSFO.cpp
Core/ELF/ParamSFO.h
Buildfix: Symbian, CMake-based compiles.
2013-05-08 18:29:23 +00:00
Core/FileSystems/tlzrc.cpp
CMakeLists cleanup. Tabified CMakeLists. Introduced USING_GLES2 and X86 option and exposed USING_GLES2 to C++. Removed some redundancies and messiness.
2012-11-26 02:41:57 +00:00
Core/FileSystems/BlockDevices.cpp
Core/FileSystems/BlockDevices.h
Core/FileSystems/DirectoryFileSystem.cpp
Core/FileSystems/DirectoryFileSystem.h
Core/FileSystems/FileSystem.h
Start untangling our include mess a little.
2013-12-29 22:28:31 +00:00
Core/FileSystems/FileSystem.cpp
CMakeLists cleanup. Tabified CMakeLists. Introduced USING_GLES2 and X86 option and exposed USING_GLES2 to C++. Removed some redundancies and messiness.
2012-11-26 02:41:57 +00:00
Core/FileSystems/ISOFileSystem.cpp
Core/FileSystems/ISOFileSystem.h
Core/FileSystems/MetaFileSystem.cpp
Core/FileSystems/MetaFileSystem.h
Move VirtualDiscFileSystem to its own file.
2013-07-28 06:46:26 +00:00
Core/FileSystems/VirtualDiscFileSystem.cpp
Core/FileSystems/VirtualDiscFileSystem.h
Oops, need to update these too.
2013-02-28 16:13:01 +00:00
Core/Font/PGF.cpp
Core/Font/PGF.h
CMakeLists cleanup. Tabified CMakeLists. Introduced USING_GLES2 and X86 option and exposed USING_GLES2 to C++. Removed some redundancies and messiness.
2012-11-26 02:41:57 +00:00
Core/HLE/FunctionWrappers.h
Core/HLE/HLE.cpp
Core/HLE/HLE.h
Initial preparations for ability to replace game functions with custom implementations. Also auto-saves hashmap additions and reapplies the hashmap on function rename so that if you rename a function that exists in several copies they will all be labelled. Note that actual function replacement is not activated yet.
2013-11-30 19:57:44 +00:00
Core/HLE/ReplaceTables.cpp
Core/HLE/ReplaceTables.h
Add a class to create helper threads from HLE. This should be usable from sceIo as well.
2014-05-23 06:38:21 +00:00
Core/HLE/HLEHelperThread.cpp
Core/HLE/HLEHelperThread.h
CMakeLists cleanup. Tabified CMakeLists. Introduced USING_GLES2 and X86 option and exposed USING_GLES2 to C++. Removed some redundancies and messiness.
2012-11-26 02:41:57 +00:00
Core/HLE/HLETables.cpp
Core/HLE/HLETables.h
Refactor down the begin/end callback stuff.
2013-09-03 00:59:47 +00:00
Core/HLE/KernelWaitHelpers.h
Build fix for non-windows
2016-08-28 12:55:25 +00:00
Core/HLE/KUBridge.h
Core/HLE/KUBridge.cpp
Move ThreadQueueList to a separate file. Not reused anywhere, but just so it's a little cleaner.
2015-09-12 20:03:15 +00:00
Core/HLE/ThreadQueueList.h
CMakeLists cleanup. Tabified CMakeLists. Introduced USING_GLES2 and X86 option and exposed USING_GLES2 to C++. Removed some redundancies and messiness.
2012-11-26 02:41:57 +00:00
Core/HLE/__sceAudio.cpp
Core/HLE/__sceAudio.h
Implement sceAdler32
2015-02-08 01:35:00 +00:00
Core/HLE/sceAdler.cpp
Core/HLE/sceAdler.h
CMakeLists cleanup. Tabified CMakeLists. Introduced USING_GLES2 and X86 option and exposed USING_GLES2 to C++. Removed some redundancies and messiness.
2012-11-26 02:41:57 +00:00
Core/HLE/sceAtrac.cpp
Core/HLE/sceAtrac.h
Core/HLE/sceAudio.cpp
Buildfix for Linux.
2013-06-09 09:17:17 +00:00
Core/HLE/sceAudiocodec.cpp
Core/HLE/sceAudiocodec.h
Another attempt to fix linux build
2015-03-08 04:50:06 +00:00
Core/HLE/sceAudioRouting.cpp
Core/HLE/sceAudioRouting.h
CMakeLists cleanup. Tabified CMakeLists. Introduced USING_GLES2 and X86 option and exposed USING_GLES2 to C++. Removed some redundancies and messiness.
2012-11-26 02:41:57 +00:00
Core/HLE/sceAudio.h
Add dummy sceCcc Fix loading of Gensou Chronicle
2013-06-30 12:21:56 +00:00
Core/HLE/sceCcc.h
Core/HLE/sceCcc.cpp
Save encryption. Load/Save encrypted/decrypted save RE of Chnnlsv lib Correct size bug in kirk
2013-01-28 23:11:02 +00:00
Core/HLE/sceChnnlsv.cpp
Core/HLE/sceChnnlsv.h
CMakeLists cleanup. Tabified CMakeLists. Introduced USING_GLES2 and X86 option and exposed USING_GLES2 to C++. Removed some redundancies and messiness.
2012-11-26 02:41:57 +00:00
Core/HLE/sceCtrl.cpp
Core/HLE/sceCtrl.h
Buildfix for Android, Linux, iOS. Fixes #1184.
2013-04-05 17:14:12 +00:00
Core/HLE/sceDeflt.cpp
Core/HLE/sceDeflt.h
CMakeLists cleanup. Tabified CMakeLists. Introduced USING_GLES2 and X86 option and exposed USING_GLES2 to C++. Removed some redundancies and messiness.
2012-11-26 02:41:57 +00:00
Core/HLE/sceDisplay.cpp
Core/HLE/sceDisplay.h
Core/HLE/sceDmac.cpp
Core/HLE/sceDmac.h
Add sceG729 module
2015-03-08 05:27:40 +00:00
Core/HLE/sceG729.cpp
Core/HLE/sceG729.h
Non-Windows buildfix
2013-03-19 13:28:26 +00:00
Core/HLE/sceGameUpdate.cpp
Core/HLE/sceGameUpdate.h
CMakeLists cleanup. Tabified CMakeLists. Introduced USING_GLES2 and X86 option and exposed USING_GLES2 to C++. Removed some redundancies and messiness.
2012-11-26 02:41:57 +00:00
Core/HLE/sceGe.cpp
Core/HLE/sceGe.h
Core/HLE/sceFont.cpp
Core/HLE/sceFont.h
Add sceHeap to cmakelists and android.mk
2013-09-04 08:34:00 +00:00
Core/HLE/sceHeap.cpp
Core/HLE/sceHeap.h
CMakeLists cleanup. Tabified CMakeLists. Introduced USING_GLES2 and X86 option and exposed USING_GLES2 to C++. Removed some redundancies and messiness.
2012-11-26 02:41:57 +00:00
Core/HLE/sceHprm.cpp
Core/HLE/sceHprm.h
Core/HLE/sceHttp.cpp
Core/HLE/sceHttp.h
Core/HLE/sceImpose.cpp
Core/HLE/sceImpose.h
Core/HLE/sceIo.cpp
Core/HLE/sceIo.h
Added sceJpeg & sceMd5
2013-05-15 11:49:34 +00:00
Core/HLE/sceJpeg.cpp
Core/HLE/sceJpeg.h
CMakeLists cleanup. Tabified CMakeLists. Introduced USING_GLES2 and X86 option and exposed USING_GLES2 to C++. Removed some redundancies and messiness.
2012-11-26 02:41:57 +00:00
Core/HLE/sceKernel.cpp
Core/HLE/sceKernel.h
Core/HLE/sceKernelAlarm.cpp
Core/HLE/sceKernelAlarm.h
Core/HLE/sceKernelEventFlag.cpp
Core/HLE/sceKernelEventFlag.h
Core/HLE/sceKernelInterrupt.cpp
Core/HLE/sceKernelInterrupt.h
Core/HLE/sceKernelMbx.cpp
Core/HLE/sceKernelMbx.h
Core/HLE/sceKernelMemory.cpp
Core/HLE/sceKernelMemory.h
Core/HLE/sceKernelModule.cpp
Core/HLE/sceKernelModule.h
Core/HLE/sceKernelMsgPipe.cpp
Core/HLE/sceKernelMsgPipe.h
Core/HLE/sceKernelMutex.cpp
Core/HLE/sceKernelMutex.h
Core/HLE/sceKernelSemaphore.cpp
Core/HLE/sceKernelSemaphore.h
Core/HLE/sceKernelThread.cpp
Core/HLE/sceKernelThread.h
Core/HLE/sceKernelTime.cpp
Core/HLE/sceKernelTime.h
Core/HLE/sceKernelVTimer.cpp
Core/HLE/sceKernelVTimer.h
Core/HLE/sceMpeg.cpp
Core/HLE/sceMpeg.h
Core/HLE/sceNet.cpp
Core/HLE/sceNet.h
Split out sceNetAdhoc* into a separate file from sceNet.
2013-09-06 22:55:42 +00:00
Core/HLE/sceNetAdhoc.cpp
Core/HLE/sceNetAdhoc.h
Moves proAdhoc extra functions to a separate file
2013-11-10 01:26:31 +00:00
Core/HLE/proAdhoc.h
Core/HLE/proAdhoc.cpp
build fix for non-windows
2014-08-04 13:15:58 +00:00
Core/HLE/proAdhocServer.h
Core/HLE/proAdhocServer.cpp
More buildfixing...
2012-12-06 18:44:29 +00:00
Core/HLE/sceOpenPSID.cpp
Core/HLE/sceOpenPSID.h
Non-Windows buildfix.
2013-03-15 14:45:00 +00:00
Core/HLE/sceP3da.cpp
Core/HLE/sceP3da.h
Implement sceMt19937()
2014-01-25 04:19:48 +00:00
Core/HLE/sceMt19937.cpp
Core/HLE/sceMt19937.h
Added sceJpeg & sceMd5
2013-05-15 11:49:34 +00:00
Core/HLE/sceMd5.cpp
Core/HLE/sceMd5.h
Add sceMp4 to cmakelists
2013-04-28 00:27:48 +00:00
Core/HLE/sceMp4.cpp
Core/HLE/sceMp4.h
Separate sceMp3 from sceMpeg
2013-05-06 13:09:40 +00:00
Core/HLE/sceMp3.cpp
Core/HLE/sceMp3.h
More buildfixing...
2012-12-06 18:44:29 +00:00
Core/HLE/sceParseHttp.cpp
Core/HLE/sceParseHttp.h
Core/HLE/sceParseUri.cpp
Core/HLE/sceParseUri.h
CMakeLists cleanup. Tabified CMakeLists. Introduced USING_GLES2 and X86 option and exposed USING_GLES2 to C++. Removed some redundancies and messiness.
2012-11-26 02:41:57 +00:00
Core/HLE/scePower.cpp
Core/HLE/scePower.h
Core/HLE/scePsmf.cpp
Core/HLE/scePsmf.h
Core/HLE/sceRtc.cpp
Core/HLE/sceRtc.h
Core/HLE/sceSas.cpp
Core/HLE/sceSas.h
Implement sceSfmt19937 module.
2015-02-15 05:22:20 +00:00
Core/HLE/sceSfmt19937.cpp
Core/HLE/sceSfmt19937.h
add files include in CMakeLists.txt and Android.mk.
2014-12-05 07:24:39 +00:00
Core/HLE/sceSha256.cpp
Core/HLE/sceSha256.h
More buildfixing...
2012-12-06 18:44:29 +00:00
Core/HLE/sceSsl.cpp
Core/HLE/sceSsl.h
CMakeLists cleanup. Tabified CMakeLists. Introduced USING_GLES2 and X86 option and exposed USING_GLES2 to C++. Removed some redundancies and messiness.
2012-11-26 02:41:57 +00:00
Core/HLE/sceUmd.cpp
Core/HLE/sceUmd.h
Create files for sceUsb
2012-12-17 20:45:32 +00:00
Core/HLE/sceUsb.cpp
Core/HLE/sceUsb.h
Add sceUsbGps module
2014-08-12 16:11:26 +00:00
Core/HLE/sceUsbGps.cpp
Core/HLE/sceUsbGps.h
CMakeLists cleanup. Tabified CMakeLists. Introduced USING_GLES2 and X86 option and exposed USING_GLES2 to C++. Removed some redundancies and messiness.
2012-11-26 02:41:57 +00:00
Core/HLE/sceUtility.cpp
Core/HLE/sceUtility.h
More buildfixing...
2012-12-06 18:44:29 +00:00
Core/HLE/sceVaudio.cpp
Core/HLE/sceVaudio.h
DLC encryption
2013-02-24 17:27:37 +00:00
Core/HLE/scePspNpDrm_user.cpp
Core/HLE/scePspNpDrm_user.h
Add new sceNp/scePauth and some stubs for unknown functions on THE IDOLM@STER SP.
2013-04-29 03:40:09 +00:00
Core/HLE/sceNp.cpp
Core/HLE/sceNp.h
Core/HLE/scePauth.cpp
Core/HLE/scePauth.h
Support audio playing (AT3, AT3+, Mp3, AAC)
2014-03-23 18:45:08 +00:00
Core/HW/SimpleAudioDec.cpp
Core/HW/SimpleAudioDec.h
Add a class to manage IO on a separate thread. Also separate the logic for exiting the loop based on coreState. IO and audio won't necessarily be tied to the frame.
2013-08-11 18:40:41 +00:00
Core/HW/AsyncIOManager.cpp
Core/HW/AsyncIOManager.h
Update cmakelists, update pspautotests
2013-01-05 15:23:21 +00:00
Core/HW/MediaEngine.cpp
Core/HW/MediaEngine.h
Buildfixes
2013-06-01 21:37:51 +00:00
Core/HW/MpegDemux.cpp
Core/HW/MpegDemux.h
CMakeLists cleanup. Tabified CMakeLists. Introduced USING_GLES2 and X86 option and exposed USING_GLES2 to C++. Removed some redundancies and messiness.
2012-11-26 02:41:57 +00:00
Core/HW/MemoryStick.cpp
Core/HW/MemoryStick.h
sceSas cleanup
2012-12-16 19:40:49 +00:00
Core/HW/SasAudio.cpp
Core/HW/SasAudio.h
Hook up SasReverb. It sounds more like a buzzsaw than a reverb at the moment, needs debugging. Added a bit of code that only enables it when a reverbed sound is active. This will need to be turned off later but useful right now for hearing when it's used..
2015-10-27 11:34:54 +00:00
Core/HW/SasReverb.cpp
Core/HW/SasReverb.h
Replace outAudioQueue with Dolphin's resampler.
2015-01-11 14:13:43 +00:00
Core/HW/StereoResampler.cpp
Core/HW/StereoResampler.h
CMakeLists cleanup. Tabified CMakeLists. Introduced USING_GLES2 and X86 option and exposed USING_GLES2 to C++. Removed some redundancies and messiness.
2012-11-26 02:41:57 +00:00
Core/Host.cpp
Core/Host.h
Core/Loaders.cpp
Core/Loaders.h
Move file loader code into directories. Not making sense to put these all in the same fiel anymore.
2015-06-27 17:58:44 +00:00
Core/FileLoaders/CachingFileLoader.cpp
Core/FileLoaders/CachingFileLoader.h
Add a file loader to perform disk caching. Had to do some tricks to handle gameinfocache threads properly.
2015-06-28 01:32:21 +00:00
Core/FileLoaders/DiskCachingFileLoader.cpp
Core/FileLoaders/DiskCachingFileLoader.h
Move file loader code into directories. Not making sense to put these all in the same fiel anymore.
2015-06-27 17:58:44 +00:00
Core/FileLoaders/HTTPFileLoader.cpp
Core/FileLoaders/HTTPFileLoader.h
Core/FileLoaders/LocalFileLoader.cpp
Core/FileLoaders/LocalFileLoader.h
Use a background thread to load ISO into RAM. This way we don't get slow startup. This will also cache the CSO data, for example, rather than the raw data, using up less RAM. It might even be reasonable to enable on 32-bit.
2015-12-19 23:23:25 +00:00
Core/FileLoaders/RamCachingFileLoader.cpp
Core/FileLoaders/RamCachingFileLoader.h
Move file loader code into directories. Not making sense to put these all in the same fiel anymore.
2015-06-27 17:58:44 +00:00
Core/FileLoaders/RetryingFileLoader.cpp
Core/FileLoaders/RetryingFileLoader.h
CMakeLists cleanup. Tabified CMakeLists. Introduced USING_GLES2 and X86 option and exposed USING_GLES2 to C++. Removed some redundancies and messiness.
2012-11-26 02:41:57 +00:00
Core/MIPS/JitCommon/JitCommon.cpp
Core/MIPS/JitCommon/JitCommon.h
Combine the two JitCache implementations (x86, ARM) into one.
2013-04-26 21:58:20 +00:00
Core/MIPS/JitCommon/JitBlockCache.cpp
Core/MIPS/JitCommon/JitBlockCache.h
Unify JitOptions across the backends. This is required to make ExtractIR not a member of the various backends.
2015-04-12 18:41:26 +00:00
Core/MIPS/JitCommon/JitState.cpp
Core/MIPS/JitCommon/JitState.h
CMakeLists cleanup. Tabified CMakeLists. Introduced USING_GLES2 and X86 option and exposed USING_GLES2 to C++. Removed some redundancies and messiness.
2012-11-26 02:41:57 +00:00
Core/MIPS/MIPS.cpp
Core/MIPS/MIPS.h
Core/MIPS/MIPSAnalyst.cpp
Core/MIPS/MIPSAnalyst.h
Core/MIPS/MIPSCodeUtils.cpp
Core/MIPS/MIPSCodeUtils.h
Core/MIPS/MIPSDebugInterface.cpp
Core/MIPS/MIPSDebugInterface.h
Core/MIPS/MIPSDis.cpp
Core/MIPS/MIPSDis.h
Core/MIPS/MIPSDisVFPU.cpp
Core/MIPS/MIPSDisVFPU.h
Core/MIPS/MIPSInt.cpp
Core/MIPS/MIPSInt.h
Core/MIPS/MIPSIntVFPU.cpp
Core/MIPS/MIPSIntVFPU.h
Add a function to walk the stack, not yet perfect. Could use improvements, but with a decent symbol table does very well so far in the games I tested it in.
2013-08-12 08:54:14 +00:00
Core/MIPS/MIPSStackWalk.cpp
Core/MIPS/MIPSStackWalk.h
CMakeLists cleanup. Tabified CMakeLists. Introduced USING_GLES2 and X86 option and exposed USING_GLES2 to C++. Removed some redundancies and messiness.
2012-11-26 02:41:57 +00:00
Core/MIPS/MIPSTables.cpp
Core/MIPS/MIPSTables.h
Core/MIPS/MIPSVFPUUtils.cpp
Core/MIPS/MIPSVFPUUtils.h
Added MIPS assembler
2013-07-28 12:50:25 +00:00
Core/MIPS/MIPSAsm.cpp
Core/MIPS/MIPSAsm.h
CMakeLists cleanup. Tabified CMakeLists. Introduced USING_GLES2 and X86 option and exposed USING_GLES2 to C++. Removed some redundancies and messiness.
2012-11-26 02:41:57 +00:00
Core/MemMap.cpp
Core/MemMap.h
Core/MemMapFunctions.cpp
Make Memory::Memcpy() execute memchecks directly. This makes it easier to handle breakpoints in HLE.
2015-04-06 01:03:50 +00:00
Core/MemMapHelpers.h
CMakeLists cleanup. Tabified CMakeLists. Introduced USING_GLES2 and X86 option and exposed USING_GLES2 to C++. Removed some redundancies and messiness.
2012-11-26 02:41:57 +00:00
Core/PSPLoaders.cpp
Core/PSPLoaders.h
Add basic server reporting interface, needs work.
2013-03-01 16:58:05 +00:00
Core/Reporting.cpp
Core/Reporting.h
Add Verify() method to quickly test states work.
2012-12-27 18:34:22 +00:00
Core/SaveState.cpp
Core/SaveState.h
Take screenshots with savestates.
2014-12-21 07:14:46 +00:00
Core/Screenshot.cpp
Core/Screenshot.h
CMakeLists cleanup. Tabified CMakeLists. Introduced USING_GLES2 and X86 option and exposed USING_GLES2 to C++. Removed some redundancies and messiness.
2012-11-26 02:41:57 +00:00
Core/System.cpp
Core/System.h
Move TextureReplacer to Core. Probably makes more sense here after all.
2016-04-30 22:07:56 +00:00
Core/TextureReplacer.cpp
Core/TextureReplacer.h
Add a NEON method to apply the volume.
2015-01-11 21:50:52 +00:00
Core/Util/AudioFormat.cpp
Core/Util/AudioFormat.h
Initial draft of the Homebrew Store. Lets you install a few homebrew.
2013-11-20 13:42:48 +00:00
Core/Util/GameManager.cpp
Core/Util/GameManager.h
CMakeLists cleanup. Tabified CMakeLists. Introduced USING_GLES2 and X86 option and exposed USING_GLES2 to C++. Removed some redundancies and messiness.
2012-11-26 02:41:57 +00:00
Core/Util/BlockAllocator.cpp
Core/Util/BlockAllocator.h
Core/Util/PPGeDraw.cpp
Core/Util/PPGeDraw.h
Core/Util/ppge_atlas.cpp
Core/Util/ppge_atlas.h
Add a NEON method to apply the volume.
2015-01-11 21:50:52 +00:00
${CORE_NEON}
CMakeLists cleanup. Tabified CMakeLists. Introduced USING_GLES2 and X86 option and exposed USING_GLES2 to C++. Removed some redundancies and messiness.
2012-11-26 02:41:57 +00:00
$<TARGET_OBJECTS:GPU>
Add git-version.c generation to CMake.
2013-03-02 19:01:08 +00:00
Globals.h
Actually use the git version. Also switch to cpp, duh.
2013-03-02 20:31:11 +00:00
git-version.cpp)
build fix
2015-02-15 09:08:19 +00:00
target_link_libraries(${CoreLibName} Common native kirk cityhash sfmt19937 xbrz xxhash
CMake: Fix up optimisations (broken for everyone except Apple?), move some Blackberry lines to toolchain, enable assembly, use add_definitions for definitions and *flags for flags, remove redundant lines.
2014-06-11 13:02:56 +00:00
${CoreExtraLibs} ${GLEW_LIBRARIES} ${OPENGL_LIBRARIES} ${X11_LIBRARIES} ${CMAKE_DL_LIBS})
CMake-based build system. Tested on Windows with NMake Makefiles and Visual Studio 11 targets. Tested on Linux with GNU Makefiles target, using GCC as the compiler. Tested on FreeBSD using clang as the compiler. Tested for Android on Windows with NMake Makefiles and r8c NDK. Proxy-tested by xsacha for blackberry. The android build requires that the android/android.toolchain.cmake toolchain file is used; an error will be raised if ANDROID is defined without loading the toolchain file. When targeting ANDROID, the resulting .so files will be placed in "android/libs/$ANDROID_ABI" even when building out of tree, since it's where `ant` expects to find them. Since the Core library is expected to be named 'ppsspp_jni' on ANDROID, we also put its name in a variable that is set to 'Core' unless building on ANDROID, where it is 'ppsspp_jni'.
2012-11-18 16:00:27 +00:00
setup_target_project(${CoreLibName} Core)
Actually use the git version. Also switch to cpp, duh.
2013-03-02 20:31:11 +00:00
# Generate git-version.cpp at build time.
Add git-version.c generation to CMake.
2013-03-02 19:01:08 +00:00
add_custom_target(GitVersion ALL
DEPENDS something_that_never_exists)
add_custom_command(OUTPUT something_that_never_exists
COMMAND ${CMAKE_COMMAND} -DSOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR}
-P ${CMAKE_CURRENT_SOURCE_DIR}/git-version.cmake)
Actually use the git version. Also switch to cpp, duh.
2013-03-02 20:31:11 +00:00
set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/git-version.cpp
Add git-version.c generation to CMake.
2013-03-02 19:01:08 +00:00
PROPERTIES GENERATED TRUE)
add_dependencies(${CoreLibName} GitVersion)
CMake: Cleanup more names.
2014-06-18 06:15:47 +00:00
if(ARMV7)
Use NEON texture decoder on Blackberry and iOS. Use ARMV7 defines.
2013-11-03 05:59:10 +00:00
set(GPU_NEON GPU/Common/TextureDecoderNEON.cpp)
endif()
CMake-based build system. Tested on Windows with NMake Makefiles and Visual Studio 11 targets. Tested on Linux with GNU Makefiles target, using GCC as the compiler. Tested on FreeBSD using clang as the compiler. Tested for Android on Windows with NMake Makefiles and r8c NDK. Proxy-tested by xsacha for blackberry. The android build requires that the android/android.toolchain.cmake toolchain file is used; an error will be raised if ANDROID is defined without loading the toolchain file. When targeting ANDROID, the resulting .so files will be placed in "android/libs/$ANDROID_ABI" even when building out of tree, since it's where `ant` expects to find them. Since the Core library is expected to be named 'ppsspp_jni' on ANDROID, we also put its name in a variable that is set to 'Core' unless building on ANDROID, where it is 'ppsspp_jni'.
2012-11-18 16:00:27 +00:00
add_library(GPU OBJECT
Move depalettize-shader generator to Common
2014-09-17 20:31:18 +00:00
GPU/Common/DepalettizeShaderCommon.cpp
d3d: Actually upload the clut texture.
2014-09-18 06:49:50 +00:00
GPU/Common/DepalettizeShaderCommon.h
d3d: Begin centralizing framebuffer management.
2014-09-09 15:12:42 +00:00
GPU/Common/FramebufferCommon.cpp
GPU/Common/FramebufferCommon.h
Track hovering in GE debugger to show pixel value. This works for texture, framebuffer, depth, and stencil. Importantly, allows debugging the actual depth values present.
2015-08-23 16:25:05 +00:00
GPU/Common/GPUDebugInterface.cpp
Add GPU debugging hooks to Host, not yet in use.
2013-09-22 07:18:46 +00:00
GPU/Common/GPUDebugInterface.h
Centralize the GPU state conversion functions
2015-10-24 21:49:05 +00:00
GPU/Common/GPUStateUtils.cpp
Centralize sampling params and test optimizations.
2015-03-16 02:25:34 +00:00
GPU/Common/GPUStateUtils.h
Move spline generation to SplineCommon, make SplineDX9.cpp identical to Spline.cpp (merge later somehow)
2014-09-13 13:13:34 +00:00
GPU/Common/DrawEngineCommon.cpp
GPU/Common/DrawEngineCommon.h
Use a common ShaderId class. Start moving shader ID code to GPU/Common
2015-10-24 21:24:06 +00:00
GPU/Common/ShaderId.cpp
GPU/Common/ShaderId.h
Move spline generation to SplineCommon, make SplineDX9.cpp identical to Spline.cpp (merge later somehow)
2014-09-13 13:13:34 +00:00
GPU/Common/SplineCommon.cpp
GPU/Common/SplineCommon.h
Move GLES' SoftwareTransform to Common
2014-09-13 11:27:42 +00:00
GPU/Common/SoftwareTransformCommon.cpp
GPU/Common/SoftwareTransformCommon.h
Compile Ced's DX9 GPU on Windows. Not hooked up yet. This needs work, has several problems that must be fixed to run on Windows. Ced, you'll have to fix up your xb project file a bit, sorry.
2013-09-15 10:46:14 +00:00
GPU/Common/VertexDecoderCommon.cpp
Buildfixes for Symbian and iOS/etc.
2013-09-15 15:18:20 +00:00
GPU/Common/VertexDecoderCommon.h
Buildfix non-windows platforms
2014-04-18 13:31:12 +00:00
GPU/Common/TransformCommon.cpp
GPU/Common/TransformCommon.h
Compile Ced's DX9 GPU on Windows. Not hooked up yet. This needs work, has several problems that must be fixed to run on Windows. Ced, you'll have to fix up your xb project file a bit, sorry.
2013-09-15 10:46:14 +00:00
GPU/Common/IndexGenerator.cpp
Buildfixes for Symbian and iOS/etc.
2013-09-15 15:18:20 +00:00
GPU/Common/IndexGenerator.h
Update bufw handling in all gpus. This fixes the softgpu as well, at least.
2013-09-16 04:27:13 +00:00
GPU/Common/TextureDecoder.cpp
GPU/Common/TextureDecoder.h
Move GLES' SoftwareTransform to Common
2014-09-13 11:27:42 +00:00
GPU/Common/TextureCacheCommon.cpp
GPU/Common/TextureCacheCommon.h
Consolidate the texture scaler code.
2015-04-08 18:52:35 +00:00
GPU/Common/TextureScalerCommon.cpp
GPU/Common/TextureScalerCommon.h
Use NEON texture decoder on Blackberry and iOS. Use ARMV7 defines.
2013-11-03 05:59:10 +00:00
${GPU_NEON}
Add generic "PostShader" functionality, replacing FXAA (it's one of them). Replaces #4018, sorry DanyalZia :)
2013-10-12 00:05:55 +00:00
GPU/Common/PostShader.cpp
GPU/Common/PostShader.h
Try to fix scaling of generated UV texcoords on splines.
2013-09-24 12:13:13 +00:00
GPU/Common/SplineCommon.h
Move GE debugger breakpoints out of Windows/ code.
2013-10-12 11:02:21 +00:00
GPU/Debugger/Breakpoints.cpp
GPU/Debugger/Breakpoints.h
Move GPU debug step/pause/messages out of Windows/.
2013-10-12 17:02:21 +00:00
GPU/Debugger/Stepping.cpp
GPU/Debugger/Stepping.h
Update CMake and Android build
2014-03-30 00:11:15 +00:00
GPU/GLES/DepalettizeShader.cpp
GPU/GLES/DepalettizeShader.h
Move fbo.cpp/h from native into PPSSPP
2015-09-06 11:05:18 +00:00
GPU/GLES/FBO.cpp
GPU/GLES/FBO.h
Rename the TransformPipeline files to DrawEngine, and GLES_GPU to GPU_GLES
2016-04-10 08:27:28 +00:00
GPU/GLES/GPU_GLES.cpp
GPU/GLES/GPU_GLES.h
Move native/gfx_es2/gl_state.cpp/h into GPU/GLES/GLStateCache.cpp/h
2015-09-06 11:45:17 +00:00
GPU/GLES/GLStateCache.cpp
GPU/GLES/GLStateCache.h
CMakeLists cleanup. Tabified CMakeLists. Introduced USING_GLES2 and X86 option and exposed USING_GLES2 to C++. Removed some redundancies and messiness.
2012-11-26 02:41:57 +00:00
GPU/GLES/FragmentShaderGenerator.cpp
GPU/GLES/FragmentShaderGenerator.h
Add an experiment with using a texture for tests. Using an option for now so it's easy to test, if it works well we can maybe remove the option.
2014-08-24 22:26:38 +00:00
GPU/GLES/FragmentTestCache.cpp
GPU/GLES/FragmentTestCache.h
CMakeLists cleanup. Tabified CMakeLists. Introduced USING_GLES2 and X86 option and exposed USING_GLES2 to C++. Removed some redundancies and messiness.
2012-11-26 02:41:57 +00:00
GPU/GLES/Framebuffer.cpp
GPU/GLES/Framebuffer.h
GPU/GLES/ShaderManager.cpp
GPU/GLES/ShaderManager.h
GPU/GLES/StateMapping.cpp
GPU/GLES/StateMapping.h
Implement a very basic stencil upload. This is not fast or efficient, but works.
2014-06-01 01:24:35 +00:00
GPU/GLES/StencilBuffer.cpp
CMakeLists cleanup. Tabified CMakeLists. Introduced USING_GLES2 and X86 option and exposed USING_GLES2 to C++. Removed some redundancies and messiness.
2012-11-26 02:41:57 +00:00
GPU/GLES/TextureCache.cpp
GPU/GLES/TextureCache.h
Revert "Merge pull request #7361 from hrydgard/color-conv-centralize" This reverts commit f1b57dabf52f40d7f3ef6a6036279a2d8b473c7d, reversing changes made to 41001637ce7af49cb5fbbd23b81e827eb1a18b3b.
2015-01-22 18:53:32 +00:00
GPU/GLES/TextureScaler.cpp
GPU/GLES/TextureScaler.h
Rename the TransformPipeline files to DrawEngine, and GLES_GPU to GPU_GLES
2016-04-10 08:27:28 +00:00
GPU/GLES/DrawEngineGLES.cpp
GPU/GLES/DrawEngineGLES.h
CMakeLists cleanup. Tabified CMakeLists. Introduced USING_GLES2 and X86 option and exposed USING_GLES2 to C++. Removed some redundancies and messiness.
2012-11-26 02:41:57 +00:00
GPU/GLES/VertexShaderGenerator.cpp
GPU/GLES/VertexShaderGenerator.h
GPU/GPUInterface.h
Don't log display lists, instead dump them on demand. Makes it fairly convenient to dump and look at display lists at run time on non windows platforms. Adding a menu item on Windows should be trivial.
2012-12-26 23:18:45 +00:00
GPU/GeDisasm.cpp
GPU/GeDisasm.h
More GPU cleaning, removing uses of GPUState.h where not needed. Want to get rid of direct accesses to GPUState in modules that may be reused in my future next-gen backends, that will reformat display lists into command lists that will then be optimized and executed, out of sync with the real GPUState. Candidate modules that may be reused in full are Framebuffer and Depal, possibly TextureCache to some degree.
2015-07-26 20:38:40 +00:00
GPU/GPU.cpp
GPU/GPU.h
Move display list management to common GPU class
2012-12-28 20:58:00 +00:00
GPU/GPUCommon.cpp
GPU/GPUCommon.h
CMakeLists cleanup. Tabified CMakeLists. Introduced USING_GLES2 and X86 option and exposed USING_GLES2 to C++. Removed some redundancies and messiness.
2012-11-26 02:41:57 +00:00
GPU/GPUState.cpp
GPU/GPUState.h
GPU/Math3D.cpp
GPU/Math3D.h
GPU/Null/NullGpu.cpp
GPU/Null/NullGpu.h
softgpu: Move clipping code to a separate file.
2013-06-26 17:57:27 +00:00
GPU/Software/Clipper.cpp
GPU/Software/Clipper.h
softgpu: Add support for ambient lighting.
2013-06-28 21:08:15 +00:00
GPU/Software/Lighting.cpp
GPU/Software/Lighting.h
softgpu: Move clipping code to a separate file.
2013-06-26 17:57:27 +00:00
GPU/Software/Rasterizer.cpp
GPU/Software/Rasterizer.h
Copy NullGpu to SoftGpu.
2013-06-24 14:03:25 +00:00
GPU/Software/SoftGpu.cpp
GPU/Software/SoftGpu.h
softgpu: Add transform pipeline functionality.
2013-06-24 18:58:35 +00:00
GPU/Software/TransformUnit.cpp
GPU/Software/TransformUnit.h
CMakeLists cleanup. Tabified CMakeLists. Introduced USING_GLES2 and X86 option and exposed USING_GLES2 to C++. Removed some redundancies and messiness.
2012-11-26 02:41:57 +00:00
GPU/ge_constants.h)
CMake-based build system. Tested on Windows with NMake Makefiles and Visual Studio 11 targets. Tested on Linux with GNU Makefiles target, using GCC as the compiler. Tested on FreeBSD using clang as the compiler. Tested for Android on Windows with NMake Makefiles and r8c NDK. Proxy-tested by xsacha for blackberry. The android build requires that the android/android.toolchain.cmake toolchain file is used; an error will be raised if ANDROID is defined without loading the toolchain file. When targeting ANDROID, the resulting .so files will be placed in "android/libs/$ANDROID_ABI" even when building out of tree, since it's where `ant` expects to find them. Since the Core library is expected to be named 'ppsspp_jni' on ANDROID, we also put its name in a variable that is set to 'Core' unless building on ANDROID, where it is 'ppsspp_jni'.
2012-11-18 16:00:27 +00:00
setup_target_project(GPU GPU)
if(WIN32)
CMakeLists cleanup. Tabified CMakeLists. Introduced USING_GLES2 and X86 option and exposed USING_GLES2 to C++. Removed some redundancies and messiness.
2012-11-26 02:41:57 +00:00
add_executable(PPSSPPWindows WIN32
Windows/Breakpoints.h
Windows/DSoundStream.cpp
Windows/DSoundStream.h
Windows/Debugger/CPURegsInterface.h
Breakpoint window
2013-07-01 22:20:19 +00:00
Windows/Debugger/BreakpointWindow.cpp
Windows/Debugger/BreakpointWindow.h
CMakeLists cleanup. Tabified CMakeLists. Introduced USING_GLES2 and X86 option and exposed USING_GLES2 to C++. Removed some redundancies and messiness.
2012-11-26 02:41:57 +00:00
Windows/Debugger/CtrlDisAsmView.cpp
Windows/Debugger/CtrlDisAsmView.h
Windows/Debugger/CtrlMemView.cpp
Windows/Debugger/CtrlMemView.h
Windows/Debugger/CtrlRegisterList.cpp
Windows/Debugger/CtrlRegisterList.h
Windows/Debugger/Debugger.h
Moved expression parser to native and changed how it's accessed
2013-06-30 23:41:06 +00:00
Windows/Debugger/DebuggerShared.cpp
Add a memory view control to the disassembly window
2013-06-30 11:42:19 +00:00
Windows/Debugger/DebuggerShared.h
CMakeLists cleanup. Tabified CMakeLists. Introduced USING_GLES2 and X86 option and exposed USING_GLES2 to C++. Removed some redundancies and messiness.
2012-11-26 02:41:57 +00:00
Windows/Debugger/Debugger_Disasm.cpp
Windows/Debugger/Debugger_Disasm.h
Windows/Debugger/Debugger_MemoryDlg.cpp
Windows/Debugger/Debugger_MemoryDlg.h
Thread list in disassembly window
2013-07-02 21:21:20 +00:00
Windows/Debugger/Debugger_Lists.cpp
Windows/Debugger/Debugger_Lists.h
CMakeLists cleanup. Tabified CMakeLists. Introduced USING_GLES2 and X86 option and exposed USING_GLES2 to C++. Removed some redundancies and messiness.
2012-11-26 02:41:57 +00:00
Windows/Debugger/Debugger_Misc.cpp
Windows/Debugger/Debugger_Misc.h
# Windows/Debugger/Debugger_Profiler.cpp
# Windows/Debugger/Debugger_Profiler.h
Windows/Debugger/Debugger_SymbolMap.h
Windows/Debugger/Debugger_VFPUDlg.cpp
Windows/Debugger/Debugger_VFPUDlg.h
Windows/Debugger/SimpleELF.h
# Windows/DlgDynaView.cpp
# Windows/DlgDynaView.h
Windows/EmuThread.cpp
Windows/EmuThread.h
Windows/Globals.cpp
Windows/InputBox.cpp
Windows/InputBox.h
Windows/InputDevice.cpp
Windows/InputDevice.h
Windows/KeyboardDevice.cpp
Windows/KeyboardDevice.h
Windows/MIPSCompALU.h
Windows/MIPSCompBranch.h
Windows/OpenGLBase.cpp
Windows/OpenGLBase.h
Windows/W32Util/DialogManager.cpp
Windows/W32Util/DialogManager.h
Windows/W32Util/Misc.cpp
Windows/W32Util/Misc.h
Windows/W32Util/PropertySheet.cpp
Windows/W32Util/PropertySheet.h
Windows/W32Util/ShellUtil.cpp
Windows/W32Util/ShellUtil.h
Windows/W32Util/XPTheme.h
Windows/WindowsFileSystem.h
Windows/WindowsHost.cpp
Windows/WindowsHost.h
Windows/WndMainWindow.cpp
Windows/WndMainWindow.h
Windows/XPTheme.h
Windows/XinputDevice.cpp
Windows/XinputDevice.h
Windows/main.cpp
Windows/main.h
Windows/ppsspp.rc
Windows/resource.h
Windows/stdafx.cpp
Windows/stdafx.h)
target_link_libraries(PPSSPPWindows ${CoreLibName}
kernel32 user32 gdi32 shell32 comctl32 dsound xinput)
setup_target_project(PPSSPPWindows Windows)
CMake-based build system. Tested on Windows with NMake Makefiles and Visual Studio 11 targets. Tested on Linux with GNU Makefiles target, using GCC as the compiler. Tested on FreeBSD using clang as the compiler. Tested for Android on Windows with NMake Makefiles and r8c NDK. Proxy-tested by xsacha for blackberry. The android build requires that the android/android.toolchain.cmake toolchain file is used; an error will be raised if ANDROID is defined without loading the toolchain file. When targeting ANDROID, the resulting .so files will be placed in "android/libs/$ANDROID_ABI" even when building out of tree, since it's where `ant` expects to find them. Since the Core library is expected to be named 'ppsspp_jni' on ANDROID, we also put its name in a variable that is set to 'Core' unless building on ANDROID, where it is 'ppsspp_jni'.
2012-11-18 16:00:27 +00:00
endif()
Unified assets/ dir for icons/images
2012-12-16 15:47:39 +00:00
set(NativeAssets
Blackberry 10 Port * Replace SDL with asound backend (removes the only dependency) * Remove all references to SDL in bar-descriptor.xml, blackberry_build.sh * Greatly simplify blackberry_build.sh * Modify CMakeLists.txt to account for removal of SDL * Remove redundancy in CMakeLists.txt (EGLv2) * Refactor nativeExtra's and setting targets * Remove android/CMakeLists.txt (unrelated file) * Update for latest Blackberry NDK (1088) * Handle bug with VSync in latest NDK * Update bar-descriptor.xml to version 0.4 * Fix define on iOS in FragmentShaderGenerator.cpp * Specify NDK used in Credits by target platform, add contributor, remove redundancy
2012-12-02 04:48:00 +00:00
android/assets/ui_atlas.zim
Install langregion and shaders for iOS and other CMake builds.
2013-10-17 16:09:44 +00:00
assets/shaders
assets/ppge_atlas.zim
Add compat.ini as a dependency to our various build systems
2015-09-27 09:50:23 +00:00
assets/compat.ini
Improvements to CMake install.
2013-12-07 04:26:39 +00:00
assets/langregion.ini
Added installation of the SDL game controller database to CMakeLists.txt
2016-09-20 21:04:01 +00:00
assets/gamecontrollerdb.txt
Improvements to CMake install.
2013-12-07 04:26:39 +00:00
assets/unknown.png)
Blackberry 10 Port * Replace SDL with asound backend (removes the only dependency) * Remove all references to SDL in bar-descriptor.xml, blackberry_build.sh * Greatly simplify blackberry_build.sh * Modify CMakeLists.txt to account for removal of SDL * Remove redundancy in CMakeLists.txt (EGLv2) * Refactor nativeExtra's and setting targets * Remove android/CMakeLists.txt (unrelated file) * Update for latest Blackberry NDK (1088) * Handle bug with VSync in latest NDK * Update bar-descriptor.xml to version 0.4 * Fix define on iOS in FragmentShaderGenerator.cpp * Specify NDK used in Credits by target platform, add contributor, remove redundancy
2012-12-02 04:48:00 +00:00
set(LinkCommon ${CoreLibName} ${CMAKE_THREAD_LIBS_INIT} ${nativeExtraLibs})
Reorder things in CMakeLists.txt, preventing the ZLIB include path from somehow mystically screwing up FFMPEG on Mac.
2013-12-06 10:33:51 +00:00
Fix cmake headless build.
2013-10-20 00:35:46 +00:00
if(HEADLESS)
add_executable(PPSSPPHeadless
headless/Headless.cpp
headless/StubHost.h
headless/Compare.cpp
headless/Compare.h)
target_link_libraries(PPSSPPHeadless
${COCOA_LIBRARY} ${LinkCommon})
setup_target_project(PPSSPPHeadless headless)
endif()
Make the unittest build using CMake
2014-01-09 11:09:07 +00:00
if(UNITTEST)
add_executable(unitTest
unittest/UnitTest.cpp
Make the unittests build on mac
2015-04-03 21:50:51 +00:00
unittest/TestArmEmitter.cpp
unittest/TestArm64Emitter.cpp
unittest/TestX64Emitter.cpp
Initial structure for vertexjit tests.
2015-07-03 22:25:40 +00:00
unittest/TestVertexJit.cpp
Make the unittests build on mac
2015-04-03 21:50:51 +00:00
unittest/JitHarness.cpp
Core/MIPS/ARM/ArmRegCache.cpp
Core/MIPS/ARM/ArmRegCacheFPU.cpp
Make the unittest build using CMake
2014-01-09 11:09:07 +00:00
)
target_link_libraries(unitTest
Make the unittests build on mac
2015-04-03 21:50:51 +00:00
${COCOA_LIBRARY} ${LinkCommon} Common)
Make the unittest build using CMake
2014-01-09 11:09:07 +00:00
setup_target_project(unitTest unittest)
endif()
Blackberry 10 Port * Replace SDL with asound backend (removes the only dependency) * Remove all references to SDL in bar-descriptor.xml, blackberry_build.sh * Greatly simplify blackberry_build.sh * Modify CMakeLists.txt to account for removal of SDL * Remove redundancy in CMakeLists.txt (EGLv2) * Refactor nativeExtra's and setting targets * Remove android/CMakeLists.txt (unrelated file) * Update for latest Blackberry NDK (1088) * Handle bug with VSync in latest NDK * Update bar-descriptor.xml to version 0.4 * Fix define on iOS in FragmentShaderGenerator.cpp * Specify NDK used in Credits by target platform, add contributor, remove redundancy
2012-12-02 04:48:00 +00:00
if (TargetBin)
OSX bundle file generation with cmake.
2014-07-23 05:54:46 +00:00
if (IOS OR APPLE)
Do not copy ICNS assets (iOS uses PNGs) or generate a MacOS folder when building for iOS
2015-05-27 07:37:49 +00:00
if (APPLE AND NOT IOS)
Update OS X iconset. The iconset has been updated to include retina versions at all resolutions and has been rasterized from the svg icons available in the assets/unix-icons directory. icon-512.svg was used for all resolutions except 16x16 and 16x16@2x, which were sourced from icon-16.svg
2015-02-02 08:17:03 +00:00
set(ICON_PATH_ABS ${CMAKE_CURRENT_SOURCE_DIR}/assets/ppsspp.icns)
set( MACOSX_BUNDLE_ICON_FILE ppsspp.icns )
OSX bundle file generation with cmake.
2014-07-23 05:54:46 +00:00
set_source_files_properties(${ICON_PATH_ABS} PROPERTIES MACOSX_PACKAGE_LOCATION "Resources")
Do not copy ICNS assets (iOS uses PNGs) or generate a MacOS folder when building for iOS
2015-05-27 07:37:49 +00:00
endif()
OSX assets copy to bundle with cmake. Not a native solution, prone to errors.
2014-07-23 06:12:18 +00:00
# TODO: there must a native way to copy these.
# Now this is very prone to errors when changes occur.
Do not copy ICNS assets (iOS uses PNGs) or generate a MacOS folder when building for iOS
2015-05-27 07:37:49 +00:00
# Also better to have assets under Resources dir for OS X.
OSX assets copy to bundle with cmake. Not a native solution, prone to errors.
2014-07-23 06:12:18 +00:00
file(GLOB_RECURSE FLASH0_FILES flash0/*)
file(GLOB_RECURSE LANG_FILES lang/*)
file(GLOB_RECURSE SHADER_FILES assets/shaders/*)
Do not copy ICNS assets (iOS uses PNGs) or generate a MacOS folder when building for iOS
2015-05-27 07:37:49 +00:00
if (APPLE AND NOT IOS)
OSX assets copy to bundle with cmake. Not a native solution, prone to errors.
2014-07-23 06:12:18 +00:00
set_source_files_properties(${NativeAssets} PROPERTIES MACOSX_PACKAGE_LOCATION "MacOS/assets")
set_source_files_properties(${FLASH0_FILES} PROPERTIES MACOSX_PACKAGE_LOCATION "MacOS/assets/flash0/font")
set_source_files_properties(${LANG_FILES} PROPERTIES MACOSX_PACKAGE_LOCATION "MacOS/assets/lang")
set_source_files_properties(${SHADER_FILES} PROPERTIES MACOSX_PACKAGE_LOCATION "MacOS/assets/shaders")
Do not copy ICNS assets (iOS uses PNGs) or generate a MacOS folder when building for iOS
2015-05-27 07:37:49 +00:00
endif()
Update OS X iconset. The iconset has been updated to include retina versions at all resolutions and has been rasterized from the svg icons available in the assets/unix-icons directory. icon-512.svg was used for all resolutions except 16x16 and 16x16@2x, which were sourced from icon-16.svg
2015-02-02 08:17:03 +00:00
Revert "iOS: install LaunchScreen.xib" This reverts commit 39716c68b3da13de88fe4b7c5ba068d70c84c9a8.
2014-10-08 20:00:01 +00:00
add_executable(${TargetBin} MACOSX_BUNDLE ${ICON_PATH_ABS} ${NativeAssets} ${SHADER_FILES} ${FLASH0_FILES} ${LANG_FILES} ${NativeAppSource})
Fix for iOS CMake Update toolchain file to reflect that we want to use clang (rock88 is using clang). Set target in the CMake. Fix for packaging and signing (thanks rock88). Update linking to include audio and GLKit (thanks rock88). Update README
2013-02-24 03:23:04 +00:00
else()
add_executable(${TargetBin} ${NativeAppSource})
endif()
Make the unittests build on mac
2015-04-03 21:50:51 +00:00
target_link_libraries(${TargetBin} ${LinkCommon} Common)
CMake-based build system. Tested on Windows with NMake Makefiles and Visual Studio 11 targets. Tested on Linux with GNU Makefiles target, using GCC as the compiler. Tested on FreeBSD using clang as the compiler. Tested for Android on Windows with NMake Makefiles and r8c NDK. Proxy-tested by xsacha for blackberry. The android build requires that the android/android.toolchain.cmake toolchain file is used; an error will be raised if ANDROID is defined without loading the toolchain file. When targeting ANDROID, the resulting .so files will be placed in "android/libs/$ANDROID_ABI" even when building out of tree, since it's where `ant` expects to find them. Since the Core library is expected to be named 'ppsspp_jni' on ANDROID, we also put its name in a variable that is set to 'Core' unless building on ANDROID, where it is 'ppsspp_jni'.
2012-11-18 16:00:27 +00:00
endif()
Fix for iOS CMake Update toolchain file to reflect that we want to use clang (rock88 is using clang). Set target in the CMake. Fix for packaging and signing (thanks rock88). Update linking to include audio and GLKit (thanks rock88). Update README
2013-02-24 03:23:04 +00:00
# installs
Unified assets/ dir for icons/images
2012-12-16 15:47:39 +00:00
file(INSTALL ${NativeAssets} DESTINATION assets)
Improvements to CMake install.
2013-12-07 04:26:39 +00:00
file(INSTALL flash0 lang DESTINATION assets)
Blackberry 10 Port * Replace SDL with asound backend (removes the only dependency) * Remove all references to SDL in bar-descriptor.xml, blackberry_build.sh * Greatly simplify blackberry_build.sh * Modify CMakeLists.txt to account for removal of SDL * Remove redundancy in CMakeLists.txt (EGLv2) * Refactor nativeExtra's and setting targets * Remove android/CMakeLists.txt (unrelated file) * Update for latest Blackberry NDK (1088) * Handle bug with VSync in latest NDK * Update bar-descriptor.xml to version 0.4 * Fix define on iOS in FragmentShaderGenerator.cpp * Specify NDK used in Credits by target platform, add contributor, remove redundancy
2012-12-02 04:48:00 +00:00
Apple: Had to add this to build on Mavericks, for some reason.
2013-10-31 10:54:59 +00:00
if(APPLE AND NOT IOS)
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -F /Library/Frameworks")
endif()
Use -O3 for Mac/iOS release builds.
2013-03-24 06:18:00 +00:00
# packaging and code signing
if(IOS)
iOS: Force Xcode to relink on every build. Apparently Xcode doesn't know how to detect changes in static libraries. So, we just delete the binary to force it to relink it.
2013-03-16 08:04:38 +00:00
add_dependencies(PPSSPP ${CoreLibName} GPU Common native)
iOS: Package as Universal, include icon.
2013-03-15 08:29:33 +00:00
file(GLOB IOSAssets ios/assets/*.png)
Update CMakeLists.txt Buildfix for Xcode 7(adding iconv library) In IOS 9, the Default-568h.png file must be located in root app directory.
2015-10-08 04:43:33 +00:00
list(REMOVE_ITEM IOSAssets ${CMAKE_CURRENT_SOURCE_DIR}/ios/assets/Default-568h@2x.png)
list(REMOVE_ITEM IOSAssets ${CMAKE_CURRENT_SOURCE_DIR}/ios/assets/Default-568h@3x.png)
iOS: Fix breakpoints, simplify running unit tests.
2013-03-16 06:50:31 +00:00
file(INSTALL ${IOSAssets} DESTINATION assets)
Update CMakeLists.txt Buildfix for Xcode 7(adding iconv library) In IOS 9, the Default-568h.png file must be located in root app directory.
2015-10-08 04:43:33 +00:00
file(GLOB IOSAssets ios/assets/Default-568h@*.png)
file(INSTALL ${IOSAssets} DESTINATION .)
iOS: Fix breakpoints, simplify running unit tests.
2013-03-16 06:50:31 +00:00
if (IOS_DEBUG)
file(INSTALL pspautotests DESTINATION assets)
endif()
Fix for iOS CMake Update toolchain file to reflect that we want to use clang (rock88 is using clang). Set target in the CMake. Fix for packaging and signing (thanks rock88). Update linking to include audio and GLKit (thanks rock88). Update README
2013-02-24 03:23:04 +00:00
set(RSRC_XIB_FILES assets/Icon@2x.png)
iOS: Fix breakpoints, simplify running unit tests.
2013-03-16 06:50:31 +00:00
set_source_files_properties(${RSRC_XIB_FILES}
PROPERTIES MACOSX_PACKAGE_LOCATION Resources
)
Fix for iOS CMake Update toolchain file to reflect that we want to use clang (rock88 is using clang). Set target in the CMake. Fix for packaging and signing (thanks rock88). Update linking to include audio and GLKit (thanks rock88). Update README
2013-02-24 03:23:04 +00:00
set(APP_DIR_NAME \${TARGET_BUILD_DIR}/\${FULL_PRODUCT_NAME})
add_custom_command(TARGET PPSSPP POST_BUILD
Update CMakeLists.txt Buildfix for Xcode 7(adding iconv library) In IOS 9, the Default-568h.png file must be located in root app directory.
2015-10-08 04:43:33 +00:00
COMMAND tar -c -C . --exclude .DS_Store --exclude .git -H gnu assets *.png | tar -x -C '${APP_DIR_NAME}'
Fix for iOS CMake Update toolchain file to reflect that we want to use clang (rock88 is using clang). Set target in the CMake. Fix for packaging and signing (thanks rock88). Update linking to include audio and GLKit (thanks rock88). Update README
2013-02-24 03:23:04 +00:00
)
iOS: Force Xcode to relink on every build. Apparently Xcode doesn't know how to detect changes in static libraries. So, we just delete the binary to force it to relink it.
2013-03-16 08:04:38 +00:00
# Force Xcode to relink the binary.
add_custom_command(TARGET Core PRE_BUILD
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
COMMAND rm -f PPSSPP.build/{Debug,Release,MinSizeRel,RelWithDebInfo}-iphoneos/PPSSPP.build/Objects-normal/*/PPSSPP {Debug,Release,MinSizeRel,RelWithDebInfo}-iphoneos/PPSSPP.app/PPSSPP
)
iOS: Package as Universal, include icon.
2013-03-15 08:29:33 +00:00
set_target_properties(${TargetBin} PROPERTIES
MACOSX_BUNDLE_INFO_PLIST "../ios/PPSSPP-Info.plist"
XCODE_ATTRIBUTE_TARGETED_DEVICE_FAMILY "iPhone/iPad"
iOS: Enable ARC for PPSSPP target & for few files in native lib
2014-05-17 05:53:40 +00:00
XCODE_ATTRIBUTE_CLANG_ENABLE_OBJC_ARC YES
ENABLE_BITCODE should not be prefixed with CLANG_
2015-09-17 21:03:11 +00:00
XCODE_ATTRIBUTE_ENABLE_BITCODE NO
Override JIT setting in ppsspp.ini for JIT-incapable environments, fakesign PPSSPP binary via adhoc signing in order to prevent crash-at-launch on iOS 9, separate jailbreak detection logic from JIT support logic, temporary change to only enable JIT on iOS 8 and below.
2015-11-03 17:34:33 +00:00
XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY "-"
iOS: Package as Universal, include icon.
2013-03-15 08:29:33 +00:00
)
iOS Objective-C code dump. ViewController courtesy of rock88. Made modifications for simplification and code-style. Still missing some files (eg. images). Also, CMake is not set up correctly yet.
2013-02-17 14:04:44 +00:00
endif()
CMake-based build system. Tested on Windows with NMake Makefiles and Visual Studio 11 targets. Tested on Linux with GNU Makefiles target, using GCC as the compiler. Tested on FreeBSD using clang as the compiler. Tested for Android on Windows with NMake Makefiles and r8c NDK. Proxy-tested by xsacha for blackberry. The android build requires that the android/android.toolchain.cmake toolchain file is used; an error will be raised if ANDROID is defined without loading the toolchain file. When targeting ANDROID, the resulting .so files will be placed in "android/libs/$ANDROID_ABI" even when building out of tree, since it's where `ant` expects to find them. Since the Core library is expected to be named 'ppsspp_jni' on ANDROID, we also put its name in a variable that is set to 'Core' unless building on ANDROID, where it is 'ppsspp_jni'.
2012-11-18 16:00:27 +00:00
#include(CPack)
Reference in New Issue Copy Permalink