libretro/ppsspp
1
0
Fork 0
mirror of https://github.com/libretro/ppsspp.git synced 2024-11-24 00:29:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
7d6377295a
ppsspp/CMakeLists.txt

1541 lines
44 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)
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)
CMake: Cleanup more names.
2014-06-18 06:15:47 +00:00
# Detect CPU from CMAKE configuration. Toolchains should set this up
CMake: Detect ARM from processor setting.
2014-06-18 00:53:09 +00:00
if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "^arm")
set(ARM ON)
endif()
CMake: Cleanup more names.
2014-06-18 06:15:47 +00:00
if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "^armv7")
set(ARMV7 ON)
Maemo5 support
2013-03-22 07:15:00 +00:00
endif()
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)
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
set(MOBILE_DEVICE ON)
CMake: Cleanup more names.
2014-06-18 06:15:47 +00:00
endif()
if (NOT ARM) # Assume x86
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(X86 ON)
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: Add RPI method. Fixes #1695 Qt: Add bitness define. Fixes #6306
2014-06-17 16:48:10 +00:00
include(CheckIncludeFile)
check_include_file(/opt/vc/include/bcm_host.h RPI)
if(RPI)
set(MOBILE_DEVICE OFF)
endif()
CMake: Make the code more platform-agnostic and cleaner.
2014-05-30 15:22:11 +00:00
if(USING_EGL)
# Default to GLES2 but could be GL.
set(USING_GLES2 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)
Mac buildfix
2014-04-13 15:14:45 +00:00
if(CMAKE_SIZEOF_VOID_P EQUAL 8)
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})
# :: 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})
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})
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()
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()
CMake: Add RPI method. Fixes #1695 Qt: Add bitness define. Fixes #6306
2014-06-17 16:48:10 +00:00
if(RPI)
include_directories(/opt/vc/include /opt/vc/include/interface/vcos/pthreads)
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)
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
include(FindSDL)
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()
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}")
elseif(MIPS)
message("Building for MIPS in x86 mode, ${CMAKE_BUILD_TYPE}")
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)
Build fix for iOS. Now compiles.
2013-02-24 12:17:52 +00:00
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libstdc++")
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)
Some Mac build fixes from vit9696 and some more. Update submodules.
2013-05-06 22:08:57 +00:00
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++ -U__STRICT_ANSI__")
Added -mmacosx-version-min=10.7 to generate binaries executable by OS X 10.7 Lion. See comment for additional information.
2013-03-23 01:58:31 +00:00
# Karen/angelXwind: --macosx-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()
add_definitions(-D_XOPEN_SOURCE=600 -D_XOPEN_SOURCE_EXTENDED -D__BSD_VISIBLE=1)
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}
Merge remote-tracking branch 'origin' into armjit Conflicts: CMakeLists.txt
2012-12-09 02:54:58 +00:00
Common/ArmCPUDetect.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
Common/ArmEmitter.h
Common/ArmEmitter.cpp
Rename ThunkARM.cpp->ArmThunk.cpp
2013-01-07 12:11:33 +00:00
Common/ArmThunk.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)
Mac buildfix
2014-08-23 12:24:24 +00:00
# ARMEmitter is here for the unit tests and don't really hurt otherwise.
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/ABI.cpp
Common/ABI.h
Mac buildfix
2014-08-23 12:24:24 +00:00
Common/ArmEmitter.h
Common/ArmEmitter.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
Common/CPUDetect.cpp
Common/CPUDetect.h
Common/Thunk.cpp
Common/Thunk.h
Common/x64Analyzer.cpp
Common/x64Analyzer.h
Common/x64Emitter.cpp
Common/x64Emitter.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()
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}
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
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
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_definitions(-DGLEW_STATIC)
add_library(glew STATIC
native/ext/glew/GL/glew.h
native/ext/glew/GL/glxew.h
native/ext/glew/GL/wglew.h
native/ext/glew/glew.c)
target_link_libraries(glew ${OPENGL_LIBRARIES})
include_directories(native/ext/glew)
set(GLEW_LIBRARIES glew)
endif()
Use snappy to compress savestates. This is a bit of a hackjob sorry, will clean after 0.5.
2013-01-02 21:10:41 +00:00
add_library(snappy STATIC
ext/snappy/snappy-c.cpp
ext/snappy/snappy-internal.h
ext/snappy/snappy-sinksource.h
ext/snappy/snappy-stubs-internal.h
ext/snappy/snappy-stubs-public.h
ext/snappy/snappy.cpp
ext/snappy/snappy.h
)
include_directories(ext/snappy)
Buildfix cmake
2013-11-26 17:18:30 +00:00
add_library(vjson STATIC
native/ext/vjson/json.cpp
native/ext/vjson/json.h
native/ext/vjson/block_allocator.cpp
native/ext/vjson/block_allocator.h
)
CMakelist update
2013-03-29 23:10:18 +00:00
add_library(rg_etc1 STATIC
Build fix for CMake/Qt: etcpack -> rg_etc
2013-03-29 15:16:40 +00:00
native/ext/rg_etc1/rg_etc1.cpp
native/ext/rg_etc1/rg_etc1.h)
include_directories(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
add_library(stb_vorbis 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
native/ext/stb_vorbis/stb_vorbis.c
native/ext/stb_vorbis/stb_vorbis.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(native/ext/stb_vorbis)
Another attempt at reordering stuff in the CMakeLists.txt. So fragile.
2013-12-06 11:08:19 +00:00
if(USE_FFMPEG AND NOT DEFINED FFMPEG_BUILDDIR)
Android: Fixes for CMake and Qt.
2014-06-27 16:49:50 +00:00
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)
Another attempt at reordering stuff in the CMakeLists.txt. So fragile.
2013-12-06 11:08:19 +00:00
set(PLATFORM_ARCH "blackberry/armv7")
elseif(IOS)
set(PLATFORM_ARCH "ios/universal")
elseif(MACOSX)
set(PLATFORM_ARCH "macosx/x86_64")
elseif(LINUX)
if(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)
endif(USE_FFMPEG AND NOT DEFINED FFMPEG_BUILDDIR)
if(USE_FFMPEG)
# Using shared libraries
if(DEFINED FFMPEG_BUILDDIR)
include_directories(ffmpeg ${FFMPEG_BUILDDIR})
add_library(libavformat STATIC IMPORTED)
set_target_properties(libavformat PROPERTIES IMPORTED_LOCATION ${FFMPEG_BUILDDIR}/libavformat/libavformat.a)
add_library(libavcodec STATIC IMPORTED)
set_target_properties(libavcodec PROPERTIES IMPORTED_LOCATION ${FFMPEG_BUILDDIR}/libavcodec/libavcodec.a)
add_library(libavutil STATIC IMPORTED)
set_target_properties(libavutil PROPERTIES IMPORTED_LOCATION ${FFMPEG_BUILDDIR}/libavutil/libavutil.a)
add_library(libswresample STATIC IMPORTED)
set_target_properties(libswresample PROPERTIES IMPORTED_LOCATION ${FFMPEG_BUILDDIR}/libswresample/libswresample.a)
add_library(libswscale STATIC IMPORTED)
set_target_properties(libswscale PROPERTIES IMPORTED_LOCATION ${FFMPEG_BUILDDIR}/libswscale/libswscale.a)
SET (FFMPEG_LIBRARIES
libavformat
libavcodec
libavutil
libswresample
libswscale
)
endif()
CMake: Cleanup more names.
2014-06-18 06:15:47 +00:00
if(APPLE OR BLACKBERRY)
Another attempt at reordering stuff in the CMakeLists.txt. So fragile.
2013-12-06 11:08:19 +00:00
set(FFMPEG_LIBRARIES ${FFMPEG_LIBRARIES} iconv)
endif()
if(APPLE)
set(FFMPEG_LIBRARIES ${FFMPEG_LIBRARIES} bz2 "-framework CoreVideo")
if (NOT IOS)
set(FFMPEG_LIBRARIES ${FFMPEG_LIBRARIES} "-framework VideoDecodeAcceleration")
endif()
endif(APPLE)
set(LinkCommon ${LinkCommon} ${FFMPEG_LIBRARIES})
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)
target_link_libraries(Common ${FFMPEG_LIBRARIES})
message(STATUS "FFMPEG library locations:")
if(DEFINED PLATFORM_ARCH)
set(TEMP ${CMAKE_SOURCE_DIR}/ffmpeg/${PLATFORM_ARCH}/lib)
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")
else()
get_target_property(TEMP libavcodec IMPORTED_LOCATION)
message(STATUS "libavcodec location: ${TEMP}")
get_target_property(TEMP libavformat IMPORTED_LOCATION)
message(STATUS "libavformat location: ${TEMP}")
get_target_property(TEMP libavutil IMPORTED_LOCATION)
message(STATUS "libavutil location: ${TEMP}")
get_target_property(TEMP libswresample IMPORTED_LOCATION)
message(STATUS "libswresample location: ${TEMP}")
get_target_property(TEMP libswscale IMPORTED_LOCATION)
message(STATUS "libswscale location: ${TEMP}")
endif(DEFINED PLATFORM_ARCH)
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})
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/ext/cityhash/city.cpp
native/ext/cityhash/city.h
native/ext/cityhash/citycrc.h
)
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.
set_target_properties(snappy PROPERTIES COMPILE_FLAGS "-O3")
set_target_properties(cityhash PROPERTIES COMPILE_FLAGS "-O3")
if(NOT ZLIB_FOUND)
set_target_properties(zlib PROPERTIES COMPILE_FLAGS "-O3")
endif()
endif()
Symbian buildfix.
2013-12-05 14:18:26 +00:00
add_library(libzip STATIC
native/ext/libzip/zip.h
native/ext/libzip/mkstemp.c
native/ext/libzip/zip_add.c
native/ext/libzip/zip_add_dir.c
native/ext/libzip/zip_close.c
native/ext/libzip/zip_delete.c
native/ext/libzip/zip_dirent.c
native/ext/libzip/zip_entry_free.c
native/ext/libzip/zip_entry_new.c
native/ext/libzip/zip_err_str.c
native/ext/libzip/zip_error.c
native/ext/libzip/zip_error_clear.c
native/ext/libzip/zip_error_get.c
native/ext/libzip/zip_error_get_sys_type.c
native/ext/libzip/zip_error_strerror.c
native/ext/libzip/zip_error_to_str.c
native/ext/libzip/zip_fclose.c
native/ext/libzip/zip_file_error_clear.c
native/ext/libzip/zip_file_error_get.c
native/ext/libzip/zip_file_get_offset.c
native/ext/libzip/zip_file_strerror.c
native/ext/libzip/zip_filerange_crc.c
native/ext/libzip/zip_fopen.c
native/ext/libzip/zip_fopen_index.c
native/ext/libzip/zip_fread.c
native/ext/libzip/zip_free.c
native/ext/libzip/zip_get_archive_comment.c
native/ext/libzip/zip_get_archive_flag.c
native/ext/libzip/zip_get_file_comment.c
native/ext/libzip/zip_get_name.c
native/ext/libzip/zip_get_num_files.c
native/ext/libzip/zip_memdup.c
native/ext/libzip/zip_name_locate.c
native/ext/libzip/zip_new.c
native/ext/libzip/zip_open.c
native/ext/libzip/zip_rename.c
native/ext/libzip/zip_replace.c
native/ext/libzip/zip_set_archive_comment.c
native/ext/libzip/zip_set_archive_flag.c
native/ext/libzip/zip_set_file_comment.c
native/ext/libzip/zip_set_name.c
native/ext/libzip/zip_source_buffer.c
native/ext/libzip/zip_source_file.c
native/ext/libzip/zip_source_filep.c
native/ext/libzip/zip_source_free.c
native/ext/libzip/zip_source_function.c
native/ext/libzip/zip_source_zip.c
native/ext/libzip/zip_stat.c
native/ext/libzip/zip_stat_index.c
native/ext/libzip/zip_stat_init.c
native/ext/libzip/zip_strerror.c
native/ext/libzip/zip_unchange.c
native/ext/libzip/zip_unchange_all.c
native/ext/libzip/zip_unchange_archive.c
native/ext/libzip/zip_unchange_data.c)
target_link_libraries(libzip ${ZLIB_LIBRARY})
include_directories(native/ext/libzip)
set(LIBZIP_LIBRARY libzip)
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)
file(GLOB PNG_ARM_INCLUDES native/ext/libpng17/arm/*)
endif()
add_library(png17 STATIC
native/ext/libpng17/pngconf.h
native/ext/libpng17/pngdebug.h
native/ext/libpng17/png.c
native/ext/libpng17/png.h
native/ext/libpng17/pngerror.c
native/ext/libpng17/pngget.c
native/ext/libpng17/pnginfo.h
native/ext/libpng17/pnglibconf.h
native/ext/libpng17/pngmem.c
native/ext/libpng17/pngpread.c
native/ext/libpng17/pngpriv.h
native/ext/libpng17/pngread.c
native/ext/libpng17/pngrio.c
native/ext/libpng17/pngrtran.c
native/ext/libpng17/pngrutil.c
native/ext/libpng17/pngset.c
native/ext/libpng17/pngstruct.h
native/ext/libpng17/pngtest.c
native/ext/libpng17/pngtrans.c
native/ext/libpng17/pngwio.c
native/ext/libpng17/pngwrite.c
native/ext/libpng17/pngwtran.c
native/ext/libpng17/pngwutil.c
${PNG_ARM_INCLUDES} )
set(PNG_LIBRARY png17)
Proper fix for libpng16 includes. Improve Blackberry CMake toolchain.
2013-12-09 16:14:43 +00:00
include_directories(native/ext)
Use libpng to load PNGs. Fixes #4689.
2013-12-07 15:42:17 +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
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)
Android: Fixes for CMake and Qt.
2014-06-27 16:49:50 +00:00
set (CMAKE_ASM_FLAGS "${CMAKE_ASM_FLAGS} -march=armv7-a -mfpu=neon -mcpu=cortex-a9")
Fix CMake build
2014-03-22 14:18:01 +00:00
set(nativeExtra ${nativeExtra}
native/math/fast/fast_matrix_neon.S)
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/math/fast/fast_matrix_sse.c)
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/base/NativeApp.h
native/android/app-android.cpp
native/android/native_audio.cpp
native/android/native_audio.h)
add_library(native_audio SHARED
native/android/native-audio-so.cpp
native/android/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
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.m
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()
set_source_files_properties(ios/AppDelegate.m PROPERTIES COMPILE_FLAGS -fobjc-arc)
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})
qt4_wrap_cpp(nativeQtHeader native/base/QtMain.h)
set(nativeExtra ${nativeExtra} 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)
Update native for Blackberry. New BB10 frontend.
2013-06-01 06:06:07 +00:00
set(nativeExtra ${nativeExtra} native/base/BlackberryMain.cpp 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)
elseif(SDL_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
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
include_directories(${SDL_INCLUDE_DIR})
enable SDL Joystick support to Qt Cmake file update add new SDL joystick files
2013-11-05 12:49:23 +00:00
set(nativeExtra ${nativeExtra}
SDL/SDLJoystick.h
SDL/SDLJoystick.cpp
native/base/PCMain.cpp)
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 ${nativeExtraLibs} ${SDL_LIBRARY})
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()
Apple: Had to add this to build on Mavericks, for some reason.
2013-10-31 10:54:59 +00:00
message(FATAL_ERROR "Could not find SDL. 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
UI/EmuScreen.cpp
UI/GameInfoCache.cpp
UI/MainScreen.cpp
UI/MiscScreens.cpp
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
UI/Store.cpp
UI/CwCheatScreen.cpp
UI/InstallZipScreen.cpp
UI/ui_atlas.cpp)
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}
Link backtrace on non-x86 via cmake.
2014-01-26 00:07:31 +00:00
native/base/backtrace.cpp
native/base/backtrace.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
native/audio/mixer.cpp
native/audio/mixer.h
native/audio/wav_read.cpp
native/audio/wav_read.h
native/base/basictypes.h
native/base/buffer.cpp
native/base/buffer.h
native/base/color.h
native/base/colorutil.cpp
native/base/colorutil.h
native/base/display.cpp
native/base/display.h
native/base/error_context.cpp
native/base/error_context.h
native/base/fastlist.h
native/base/fastlist_test.cpp
Update to latest version of "native"
2013-05-31 21:10:14 +00:00
native/base/functional.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
native/base/linked_ptr.h
native/base/logging.h
native/base/mutex.h
native/base/scoped_ptr.h
native/base/stats.h
native/base/stringutil.cpp
native/base/stringutil.h
native/base/timeutil.cpp
native/base/timeutil.h
CMake and Meego buildfix.
2013-06-05 17:43:10 +00:00
native/data/compression.cpp
native/data/compression.h
Initial draft of the Homebrew Store. Lets you install a few homebrew.
2013-11-20 13:42:48 +00:00
native/ext/vjson/json.cpp
native/ext/vjson/json.h
native/ext/vjson/block_allocator.cpp
native/ext/vjson/block_allocator.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
native/file/chunk_file.cpp
native/file/chunk_file.h
native/file/dialog.cpp
native/file/dialog.h
native/file/easy_file.cpp
native/file/easy_file.h
native/file/fd_util.cpp
native/file/fd_util.h
native/file/file_util.cpp
native/file/file_util.h
Very basic internationalization. Does not work on Android yet due to location of ini files.
2013-04-18 09:58:54 +00:00
native/file/ini_file.cpp
native/file/ini_file.h
Move PathBrowser to native
2013-11-18 13:05:26 +00:00
native/file/path.cpp
native/file/path.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
native/file/vfs.h
native/file/zip_read.cpp
native/file/zip_read.h
iOS: buildfix, stub Vibrate() for now.
2013-10-13 19:12:36 +00:00
native/gfx/gl_common.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
native/gfx/gl_debug_log.cpp
native/gfx/gl_debug_log.h
native/gfx/gl_lost_manager.cpp
native/gfx/gl_lost_manager.h
native/gfx/texture.cpp
native/gfx/texture.h
native/gfx/texture_atlas.cpp
native/gfx/texture_atlas.h
# native/gfx/texture_dx11.cpp
native/gfx/texture_gen.cpp
native/gfx/texture_gen.h
native/gfx_es2/draw_buffer.cpp
native/gfx_es2/draw_buffer.h
Linux buildfix
2013-08-30 23:14:53 +00:00
native/gfx_es2/draw_text.cpp
native/gfx_es2/draw_text.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
native/gfx_es2/fbo.cpp
native/gfx_es2/fbo.h
native/gfx_es2/gl_state.cpp
native/gfx_es2/gl_state.h
Only disable buffered rendering by default on Galaxy Y instead of all Armv6 devices. Would have like to use gpu feature flags but GL isn't necessarily initialized when we load the config. Will need to find a different solution. Also a buildfix for headless non-windows.
2013-10-25 09:45:41 +00:00
native/gfx_es2/gpu_features.cpp
native/gfx_es2/gpu_features.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
native/gfx_es2/glsl_program.cpp
native/gfx_es2/glsl_program.h
native/gfx_es2/vertex_format.cpp
native/gfx_es2/vertex_format.h
Buildfix for CMake / Qt
2013-10-08 15:45:37 +00:00
native/gfx_es2/gl3stub.c
native/gfx_es2/gl3stub.h
Very basic internationalization. Does not work on Android yet due to location of ini files.
2013-04-18 09:58:54 +00:00
native/i18n/i18n.cpp
native/i18n/i18n.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
native/image/png_load.cpp
native/image/png_load.h
native/image/zim_load.cpp
native/image/zim_load.h
native/image/zim_save.cpp
native/image/zim_save.h
native/input/gesture_detector.cpp
native/input/gesture_detector.h
Sync KeyMap to native changes
2013-06-25 04:34:14 +00:00
native/input/keycodes.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
native/input/input_state.h
Sync KeyMap to native changes
2013-06-25 04:34:14 +00:00
native/input/input_state.cpp
Fix CMake build
2014-03-22 14:18:01 +00:00
native/math/fast/fast_math.c
native/math/fast/fast_matrix.c
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
native/math/curves.cpp
native/math/curves.h
Moved expression parser to native and changed how it's accessed
2013-06-30 23:41:06 +00:00
native/math/expression_parser.cpp
native/math/expression_parser.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
native/math/lin/aabb.cpp
native/math/lin/aabb.h
native/math/lin/matrix4x4.cpp
native/math/lin/matrix4x4.h
native/math/lin/plane.cpp
native/math/lin/plane.h
native/math/lin/quat.cpp
native/math/lin/quat.h
native/math/lin/ray.h
native/math/lin/vec3.cpp
native/math/lin/vec3.h
native/math/math_util.cpp
native/math/math_util.h
native/net/http_client.cpp
native/net/http_client.h
native/net/resolve.cpp
native/net/resolve.h
Update to latest version of "native"
2013-05-31 21:10:14 +00:00
native/net/url.cpp
native/net/url.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
native/profiler/profiler.cpp
native/profiler/profiler.h
Buildfix Linux.
2014-08-23 08:20:26 +00:00
native/thin3d/thin3d.cpp
native/thin3d/thin3d.h
native/thin3d/thin3d_gl.cpp
Background thread for icon loading, show in game list. Switch to GNU STL in Android port.
2013-04-13 19:24:07 +00:00
native/thread/prioritizedworkqueue.cpp
Buildfix for iOS and Android.
2013-05-02 06:31:18 +00:00
native/thread/prioritizedworkqueue.h
Background thread for icon loading, show in game list. Switch to GNU STL in Android port.
2013-04-13 19:24:07 +00:00
native/thread/threadutil.cpp
native/thread/threadutil.h
Buildfix for iOS and Android.
2013-05-02 06:31:18 +00:00
native/thread/threadpool.cpp
native/thread/threadpool.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
native/ui/screen.cpp
native/ui/screen.h
native/ui/ui.cpp
native/ui/ui.h
Linux/mac buildfix attempt
2013-03-30 20:02:08 +00:00
native/ui/ui_context.cpp
native/ui/ui_context.h
Use FFMPEG on 64-bit Windows, now that there's a build.
2013-06-03 19:46:10 +00:00
native/ui/ui_screen.cpp
native/ui/ui_screen.h
native/ui/view.cpp
native/ui/view.h
native/ui/viewgroup.cpp
native/ui/viewgroup.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
native/ui/virtual_input.cpp
native/ui/virtual_input.h
native/util/bits/bits.cpp
native/util/bits/bits.h
native/util/bits/hamming.h
native/util/bits/varint.cpp
native/util/bits/varint.h
native/util/hash/hash.cpp
native/util/hash/hash.h
native/util/random/perlin.cpp
native/util/random/perlin.h
native/util/random/rng.h
Add the new utf8.cpp to the main CMakeLists
2013-01-02 23:53:11 +00:00
native/util/text/utf8.h
native/util/text/utf8.cpp
Show a dismissable notification if PPSSPP is behind the latest official release
2013-11-26 13:04:29 +00:00
native/util/text/parsers.h
native/util/text/parsers.cpp
Fix key map screen forgeting last pressed key
2013-06-30 02:20:23 +00:00
native/util/const_map.h
Update native (add jpgd)
2013-07-04 22:07:01 +00:00
native/ext/jpge/jpgd.cpp
native/ext/jpge/jpgd.h
native/ext/jpge/jpge.cpp
Remove unnecessary compiles from CMake, Qt.
2013-10-27 14:28:18 +00:00
native/ext/jpge/jpge.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(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()
target_link_libraries(native ${LIBZIP_LIBRARY} ${PNG_LIBRARY} rg_etc1 vjson stb_vorbis snappy ${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)
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)
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/ArmAsm.h
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
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
Fix paths in CMakeLists.txt, after VertexDecoder file split
2013-11-24 16:25:10 +00:00
GPU/GLES/VertexDecoderArm.cpp
GPU/GLES/VertexDecoder.h
Update project files for changes in armjit. CMake and Qt.
2013-01-13 10:52:41 +00:00
ext/disarm.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/Asm.h
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
Fix paths in CMakeLists.txt, after VertexDecoder file split
2013-11-24 16:25:10 +00:00
GPU/GLES/VertexDecoderX86.cpp
GPU/GLES/VertexDecoder.h
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)
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()
# '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
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
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
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
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
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
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
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
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
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
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
Add tables for assembling
2013-07-27 22:56:53 +00:00
Core/MIPS/MIPSAsmTables.cpp
Core/MIPS/MIPSAsmTables.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
Core/PSPLoaders.cpp
Core/PSPLoaders.h
Core/PSPMixer.cpp
Core/PSPMixer.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
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
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
$<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)
Add CityHash back to Linux/iOS/etc. This reverts commit ecfe43c1493d6cfec4e4af99f74ea7d286cf33de.
2013-12-14 23:46:11 +00:00
target_link_libraries(${CoreLibName} Common native kirk cityhash 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
Add GPU debugging hooks to Host, not yet in use.
2013-09-22 07:18:46 +00:00
GPU/Common/GPUDebugInterface.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
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
CMake Buildfix. Update version number for Blackberry.
2013-08-21 00:11:34 +00:00
GPU/GLES/GLES_GPU.cpp
GPU/GLES/GLES_GPU.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
Forgot this one..
2013-08-22 23:03:40 +00:00
GPU/GLES/Spline.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/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
Buildfix for iOS and Android.
2013-05-02 06:31:18 +00:00
GPU/GLES/TextureScaler.cpp
GPU/GLES/TextureScaler.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/TransformPipeline.cpp
GPU/GLES/TransformPipeline.h
Extract the software transform code into its own file.
2013-11-13 13:56:34 +00:00
GPU/GLES/SoftwareTransform.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/VertexDecoder.cpp
GPU/GLES/VertexDecoder.h
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
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
Improvements to CMake install.
2013-12-07 04:26:39 +00:00
assets/langregion.ini
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
UI/OnScreenDisplay.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
)
target_link_libraries(unitTest
${COCOA_LIBRARY} ${LinkCommon})
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)
set(ICON_PATH_ABS ${CMAKE_CURRENT_SOURCE_DIR}/assets/icon-114.icns)
set( MACOSX_BUNDLE_ICON_FILE icon-114.icns )
set_source_files_properties(${ICON_PATH_ABS} PROPERTIES MACOSX_PACKAGE_LOCATION "Resources")
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.
# Also better to have assets under Resources dir.
file(GLOB_RECURSE FLASH0_FILES flash0/*)
file(GLOB_RECURSE LANG_FILES lang/*)
file(GLOB_RECURSE SHADER_FILES assets/shaders/*)
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")
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()
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
target_link_libraries(${TargetBin} ${LinkCommon})
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)
iOS: Fix breakpoints, simplify running unit tests.
2013-03-16 06:50:31 +00:00
file(INSTALL ${IOSAssets} DESTINATION assets)
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
iOS: Fix breakpoints, simplify running unit tests.
2013-03-16 06:50:31 +00:00
COMMAND tar -c -C . --exclude .DS_Store --exclude .git -H assets | 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
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