Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2024-11-26 23:10:38 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
e078f61bad
ppsspp/CMakeLists.txt

2691 lines
79 KiB
CMake
Raw Normal View History

Add vim modeline to CMakeLists.txt
2012-11-26 22:03:44 +00:00
# vim:noexpandtab:
armips: Update to UTF-8/c++17 armips.
2022-01-17 19:13:24 +00:00
cmake_minimum_required(VERSION 3.8)
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
project(PPSSPP)
CMake: enable testing
2021-02-17 05:42:31 +00:00
enable_testing()
Pick some safe changes from the android gradle branch (including windows CMake fixes)
2016-12-05 15:51:28 +00:00
#This is supposed to work but doesn't!
Core: Format CMakeLists.txt consistently.
2018-10-28 18:33:25 +00:00
if(NOT ANDROID)
armips: Update to UTF-8/c++17 armips.
2022-01-17 19:13:24 +00:00
set(CMAKE_CXX_STANDARD 17)
Core: Format CMakeLists.txt consistently.
2018-10-28 18:33:25 +00:00
set(CMAKE_CXX_STANDARD_REQUIRED ON)
CMakelist cleanup, might buildfix things on Linux Clang
2017-03-16 09:16:29 +00:00
endif()
Pick some safe changes from the android gradle branch (including windows CMake fixes)
2016-12-05 15:51:28 +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
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
Pick some safe changes from the android gradle branch (including windows CMake fixes)
2016-12-05 15:51:28 +00:00
add_definitions(-D__STDC_CONSTANT_MACROS)
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
Build: Correct AppleClang warning handling.
2021-12-11 18:45:05 +00:00
# Include AppleClang and Clang.
if(${CMAKE_CXX_COMPILER_ID} MATCHES "Clang")
Core: Format CMakeLists.txt consistently.
2018-10-28 18:33:25 +00:00
set(CLANG ON)
message("Clang enabled")
CMakelist cleanup, might buildfix things on Linux Clang
2017-03-16 09:16:29 +00:00
endif()
Added Vulkan disable and forced CPU detection options
2018-06-15 20:29:56 +00:00
if(FORCED_CPU)
Core: Format CMakeLists.txt consistently.
2018-10-28 18:33:25 +00:00
message("Detected CPU (${CMAKE_SYSTEM_PROCESSOR}) overridden as: ${FORCED_CPU}")
set(CMAKE_SYSTEM_PROCESSOR ${FORCED_CPU})
Added Vulkan disable and forced CPU detection options
2018-06-15 20:29:56 +00:00
endif()
CMake: Cleanup more names.
2014-06-18 06:15:47 +00:00
# Detect CPU from CMAKE configuration. Toolchains should set this up
Successful build on GCW-Zero.
2014-11-13 15:41:30 +00:00
if(CMAKE_SYSTEM_PROCESSOR)
Add FAT support for macOS with automatic GitHub releases closes #11799 closes #13708 closes #14815
2021-09-12 13:54:40 +00:00
if(CMAKE_OSX_ARCHITECTURES)
if("${CMAKE_OSX_ARCHITECTURES}" MATCHES ".*86.*")
set(X86_DEVICE ON)
set(X86_64_DEVICE ON)
endif()
if("${CMAKE_OSX_ARCHITECTURES}" MATCHES "arm64")
set(ARM64 ON)
endif()
elseif(${CMAKE_SYSTEM_PROCESSOR} MATCHES "^aarch64")
CMakeLists.txt fixes for M1. It sets cpu arch to "arm64", not "aarch64"
2020-12-01 23:23:45 +00:00
set(ARM64 ON)
elseif(${CMAKE_SYSTEM_PROCESSOR} MATCHES "^arm64")
# M1 Mac
set(ARM64 ON)
elseif(${CMAKE_SYSTEM_PROCESSOR} MATCHES "^arm")
message("ARM_DEVICE is a go")
cmake: Fix CMP0077 policy warnings. Fixes https://github.com/hrydgard/ppsspp/issues/11629
2018-12-04 02:35:48 +00:00
set(ARM_DEVICE ON)
if(UNIX AND NOT APPLE)
execute_process(COMMAND cat /proc/cpuinfo OUTPUT_VARIABLE OUTSTR)
string(FIND "${OUTSTR}" "ODROID-XU" pos)
if(NOT (pos LESS 0))
add_compile_options(-mfloat-abi=hard -marm -mtune=cortex-a15.cortex-a7 -mcpu=cortex-a15 -fomit-frame-pointer)
set(ARM_NO_VULKAN ON)
Add: some helpers to compile on ODROID-XU4/XU3
2018-09-07 15:34:17 +00:00
endif()
cmake: Fix CMP0077 policy warnings. Fixes https://github.com/hrydgard/ppsspp/issues/11629
2018-12-04 02:35:48 +00:00
endif()
Fix Blackberry build.
2014-11-14 08:07:29 +00:00
if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "^armv7")
cmake: Fix CMP0077 policy warnings. Fixes https://github.com/hrydgard/ppsspp/issues/11629
2018-12-04 02:35:48 +00:00
set(ARMV7_DEVICE ON)
Fix: should close on spec #11404
2018-09-20 15:06:49 +00:00
add_compile_options(-mfpu=neon)
Pick some safe changes from the android gradle branch (including windows CMake fixes)
2016-12-05 15:51:28 +00:00
# Horrifying workaround for bug in android cmake stuff for asm files
Core: Format CMakeLists.txt consistently.
2018-10-28 18:33:25 +00:00
if(ANDROID)
Pick some safe changes from the android gradle branch (including windows CMake fixes)
2016-12-05 15:51:28 +00:00
set(CMAKE_ASM_FLAGS "${CMAKE_ASM_FLAGS} -target armv7a-none-linux-android")
endif()
Fix Blackberry build.
2014-11-14 08:07:29 +00:00
endif()
Pick some safe changes from the android gradle branch (including windows CMake fixes)
2016-12-05 15:51:28 +00:00
elseif(${CMAKE_SYSTEM_PROCESSOR} MATCHES "^amd64" OR ${CMAKE_SYSTEM_PROCESSOR} MATCHES "^x86_64" OR ${CMAKE_SYSTEM_PROCESSOR} MATCHES "^AMD64")
cmake: Fix CMP0077 policy warnings. Fixes https://github.com/hrydgard/ppsspp/issues/11629
2018-12-04 02:35:48 +00:00
set(X86_DEVICE ON)
set(X86_64_DEVICE ON)
Pick some safe changes from the android gradle branch (including windows CMake fixes)
2016-12-05 15:51:28 +00:00
elseif(${CMAKE_SYSTEM_PROCESSOR} MATCHES "^x86" OR ${CMAKE_SYSTEM_PROCESSOR} MATCHES "i.86")
cmake: Fix CMP0077 policy warnings. Fixes https://github.com/hrydgard/ppsspp/issues/11629
2018-12-04 02:35:48 +00:00
set(X86_DEVICE ON)
Successful build on GCW-Zero.
2014-11-13 15:41:30 +00:00
elseif(${CMAKE_SYSTEM_PROCESSOR} MATCHES "^mips")
cmake: Fix CMP0077 policy warnings. Fixes https://github.com/hrydgard/ppsspp/issues/11629
2018-12-04 02:35:48 +00:00
set(MIPS_DEVICE ON)
Update CMakeLists.txt
2021-06-24 18:56:43 +00:00
elseif(${CMAKE_SYSTEM_PROCESSOR} MATCHES "^riscv64")
set(RISCV64_DEVICE ON)
Pick some safe changes from the android gradle branch (including windows CMake fixes)
2016-12-05 15:51:28 +00:00
else()
Core: Format CMakeLists.txt consistently.
2018-10-28 18:33:25 +00:00
message("Unknown CMAKE_SYSTEM_PROCESSOR: ${CMAKE_SYSTEM_PROCESSOR}")
Successful build on GCW-Zero.
2014-11-13 15:41:30 +00:00
endif()
Better support for new archs.
2014-11-11 12:55:49 +00:00
endif()
Maemo5 support
2013-03-22 07:15:00 +00:00
fix mingw and msvc cmake builds.
2018-03-23 02:18:13 +00:00
# the libraries in the ffmpeg/ directory are not compatible with mingw
if(MINGW AND NOT DEFINED USE_SYSTEM_FFMPEG)
nits.
2018-03-24 12:39:05 +00:00
set(USE_SYSTEM_FFMPEG ON)
fix mingw and msvc cmake builds.
2018-03-23 02:18:13 +00:00
endif()
Try to fix iOS builds on the Travis buildbot. #10254
2017-12-05 12:23:13 +00:00
if(NOT ANDROID AND NOT IOS)
CMakeLists: fix EGL detection for ARM devices ARM macro has been renamed to ARM_DEVICE; fixes Raspberry Pi builds.
2019-01-25 15:38:03 +00:00
if(ARM_DEVICE OR SIMULATOR)
Add Gradle build. This time, we don't remove the old build system and we don't switch Travis.
2017-03-13 22:45:25 +00:00
set(USING_EGL ON)
endif()
CMake: Cleanup more names.
2014-06-18 06:15:47 +00:00
endif()
CMake-based build system. Tested on Windows with NMake Makefiles and Visual Studio 11 targets. Tested on Linux with GNU Makefiles target, using GCC as the compiler. Tested on FreeBSD using clang as the compiler. Tested for Android on Windows with NMake Makefiles and r8c NDK. Proxy-tested by xsacha for blackberry. The android build requires that the android/android.toolchain.cmake toolchain file is used; an error will be raised if ANDROID is defined without loading the toolchain file. When targeting ANDROID, the resulting .so files will be placed in "android/libs/$ANDROID_ABI" even when building out of tree, since it's where `ant` expects to find them. Since the Core library is expected to be named 'ppsspp_jni' on ANDROID, we also put its name in a variable that is set to 'Core' unless building on ANDROID, where it is 'ppsspp_jni'.
2012-11-18 16:00:27 +00:00
Switch: Avoid loading Vulkan.
2022-04-02 23:34:13 +00:00
if(${CMAKE_SYSTEM_NAME} MATCHES "Linux" AND NOT USE_LIBNX)
Clean up CMakeLists with regards to FFMPEG.
2013-06-21 05:33:29 +00:00
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)
CMakeLists.txt fixes for M1. It sets cpu arch to "arm64", not "aarch64"
2020-12-01 23:23:45 +00:00
set(USING_EGL OFF)
Fix PPSSPPSDL on MacOSX, link ffmpeg.
2013-06-15 12:50:47 +00:00
endif()
cmake: Move some platform configuration to a toolchain file
2016-10-11 01:27:38 +00:00
if(${CMAKE_SYSTEM_NAME} MATCHES "Android")
WIP vulkan on linux stuff
2017-12-13 21:58:45 +00:00
set(ANDROID ON)
endif()
Initial support for vulkan on macOS ( MoltenVK )
2020-01-19 09:34:21 +00:00
# We only support Vulkan on Unix, macOS (by MoltenVK), Android and Windows.
if(ANDROID OR WIN32 OR (UNIX AND NOT ARM_NO_VULKAN))
Add: some helpers to compile on ODROID-XU4/XU3
2018-09-07 15:34:17 +00:00
set(VULKAN ON)
cmake: Move some platform configuration to a toolchain file
2016-10-11 01:27:38 +00:00
endif()
Allow usage of system SDL2 on macOS
2023-05-05 21:17:45 +00:00
# Default to bundled SDL2 on macOS, system SDL2 elsewhere.
if(APPLE AND NOT IOS)
set(DEFAULT_USE_SYSTEM_LIBSDL2 OFF)
else()
set(DEFAULT_USE_SYSTEM_LIBSDL2 ON)
endif()
Safer hack to build on M1.
2020-12-02 21:46:56 +00:00
list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/Modules)
Add FAT support for macOS with automatic GitHub releases closes #11799 closes #13708 closes #14815
2021-09-12 13:54:40 +00:00
if(NOT IOS)
Safer hack to build on M1.
2020-12-02 21:46:56 +00:00
list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/sdl)
endif()
include(ccache)
cmake: Add an install target.
2020-12-06 01:49:21 +00:00
include(GNUInstallDirs)
Safer hack to build on M1.
2020-12-02 21:46:56 +00:00
cmake: Add an install target.
2020-12-06 01:49:21 +00:00
add_definitions(-DASSETS_DIR="${CMAKE_INSTALL_FULL_DATADIR}/ppsspp/assets/")
Safer hack to build on M1.
2020-12-02 21:46:56 +00:00
OpenXR - Quest target into Android Studio project added
2022-07-06 19:38:41 +00:00
if(OPENXR)
add_definitions(-DOPENXR)
OpenXR - VR mode initialization added
2022-07-08 12:44:20 +00:00
add_library(openxr SHARED IMPORTED)
OpenXR - One APK for both Pico and Quest
2023-02-08 16:26:36 +00:00
set_property(TARGET openxr PROPERTY IMPORTED_LOCATION "${CMAKE_SOURCE_DIR}/ext/openxr/stub/arm64-v8a/libopenxr_loader.so")
message("OpenXR enabled")
OpenXR - Quest target into Android Studio project added
2022-07-06 19:38:41 +00:00
endif()
Forward the GOLD cmake variable to a CPP define.
2017-03-16 09:42:15 +00:00
if(GOLD)
add_definitions(-DGOLD)
Minor resource reorg
2017-03-17 10:55:14 +00:00
message("Gold Build")
else()
message("Normal Build")
Forward the GOLD cmake variable to a CPP define.
2017-03-16 09:42:15 +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
# 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: Fix CMP0077 policy warnings. Fixes https://github.com/hrydgard/ppsspp/issues/11629
2018-12-04 02:35:48 +00:00
option(ARMV7 "Set to ON if targeting an ARMv7 processor" ${ARMV7_DEVICE})
option(ARM "Set to ON if targeting an ARM processor" ${ARM_DEVICE})
option(MIPS "Set to ON if targeting a MIPS processor" ${MIPS_DEVICE})
Update CMakeLists.txt
2021-06-24 18:56:43 +00:00
option(RISCV64 "Set to ON if targeting a RISCV64 processor" ${RISCV64_DEVICE})
cmake: Fix CMP0077 policy warnings. Fixes https://github.com/hrydgard/ppsspp/issues/11629
2018-12-04 02:35:48 +00:00
option(X86 "Set to ON if targeting an X86 processor" ${X86_DEVICE})
option(X86_64 "Set to ON if targeting an X86_64 processor" ${X86_64_DEVICE})
CMake: Make the code more platform-agnostic and cleaner.
2014-05-30 15:22:11 +00:00
# :: Environments
option(USING_EGL "Set to ON if target environment uses EGL" ${USING_EGL})
option(USING_FBDEV "Set to ON if target environment uses fbdev (eg. Pandora)" ${USING_FBDEV})
CMakeLists cleanup. Tabified CMakeLists. Introduced USING_GLES2 and X86 option and exposed USING_GLES2 to C++. Removed some redundancies and messiness.
2012-11-26 02:41:57 +00:00
option(USING_GLES2 "Set to ON if target device uses OpenGL ES 2.0" ${USING_GLES2})
Made X11-Vulkan default. Provided explanatory toolchain file as overriding is more complex.
2018-06-27 11:48:59 +00:00
option(USING_X11_VULKAN "Set to OFF if target environment doesn't use X11 for Vulkan" ON)
cmake: Automatically disable Wayland for Raspbian. Also add a shortcut to b.sh since it has its own toolchain file.
2019-03-23 14:27:29 +00:00
option(USE_WAYLAND_WSI "Enable or disable Wayland WSI support for Vulkan" ${USE_WAYLAND_WSI})
First pass on using Display KHR, needs proper init flags
2020-12-01 01:31:14 +00:00
option(USE_VULKAN_DISPLAY_KHR "Enable or disable full screen display of Vulkan" ${USE_VULKAN_DISPLAY_KHR})
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})
Get rid of some blackberry build stuff Conflicts: CMakeLists.txt
2016-10-09 20:10:51 +00:00
option(MOBILE_DEVICE "Set to ON when targeting 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})
Libretro port.
2018-03-24 11:44:53 +00:00
option(LIBRETRO "Set to ON to generate the libretro target" OFF)
CMake: Make the code more platform-agnostic and cleaner.
2014-05-30 15:22:11 +00:00
# :: Options
Switch: Avoid loading Vulkan.
2022-04-02 23:34:13 +00:00
option(USE_LIBNX "Set to ON to build for Switch(libnx)" OFF)
cmake: Fix CMP0077 policy warnings. Fixes https://github.com/hrydgard/ppsspp/issues/11629
2018-12-04 02:35:48 +00:00
option(USE_FFMPEG "Build with FFMPEG support" ON)
Discord: Add cmake option to disable.
2018-11-10 15:39:27 +00:00
option(USE_DISCORD "Build with Discord support" ON)
Added UPnP Support Fix i18n type
2020-01-17 19:32:09 +00:00
option(USE_MINIUPNPC "Build with miniUPnPc support" ON)
Build: Allow compiling without armips.
2022-12-17 18:08:46 +00:00
option(USE_ARMIPS "Build with armips support in API/debugger" ON)
Allow choosing to use the system snappy or not.
2018-08-26 19:59:02 +00:00
option(USE_SYSTEM_SNAPPY "Dynamically link against system snappy" ${USE_SYSTEM_SNAPPY})
Try to dynamically link against system ffmpeg when possible
2015-06-01 13:29:54 +00:00
option(USE_SYSTEM_FFMPEG "Dynamically link against system FFMPEG" ${USE_SYSTEM_FFMPEG})
Add an option to use the system libzip, to please grumpy package maintainers. This reverts commit 1a34f8833119c7b35a3b9d599b723ddd4c55c35a.
2018-02-07 11:09:06 +00:00
option(USE_SYSTEM_LIBZIP "Dynamically link against system libzip" ${USE_SYSTEM_LIBZIP})
Allow usage of system SDL2 on macOS
2023-05-05 21:17:45 +00:00
option(USE_SYSTEM_LIBSDL2 "Dynamically link against system SDL2" ${DEFAULT_USE_SYSTEM_LIBSDL2})
Add FAT support for macOS with automatic GitHub releases closes #11799 closes #13708 closes #14815
2021-09-12 13:54:40 +00:00
option(USE_SYSTEM_LIBPNG "Dynamically link against system libpng" ON)
Build: allow using system zstd library
2021-10-28 08:30:05 +00:00
option(USE_SYSTEM_ZSTD "Dynamically link against system zstd" ${USE_SYSTEM_ZSTD})
ext: Support building with system miniUPnPc
2021-11-30 03:29:28 +00:00
option(USE_SYSTEM_MINIUPNPC "Dynamically link against system miniUPnPc" ${USE_SYSTEM_MINIUPNPC})
CMake: Rename USE_ADDRESS_SANITIZER to USE_ASAN For consistency with USE_UBSAN
2021-01-29 23:08:20 +00:00
option(USE_ASAN "Use address sanitizer" OFF)
CMake: Add USE_UBSAN
2021-01-29 23:06:00 +00:00
option(USE_UBSAN "Use undefined behaviour sanitizer" 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
Android cmake buildfix
2017-12-27 14:28:17 +00:00
if(UNIX AND NOT (APPLE OR ANDROID) AND VULKAN)
Changed cmake option to exclude X11 rather than Vulkan itself.
2018-06-19 20:44:55 +00:00
if(USING_X11_VULKAN)
message("Using X11 for Vulkan")
add_definitions(-DVK_USE_PLATFORM_XLIB_KHR)
else()
message("NOT using X11 for Vulkan")
endif()
First pass on using Display KHR, needs proper init flags
2020-12-01 01:31:14 +00:00
Check for Wayland headers in CMake
2017-12-26 12:00:40 +00:00
# add_definitions(-DVK_USE_PLATFORM_XCB_KHR)
CMake: Allow disabling Wayland support with USE_WAYLAND_WSI This change means that USE_WAYLAND_WSI=ON no longer triggers a fatal error if Wayland libraries are missing though, it will just show a message and continue building without Wayand WSI support. Closes #11536.
2018-11-06 09:59:22 +00:00
if(USE_WAYLAND_WSI)
find_package(Wayland)
if(NOT WAYLAND_FOUND)
message(STATUS "Could not find Wayland libraries, disabling Wayland WSI support for Vulkan.")
else()
include_directories(${WAYLAND_INCLUDE_DIR})
add_definitions(-DVK_USE_PLATFORM_WAYLAND_KHR)
endif()
Check for Wayland headers in CMake
2017-12-26 12:00:40 +00:00
endif()
First pass on using Display KHR, needs proper init flags
2020-12-01 01:31:14 +00:00
if(USE_VULKAN_DISPLAY_KHR)
message(STATUS "Using experimental full-screen display for Vulkan.")
add_definitions(-DVK_USE_PLATFORM_DISPLAY_KHR)
endif()
Check for Wayland headers in CMake
2017-12-26 12:00:40 +00:00
endif()
WIP vulkan on linux stuff
2017-12-13 21:58:45 +00:00
Libretro port.
2018-03-24 11:44:53 +00:00
if(LIBRETRO)
add_definitions(-D__LIBRETRO__)
add_definitions(-DGLEW_NO_GLU)
nits.
2018-03-24 12:39:05 +00:00
if(NOT MSVC)
add_compile_options(-fPIC)
endif()
Libretro port.
2018-03-24 11:44:53 +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
if(ANDROID)
Get rid of some blackberry build stuff Conflicts: CMakeLists.txt
2016-10-09 20:10:51 +00:00
set(MOBILE_DEVICE ON)
set(USING_GLES2 ON)
Libretro needs core staticly linked even on Android
2018-03-28 23:16:56 +00:00
endif()
if(ANDROID AND NOT LIBRETRO)
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()
Change ffmpeg include headers priority to avoid collission with system ffmpeg
2021-08-13 03:05:43 +00:00
# Work around for some misfeature of the current glslang build system
CMake buildfix
2020-03-03 21:46:26 +00:00
include_directories(ext/glslang)
Buildfix linux
2020-10-05 07:13:35 +00:00
# Not sure if this is the best way - what about system glew?
# Anyway, glew will be going away anyway.
include_directories(ext/glew)
CMake buildfix
2020-03-03 21:46:26 +00:00
OpenXR - GL and OXR logging added
2022-08-16 15:39:54 +00:00
if(OPENXR)
set(OPENGL_LIBRARIES GLESv3 EGL)
elseif(NOT OPENGL_LIBRARIES AND USING_GLES2)
Fix: prevent linkage error if EGL and GLES is not in one big blob
2018-09-25 12:19:23 +00:00
set(OPENGL_LIBRARIES GLESv2 EGL)
CMake: Cleanup more names.
2014-06-18 06:15:47 +00:00
endif()
CMake: Link against OpenGL when using EGL but not GLES2 At least for Linux armv7hl this seems to be necessary, otherwise build fails with: /usr/bin/ld: lib/libnative.a(GLQueueRunner.cpp.o): undefined reference to symbol 'glStencilOp'
2018-11-06 13:31:44 +00:00
if(NOT OPENGL_LIBRARIES)
CMake: use vendor GL implementations by setting CMP0072 to NEW
2021-02-16 23:14:57 +00:00
if(POLICY CMP0072)
cmake_policy(SET CMP0072 NEW)
endif()
CMake: Link against OpenGL when using EGL but not GLES2 At least for Linux armv7hl this seems to be necessary, otherwise build fails with: /usr/bin/ld: lib/libnative.a(GLQueueRunner.cpp.o): undefined reference to symbol 'glStencilOp'
2018-11-06 13:31:44 +00:00
find_package(OpenGL REQUIRED)
endif()
Missing -lEGL when -DUSING_EGL=ON Related to #9565 I tested only on ARM Linux (Ubuntu 14.04 on Odroid U3). Qt is building fine and working.
2017-12-04 18:09:06 +00:00
if(USING_EGL)
CMakeLists: relocate EGL library name detection Raspberry Pi targets require a custom EGL library name (configured in cmake/Toolchains/raspberry.armv*.cmake). Move configuration of EGL_LIBRARIES for generic targets out of SDL2 target to ensure correct library name is used everywhere (including QT builds). Fixes build on Raspberry Pi.
2017-12-20 03:38:01 +00:00
if(NOT EGL_LIBRARIES)
set(EGL_LIBRARIES EGL)
endif()
set(OPENGL_LIBRARIES ${OPENGL_LIBRARIES} ${EGL_LIBRARIES})
Missing -lEGL when -DUSING_EGL=ON Related to #9565 I tested only on ARM Linux (Ubuntu 14.04 on Odroid U3). Qt is building fine and working.
2017-12-04 18:09:06 +00:00
endif()
Upgrade SDL for Mac This removes the option to use system SDL, which seems like a trap. Also simplifies the macbundle.sh script accordingly. Buildfix Buildfix fix Moar buildfix
2023-04-24 12:44:07 +00:00
if(NOT LIBRETRO AND NOT IOS AND NOT MACOSX)
Update CMakeLists.txt SDL2 is not required for the libretro target
2019-11-10 18:47:15 +00:00
find_package(SDL2)
endif()
Upgrade SDL for Mac This removes the option to use system SDL, which seems like a trap. Also simplifies the macbundle.sh script accordingly. Buildfix Buildfix fix Moar buildfix
2023-04-24 12:44:07 +00:00
if(MACOSX AND NOT IOS)
Allow usage of system SDL2 on macOS
2023-05-05 21:17:45 +00:00
if(USE_SYSTEM_LIBSDL2)
find_package(SDL2)
else()
find_library(SDL2Fwk SDL2 REQUIRED PATHS SDL/macOS)
message(STATUS "found SDL2Fwk=${SDL2Fwk}")
add_definitions(-DHAVE_SYSCTLBYNAME)
endif()
Upgrade SDL for Mac This removes the option to use system SDL, which seems like a trap. Also simplifies the macbundle.sh script accordingly. Buildfix Buildfix fix Moar buildfix
2023-04-24 12:44:07 +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(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)
Support for showing % on Darwin platforms and some other changes
2023-01-27 08:19:29 +00:00
find_library(IOKIT_LIBRARY IOKit)
Initial support for vulkan on macOS ( MoltenVK )
2020-01-19 09:34:21 +00:00
find_library(QUARTZ_CORE_LIBRARY QuartzCore)
Support building PPSSPPHeadless on APPLE
2012-11-26 22:06:18 +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_directories("${CMAKE_SOURCE_DIR}")
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)
CMake: Don't include X11 headers when compiling for FBDEV When compiling for FBDEV, we don't need/want the X11 headers. These are included by default by <EGL/eglplatform.h>; compile with the EGL_NO_X11 macro set to prevent that. Signed-off-by: Paul Cercueil <paul@crapouillou.net>
2021-03-17 14:33:03 +00:00
add_definitions(-DUSING_FBDEV -DEGL_NO_X11)
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
Core: Format CMakeLists.txt consistently.
2018-10-28 18:33:25 +00:00
if(NOT CMAKE_BUILD_TYPE)
CMake: Use a default build (Release). Put Blackberry cflags back to Lists, otherwise overwritten.
2014-06-11 13:28:51 +00:00
message(STATUS "No build type selected, default to Release")
set(CMAKE_BUILD_TYPE "Release")
endif()
Pick some safe changes from the android gradle branch (including windows CMake fixes)
2016-12-05 15:51:28 +00:00
message("CMAKE_SYSTEM_PROCESSOR: ${CMAKE_SYSTEM_PROCESSOR}")
# Let's not use elseif here so we can catch dupes.
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)
Pick some safe changes from the android gradle branch (including windows CMake fixes)
2016-12-05 15:51:28 +00:00
message("Generating for ARMv7, ${CMAKE_BUILD_TYPE}")
endif()
if(ARM)
message("Generating for ARM, ${CMAKE_BUILD_TYPE}")
endif()
if(MIPS AND X86)
message("Generating for MIPS in x86 mode, ${CMAKE_BUILD_TYPE}")
endif()
if(MIPS)
message("Generating for MIPS, ${CMAKE_BUILD_TYPE}")
endif()
Update CMakeLists.txt
2021-06-24 18:56:43 +00:00
if(RISCV64)
message("Generating for RISCV64, ${CMAKE_BUILD_TYPE}")
endif()
Pick some safe changes from the android gradle branch (including windows CMake fixes)
2016-12-05 15:51:28 +00:00
if(X86)
message("Generating for x86, ${CMAKE_BUILD_TYPE}")
endif()
if(X86_64)
message("Generating for x86_64, ${CMAKE_BUILD_TYPE}")
endif()
if(ARM64)
Add Gradle build. This time, we don't remove the old build system and we don't switch Travis.
2017-03-13 22:45:25 +00:00
message("Generating for ARMv8, ${CMAKE_BUILD_TYPE}")
Blackberry: Link with pie (required for 10.3?). Fix debug build. Cmake: Show compile type (debug, release) in output.
2014-07-06 13:50:48 +00:00
endif()
Fix undesired re-builds after runnning CMake
2020-08-16 12:01:23 +00:00
# It looks like the flags for the selected build type are written to the cache after each run, which causes some of the operations
# below to keep expanding them with the same flags over and over on every run, leading to a rebuild of the majority of the files.
# To work around this, remember the initial state of the variables from the first run and reset the variables to that.
# TODO: Setting the attributes per target would probably be a better solution.
foreach (LANGUAGE C CXX)
foreach (BUILD_TYPE DEBUG MINSIZEREL RELEASE RELWITHDEBINFO)
set(_CMAKE_${LANGUAGE}_FLAGS_${BUILD_TYPE}_INITIAL ${CMAKE_${LANGUAGE}_FLAGS_${BUILD_TYPE}} CACHE STRING "")
set(CMAKE_${LANGUAGE}_FLAGS_${BUILD_TYPE} ${_CMAKE_${LANGUAGE}_FLAGS_${BUILD_TYPE}_INITIAL})
endforeach()
endforeach()
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)
Build: Disable NEON png on non-Android too. Just to be safe. It's likely a problem on iOS, etc. too.
2021-06-05 03:30:57 +00:00
# NEON optimizations in libpng17 seem to cause PNG load errors, see #14485.
add_definitions(-DPNG_ARM_NEON_OPT=0)
Core: Format CMakeLists.txt consistently.
2018-10-28 18:33:25 +00:00
if(ANDROID)
armips: Update to UTF-8/c++17 armips.
2022-01-17 19:13:24 +00:00
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++17")
CMakelist cleanup, might buildfix things on Linux Clang
2017-03-16 09:16:29 +00:00
endif()
Core: Format CMakeLists.txt consistently.
2018-10-28 18:33:25 +00:00
if(CLANG)
Vulkan: Ignore VMA nullability warnings.
2021-12-11 17:15:38 +00:00
add_definitions(-Wno-nullability-completeness)
Build: Avoid compiler flag warning. These are clang warnings.
2021-12-11 17:41:12 +00:00
add_definitions(-Wno-tautological-pointer-compare)
add_definitions(-Wno-deprecated-register)
Add Gradle build. This time, we don't remove the old build system and we don't switch Travis.
2017-03-13 22:45:25 +00:00
endif()
Fix a mistake with cflags reorg
2017-03-15 14:56:06 +00:00
CMake: Rename USE_ADDRESS_SANITIZER to USE_ASAN For consistency with USE_UBSAN
2021-01-29 23:08:20 +00:00
if(USE_ASAN)
b.sh: Add a build option for address sanitizer. When enabled, we turn on some compatibility options to make it work right.
2018-01-31 13:22:38 +00:00
message("Address sanitizer enabled (DEBUG only)")
CMake: Add USE_UBSAN
2021-01-29 23:06:00 +00:00
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -fsanitize=address")
b.sh: Add a build option for address sanitizer. When enabled, we turn on some compatibility options to make it work right.
2018-01-31 13:22:38 +00:00
set(CMAKE_LINKER_FLAGS_DEBUG "${CMAKE_LINKER_FLAGS_DEBUG} -fsanitize=address")
CMake: Rename USE_ADDRESS_SANITIZER to USE_ASAN For consistency with USE_UBSAN
2021-01-29 23:08:20 +00:00
add_definitions(-DUSE_ASAN)
b.sh: Add a build option for address sanitizer. When enabled, we turn on some compatibility options to make it work right.
2018-01-31 13:22:38 +00:00
endif()
CMake: Add USE_UBSAN
2021-01-29 23:06:00 +00:00
if(USE_UBSAN)
message("Undefined behaviour sanitizer enabled (DEBUG only)")
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -fsanitize=undefined")
set(CMAKE_LINKER_FLAGS_DEBUG "${CMAKE_LINKER_FLAGS_DEBUG} -fsanitize=undefined")
CMake: Fix UBSAN link error
2021-01-29 23:29:54 +00:00
# UBSAN is a collection of sanitizers, including vtpr, which reqiuires RTTI.
# ext/glslang disables RTTI by default using the `ENABLE_RTTI` option.
# If RTTI is disabled, we must also disable the vtpr sanitizer.
if(NOT ENABLE_RTTI)
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -fno-sanitize=vptr")
set(CMAKE_LINKER_FLAGS_DEBUG "${CMAKE_LINKER_FLAGS_DEBUG} -fno-sanitize=vptr")
endif()
CMake: Add USE_UBSAN
2021-01-29 23:06:00 +00:00
endif()
b.sh: Add a build option for address sanitizer. When enabled, we turn on some compatibility options to make it work right.
2018-01-31 13:22:38 +00:00
Fix a mistake with cflags reorg
2017-03-15 14:56:06 +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")
There's little reason to build at O3, so let's just not. Changing to O2. See #13920 for a breakage report.
2021-01-17 09:43:21 +00:00
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O2 -D_NDEBUG")
Fix a mistake with cflags reorg
2017-03-15 14:56:06 +00:00
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")
There's little reason to build at O3, so let's just not. Changing to O2. See #13920 for a breakage report.
2021-01-17 09:43:21 +00:00
set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -O2 -D_NDEBUG")
Fix a mistake with cflags reorg
2017-03-15 14:56:06 +00:00
set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -O2 -g -D_NDEBUG")
Build: Remove force include CMake line. This reverts commit e29bb7bcdfbb1a966371f5d6cc6ecd0301f88735.
2021-03-03 08:00:23 +00:00
Add -Wformat (see issue #15792), no idea if ok. Unfamiliar with CMake, just added a couple of lines at relevant-looking place. I did, at least, test that is compiles (and enables that flag) on my machine.
2022-08-07 13:12:58 +00:00
# Enable checking printf-like format strings (also works for logging functions)
add_definitions(-Wformat)
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)
Pick some safe changes from the android gradle branch (including windows CMake fixes)
2016-12-05 15:51:28 +00:00
# Don't compile with strict aliasing, we're not 100% aliasing-safe
fix mingw and msvc cmake builds.
2018-03-23 02:18:13 +00:00
add_compile_options(-fno-strict-aliasing)
Core: Format CMakeLists.txt consistently.
2018-10-28 18:33:25 +00:00
if(${CMAKE_C_COMPILER_ID} STREQUAL "Intel")
Command line warning fix on intel compiler under Linux.
2013-05-30 12:26:43 +00:00
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
CMakelist cleanup, might buildfix things on Linux Clang
2017-03-16 09:16:29 +00:00
if(X86 OR X86_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
# enable sse2 code generation
add_definitions(-msse2)
Add -mfpmath=sse to CMakeLists.txt Only affects x86+32bit+gcc combo.
2023-03-22 13:51:16 +00:00
if(NOT X86_64 AND NOT CLANG)
add_definitions(-mfpmath=sse)
# add_definitions(-mstackrealign)
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
endif()
Build fix for iOS. Now compiles.
2013-02-24 12:17:52 +00:00
if(IOS)
Build: Raise macOS/iOS min version for c++17.
2022-10-01 15:01:01 +00:00
set(CMAKE_OSX_DEPLOYMENT_TARGET "11.0")
cmake: Move some platform configuration to a toolchain file
2016-10-11 01:27:38 +00:00
elseif(APPLE AND NOT CMAKE_CROSSCOMPILING)
Hopefully last libretro mac build fix.
2023-02-01 23:39:42 +00:00
if(LIBRETRO AND ARM64)
set(CMAKE_OSX_DEPLOYMENT_TARGET "10.14")
else()
set(CMAKE_OSX_DEPLOYMENT_TARGET "10.13")
endif()
Clear legacy flags
2021-10-13 01:53:14 +00:00
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++ -U__STRICT_ANSI__")
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++")
Add Gradle build. This time, we don't remove the old build system and we don't switch Travis.
2017-03-13 22:45:25 +00:00
elseif(NOT ANDROID)
CMakelist cleanup, might buildfix things on Linux Clang
2017-03-16 09:16:29 +00:00
# TODO: See if we can get rid of no-psabi
Build: Correct AppleClang warning handling.
2021-12-11 18:45:05 +00:00
if(NOT ${CMAKE_C_COMPILER_ID} STREQUAL "Intel" AND NOT ${CMAKE_CXX_COMPILER_ID} MATCHES "Clang")
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(-Wno-psabi)
endif()
blackberry: Remove!
2016-10-11 15:34:19 +00:00
add_definitions(-D_XOPEN_SOURCE=700)
Blackberry: Fix build. Blackberry doesn't support XOPEN_SOURCE=700.
2015-06-17 07:32:13 +00:00
add_definitions(-D_XOPEN_SOURCE_EXTENDED -D__BSD_VISIBLE=1)
CMake: Fix up optimisations (broken for everyone except Apple?), move some Blackberry lines to toolchain, enable assembly, use add_definitions for definitions and *flags for flags, remove redundant lines.
2014-06-11 13:02:56 +00:00
add_definitions(-D_LARGEFILE64_SOURCE=1 -D_FILE_OFFSET_BITS=64)
Add Gradle build. This time, we don't remove the old build system and we don't switch Travis.
2017-03-13 22:45:25 +00:00
elseif(ANDROID)
add_definitions(-fsigned-char)
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()
else()
# Disable warnings about MS-specific _s variants of libc functions
add_definitions(-D_CRT_SECURE_NO_WARNINGS)
Fix build with clang-cl
2020-08-13 14:48:48 +00:00
if (NOT CLANG)
add_compile_options(-MP)
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_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()
fix mingw and msvc cmake builds.
2018-03-23 02:18:13 +00:00
if(WIN32)
nits.
2018-03-24 12:39:05 +00:00
add_definitions(-D_UNICODE -DUNICODE)
add_definitions(-DUSING_WIN_UI)
fix mingw and msvc cmake builds.
2018-03-23 02:18:13 +00:00
endif()
Add Gradle build. This time, we don't remove the old build system and we don't switch Travis.
2017-03-13 22:45:25 +00:00
if(NOT ANDROID)
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(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib")
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib")
Add Gradle build. This time, we don't remove the old build system and we don't switch Travis.
2017-03-13 22:45:25 +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
# 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()
Fix Qt build by simply moving the offending file to the native project. No idea why Qt include paths only work there.
2020-10-05 08:19:04 +00:00
add_subdirectory(ext)
if(WIN32)
include_directories(dx9sdk/Include)
include_directories(dx9sdk/Include/DX11)
endif()
Fix dependency of RISC-V targets on common JIT code Fixes #15861
2022-08-18 14:41:53 +00:00
set(CommonJIT
Core/MIPS/JitCommon/JitCommon.cpp
Core/MIPS/JitCommon/JitCommon.h
Core/MIPS/JitCommon/JitBlockCache.cpp
Core/MIPS/JitCommon/JitBlockCache.h
Core/MIPS/JitCommon/JitState.cpp
Core/MIPS/JitCommon/JitState.h
)
cmake: Use preprocessor for conditional compilation in Common CommonExtra is gone! Still need to fix CommonFake later though.
2016-10-11 01:26:33 +00:00
set(CommonX86
Common/ABI.cpp
Common/ABI.h
Common/CPUDetect.cpp
Common/CPUDetect.h
Common/Thunk.cpp
Common/Thunk.h
Common/x64Analyzer.cpp
Common/x64Analyzer.h
Common/x64Emitter.cpp
Core: Format CMakeLists.txt consistently.
2018-10-28 18:33:25 +00:00
Common/x64Emitter.h
)
cmake: Use preprocessor for conditional compilation in Common CommonExtra is gone! Still need to fix CommonFake later though.
2016-10-11 01:26:33 +00:00
source_group(x86 FILES ${CommonX86})
set(CommonARM
Common/ArmCPUDetect.cpp
Common/ArmEmitter.h
Common/ArmEmitter.cpp
Core: Format CMakeLists.txt consistently.
2018-10-28 18:33:25 +00:00
)
cmake: Use preprocessor for conditional compilation in Common CommonExtra is gone! Still need to fix CommonFake later though.
2016-10-11 01:26:33 +00:00
source_group(ARM FILES ${CommonARM})
set(CommonARM64
Common/Arm64Emitter.h
Common/Arm64Emitter.cpp
Common/ArmEmitter.h
Common/ArmEmitter.cpp
riscv: Add disassembler. From https://github.com/anthony-coulter/riscv-disassembler. Modified slightly to pull in less headers in the h, prefix funcs.
2022-12-30 19:36:32 +00:00
Core/Util/DisArm64.h
Core: Format CMakeLists.txt consistently.
2018-10-28 18:33:25 +00:00
Core/Util/DisArm64.cpp
)
cmake: Use preprocessor for conditional compilation in Common CommonExtra is gone! Still need to fix CommonFake later though.
2016-10-11 01:26:33 +00:00
source_group(ARM64 FILES ${CommonARM64})
set(CommonMIPS
Common/MipsCPUDetect.cpp
Common/MipsEmitter.cpp
Core: Format CMakeLists.txt consistently.
2018-10-28 18:33:25 +00:00
Common/MipsEmitter.h
)
cmake: Use preprocessor for conditional compilation in Common CommonExtra is gone! Still need to fix CommonFake later though.
2016-10-11 01:26:33 +00:00
source_group(MIPS FILES ${CommonMIPS})
Include FakeJit in RISC-V build
2021-06-29 11:46:17 +00:00
set(CommonRISCV64
Fix dependency of RISC-V targets on common JIT code Fixes #15861
2022-08-18 14:41:53 +00:00
${CommonJIT}
RISC-V CPU detect
2021-07-28 11:58:56 +00:00
Common/RiscVCPUDetect.cpp
riscv: Add initial emitter shell.
2022-08-24 17:12:49 +00:00
Common/RiscVEmitter.cpp
Common/RiscVEmitter.h
Include FakeJit in RISC-V build
2021-06-29 11:46:17 +00:00
Core/MIPS/fake/FakeJit.cpp
Core/MIPS/fake/FakeJit.h
)
source_group(RISCV64 FILES ${CommonRISCV64})
Move most GPU things to Common. It works after the move, on Windows and Android at least. Deletes the D3DX9 shader compiler loader, which was not used.
2020-10-04 21:24:14 +00:00
if(WIN32)
set(CommonD3D
Common/GPU/D3D9/D3D9ShaderCompiler.cpp
Common/GPU/D3D9/D3D9ShaderCompiler.h
Common/GPU/D3D9/D3D9StateCache.cpp
Common/GPU/D3D9/D3D9StateCache.h
Common/GPU/D3D9/thin3d_d3d9.cpp
Common/GPU/D3D9/D3DCompilerLoader.cpp
Common/GPU/D3D11/thin3d_d3d11.cpp
Common/GPU/D3D11/D3D11Loader.cpp
Common/GPU/D3D11/D3D11Loader.h
)
endif()
Pick some safe changes from the android gradle branch (including windows CMake fixes)
2016-12-05 15:51:28 +00:00
CMakeLists.txt fix
2022-10-17 17:25:55 +00:00
set(CommonVR
Add a dynamic loader for OpenXR so the VR code can link. Make it all build on Windows.
2022-11-06 14:37:58 +00:00
Common/VR/OpenXRLoader.cpp
Common/VR/OpenXRLoader.h
CMakeLists.txt fix
2022-10-17 17:25:55 +00:00
Common/VR/PPSSPPVR.cpp
Common/VR/PPSSPPVR.h
Common/VR/VRBase.cpp
Common/VR/VRBase.h
Common/VR/VRFramebuffer.cpp
Common/VR/VRFramebuffer.h
Common/VR/VRInput.cpp
Common/VR/VRInput.h
Common/VR/VRMath.cpp
Common/VR/VRMath.h
Common/VR/VRRenderer.cpp
Common/VR/VRRenderer.h
)
include_directories(ext/openxr)
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(Common STATIC
cmake: Use preprocessor for conditional compilation in Common CommonExtra is gone! Still need to fix CommonFake later though.
2016-10-11 01:26:33 +00:00
${CommonX86}
${CommonARM}
${CommonARM64}
${CommonMIPS}
Include FakeJit in RISC-V build
2021-06-29 11:46:17 +00:00
${CommonRISCV64}
Move most GPU things to Common. It works after the move, on Windows and Android at least. Deletes the D3DX9 shader compiler loader, which was not used.
2020-10-04 21:24:14 +00:00
${CommonD3D}
CMakeLists.txt fix
2022-10-17 17:25:55 +00:00
${CommonVR}
SaveState: Rename ChunkFile files to Serialize. Makes more sense and less weird than ChunkFileDoMap, etc.
2020-08-10 07:12:51 +00:00
Common/Serialize/Serializer.cpp
Common/Serialize/Serializer.h
Common/Serialize/SerializeDeque.h
Common/Serialize/SerializeFuncs.h
Common/Serialize/SerializeList.h
Common/Serialize/SerializeMap.h
Common/Serialize/SerializeSet.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/Crypto/md5.cpp
Common/Crypto/md5.h
Common/Crypto/sha1.cpp
Common/Crypto/sha1.h
Implement sceSha256Digest (untested)
2014-12-07 18:25:45 +00:00
Common/Crypto/sha256.cpp
Common/Crypto/sha256.h
Move native/util, native/data and native/i18 to Common/Data. Also move colorutil.cpp/h linking build fix experiment Delete a bunch of unused CMakeLists.txt files CMakeLists.txt linking fix Don't include NativeApp.h from any headers. Android.mk buildfix Half of the UWP fix Buildfix Minor project file cleanup Buildfixes Guess what? More buildfixes!
2020-10-01 11:05:04 +00:00
Common/Data/Collections/ConstMap.h
Remove Timer.cpp/h. Move various collections into Common/Data/Collections.
2020-10-05 18:58:33 +00:00
Common/Data/Collections/FixedSizeQueue.h
Common/Data/Collections/Hashmaps.h
Move native/util, native/data and native/i18 to Common/Data. Also move colorutil.cpp/h linking build fix experiment Delete a bunch of unused CMakeLists.txt files CMakeLists.txt linking fix Don't include NativeApp.h from any headers. Android.mk buildfix Half of the UWP fix Buildfix Minor project file cleanup Buildfixes Guess what? More buildfixes!
2020-10-01 11:05:04 +00:00
Common/Data/Collections/TinySet.h
Remove Timer.cpp/h. Move various collections into Common/Data/Collections.
2020-10-05 18:58:33 +00:00
Common/Data/Collections/ThreadSafeList.h
Move native/util, native/data and native/i18 to Common/Data. Also move colorutil.cpp/h linking build fix experiment Delete a bunch of unused CMakeLists.txt files CMakeLists.txt linking fix Don't include NativeApp.h from any headers. Android.mk buildfix Half of the UWP fix Buildfix Minor project file cleanup Buildfixes Guess what? More buildfixes!
2020-10-01 11:05:04 +00:00
Common/Data/Color/RGBAUtil.cpp
Common/Data/Color/RGBAUtil.h
Common: Move ColorConv to a more appropriate place.
2021-05-01 14:15:04 +00:00
Common/Data/Convert/ColorConv.cpp
Common/Data/Convert/ColorConv.h
Move math and some file and data conversion files out from native to Common. Buildfixing Move some file util files Buildfix Move KeyMap.cpp/h to Core where they belong better. libretro buildfix attempt Move ini_file More buildfixes
2020-10-03 22:25:21 +00:00
Common/Data/Convert/SmallDataConvert.cpp
Common/Data/Convert/SmallDataConvert.h
Move native/util, native/data and native/i18 to Common/Data. Also move colorutil.cpp/h linking build fix experiment Delete a bunch of unused CMakeLists.txt files CMakeLists.txt linking fix Don't include NativeApp.h from any headers. Android.mk buildfix Half of the UWP fix Buildfix Minor project file cleanup Buildfixes Guess what? More buildfixes!
2020-10-01 11:05:04 +00:00
Common/Data/Encoding/Base64.cpp
Common/Data/Encoding/Base64.h
Common/Data/Encoding/Compression.cpp
Common/Data/Encoding/Compression.h
Common/Data/Encoding/Shiftjis.h
Common/Data/Encoding/Utf8.cpp
Common/Data/Encoding/Utf8.h
Common/Data/Encoding/Utf16.h
Move math and some file and data conversion files out from native to Common. Buildfixing Move some file util files Buildfix Move KeyMap.cpp/h to Core where they belong better. libretro buildfix attempt Move ini_file More buildfixes
2020-10-03 22:25:21 +00:00
Common/Data/Format/RIFF.cpp
Common/Data/Format/RIFF.h
Common/Data/Format/IniFile.cpp
Common/Data/Format/IniFile.h
Common.h shouldn't include Log.h. Buildfixes More buildfixes. Move JSON code to common.
2020-10-04 07:29:36 +00:00
Common/Data/Format/JSONReader.h
Common/Data/Format/JSONReader.cpp
Common/Data/Format/JSONWriter.h
Common/Data/Format/JSONWriter.cpp
Structs and enums and build files
2023-02-26 18:51:59 +00:00
Common/Data/Format/DDSLoad.cpp
Common/Data/Format/DDSLoad.h
Move fileutil, net, image loaders, ui to Common. (#13506) * Move and rename file_util/fd_util to Common/File/FileUtil and DirListing Let's also move net while we're at it. Move the ZIM/PNG loaders over to Common. Move the UI framework into Common iOS buildfix * Buildfix * Buildfixes * Apple buildfix * This typo again.. * UWP buildfix * Fix build of PPSSPPQt, such as it is (it's not in good condition...) * Guess what? Another buildfix.
2020-10-04 18:48:47 +00:00
Common/Data/Format/PNGLoad.cpp
Common/Data/Format/PNGLoad.h
Common/Data/Format/ZIMLoad.cpp
Common/Data/Format/ZIMLoad.h
Common/Data/Format/ZIMSave.cpp
Common/Data/Format/ZIMSave.h
Move native/util, native/data and native/i18 to Common/Data. Also move colorutil.cpp/h linking build fix experiment Delete a bunch of unused CMakeLists.txt files CMakeLists.txt linking fix Don't include NativeApp.h from any headers. Android.mk buildfix Half of the UWP fix Buildfix Minor project file cleanup Buildfixes Guess what? More buildfixes!
2020-10-01 11:05:04 +00:00
Common/Data/Hash/Hash.cpp
Common/Data/Hash/Hash.h
Common/Data/Text/I18n.cpp
Common/Data/Text/I18n.h
Common/Data/Text/Parsers.cpp
Common/Data/Text/Parsers.h
Common/Data/Text/WrapText.cpp
Common/Data/Text/WrapText.h
Common/Data/Random/Rng.h
Move math and some file and data conversion files out from native to Common. Buildfixing Move some file util files Buildfix Move KeyMap.cpp/h to Core where they belong better. libretro buildfix attempt Move ini_file More buildfixes
2020-10-03 22:25:21 +00:00
Common/File/VFS/VFS.h
Common/File/VFS/VFS.cpp
Renaming and file splitting
2023-03-06 14:30:39 +00:00
Common/File/VFS/ZipFileReader.cpp
Common/File/VFS/ZipFileReader.h
Common/File/VFS/DirectoryReader.cpp
Common/File/VFS/DirectoryReader.h
Split out AndroidStorage.cpp from android/jni/app-android.cpp, move to Common
2021-06-05 17:29:23 +00:00
Common/File/AndroidStorage.h
Common/File/AndroidStorage.cpp
Move math and some file and data conversion files out from native to Common. Buildfixing Move some file util files Buildfix Move KeyMap.cpp/h to Core where they belong better. libretro buildfix attempt Move ini_file More buildfixes
2020-10-03 22:25:21 +00:00
Common/File/DiskFree.h
Common/File/DiskFree.cpp
Introduce Path, start using it all over the place. Still lots left to convert! Convert GetSysDirectory to return Path. More buildfixing Remove unnecessary Path( constructors
2021-05-05 23:31:38 +00:00
Common/File/Path.h
Common/File/Path.cpp
Move math and some file and data conversion files out from native to Common. Buildfixing Move some file util files Buildfix Move KeyMap.cpp/h to Core where they belong better. libretro buildfix attempt Move ini_file More buildfixes
2020-10-03 22:25:21 +00:00
Common/File/PathBrowser.h
Common/File/PathBrowser.cpp
Move fileutil, net, image loaders, ui to Common. (#13506) * Move and rename file_util/fd_util to Common/File/FileUtil and DirListing Let's also move net while we're at it. Move the ZIM/PNG loaders over to Common. Move the UI framework into Common iOS buildfix * Buildfix * Buildfixes * Apple buildfix * This typo again.. * UWP buildfix * Fix build of PPSSPPQt, such as it is (it's not in good condition...) * Guess what? Another buildfix.
2020-10-04 18:48:47 +00:00
Common/File/FileUtil.cpp
Common/File/FileUtil.h
Common/File/DirListing.cpp
Common/File/DirListing.h
Common/File/FileDescriptor.cpp
Common/File/FileDescriptor.h
Move most GPU things to Common. It works after the move, on Windows and Android at least. Deletes the D3DX9 shader compiler loader, which was not used.
2020-10-04 21:24:14 +00:00
Common/GPU/DataFormat.h
Replace the "GetCurrentStepId"-based state invalidation with callbacks
2022-11-24 09:38:49 +00:00
Common/GPU/MiscTypes.h
Move most GPU things to Common. It works after the move, on Windows and Android at least. Deletes the D3DX9 shader compiler loader, which was not used.
2020-10-04 21:24:14 +00:00
Common/GPU/thin3d.cpp
Common/GPU/thin3d.h
Common/GPU/thin3d_create.h
Move ShaderWriter to Common/GPU, along with some stuff from ShaderCommon.h.
2020-11-04 08:18:35 +00:00
Common/GPU/Shader.cpp
Common/GPU/Shader.h
Common/GPU/ShaderWriter.cpp
Common/GPU/ShaderWriter.h
Move ShaderTranslation.cpp/h to Common/GPU.
2020-11-09 08:00:06 +00:00
Common/GPU/ShaderTranslation.h
Common/GPU/ShaderTranslation.cpp
Move most GPU things to Common. It works after the move, on Windows and Android at least. Deletes the D3DX9 shader compiler loader, which was not used.
2020-10-04 21:24:14 +00:00
Common/GPU/OpenGL/GLCommon.h
Common/GPU/OpenGL/GLDebugLog.cpp
Common/GPU/OpenGL/GLDebugLog.h
Common/GPU/OpenGL/GLSLProgram.cpp
Common/GPU/OpenGL/GLSLProgram.h
Common/GPU/OpenGL/gl3stub.c
Common/GPU/OpenGL/gl3stub.h
Common/GPU/OpenGL/GLFeatures.cpp
Common/GPU/OpenGL/GLFeatures.h
Move GLFrameData out of GLRenderManager. Small refactor to prepare for adding delayed readback support to the OpenGL backend.
2023-02-06 09:46:52 +00:00
Common/GPU/OpenGL/GLFrameData.cpp
Common/GPU/OpenGL/GLFrameData.h
Move most GPU things to Common. It works after the move, on Windows and Android at least. Deletes the D3DX9 shader compiler loader, which was not used.
2020-10-04 21:24:14 +00:00
Common/GPU/OpenGL/thin3d_gl.cpp
Common/GPU/OpenGL/GLRenderManager.cpp
Common/GPU/OpenGL/GLRenderManager.h
Common/GPU/OpenGL/GLQueueRunner.cpp
Common/GPU/OpenGL/GLQueueRunner.h
Common/GPU/OpenGL/DataFormatGL.cpp
Common/GPU/OpenGL/DataFormatGL.h
Add utility class VulkanBarrier
2022-05-01 08:18:55 +00:00
Common/GPU/Vulkan/VulkanBarrier.cpp
Common/GPU/Vulkan/VulkanBarrier.h
Move most GPU things to Common. It works after the move, on Windows and Android at least. Deletes the D3DX9 shader compiler loader, which was not used.
2020-10-04 21:24:14 +00:00
Common/GPU/Vulkan/VulkanDebug.cpp
Common/GPU/Vulkan/VulkanDebug.h
Common/GPU/Vulkan/VulkanContext.cpp
Common/GPU/Vulkan/VulkanContext.h
Break out VKRFramebuffer/VKRRenderpass from VulkanRenderManager
2022-11-27 09:22:37 +00:00
Common/GPU/Vulkan/VulkanFramebuffer.cpp
Common/GPU/Vulkan/VulkanFramebuffer.h
Move most GPU things to Common. It works after the move, on Windows and Android at least. Deletes the D3DX9 shader compiler loader, which was not used.
2020-10-04 21:24:14 +00:00
Common/GPU/Vulkan/VulkanImage.cpp
Common/GPU/Vulkan/VulkanImage.h
Common/GPU/Vulkan/VulkanLoader.cpp
Common/GPU/Vulkan/VulkanLoader.h
Common/GPU/Vulkan/VulkanMemory.cpp
Common/GPU/Vulkan/VulkanMemory.h
Add a simple GPU profiler to profile individual events, rather than full passes.
2021-12-12 10:34:05 +00:00
Common/GPU/Vulkan/VulkanProfiler.cpp
Common/GPU/Vulkan/VulkanProfiler.h
Move most GPU things to Common. It works after the move, on Windows and Android at least. Deletes the D3DX9 shader compiler loader, which was not used.
2020-10-04 21:24:14 +00:00
Common/GPU/Vulkan/thin3d_vulkan.cpp
Common/GPU/Vulkan/VulkanRenderManager.cpp
Common/GPU/Vulkan/VulkanRenderManager.h
Common/GPU/Vulkan/VulkanQueueRunner.cpp
Common/GPU/Vulkan/VulkanQueueRunner.h
Move FrameData out of VulkanRenderManager
2022-09-16 23:34:38 +00:00
Common/GPU/Vulkan/VulkanFrameData.cpp
Common/GPU/Vulkan/VulkanFrameData.h
Move input utilities from native to Common/Input.
2020-10-01 07:36:43 +00:00
Common/Input/GestureDetector.cpp
Common/Input/GestureDetector.h
Common/Input/KeyCodes.h
Common/Input/InputState.cpp
Common/Input/InputState.h
Move math and some file and data conversion files out from native to Common. Buildfixing Move some file util files Buildfix Move KeyMap.cpp/h to Core where they belong better. libretro buildfix attempt Move ini_file More buildfixes
2020-10-03 22:25:21 +00:00
Common/Math/fast/fast_matrix.c
Common/Math/curves.cpp
Common/Math/curves.h
Common/Math/expression_parser.cpp
Common/Math/expression_parser.h
Common/Math/lin/matrix4x4.cpp
Common/Math/lin/matrix4x4.h
Common/Math/lin/vec3.cpp
Common/Math/lin/vec3.h
Common/Math/math_util.cpp
Common/Math/math_util.h
Track min and max GPU time, init time, render CPU time. Mainly wanted to see if init time is a factor, there are optimizations we can do there.
2022-10-10 08:53:27 +00:00
Common/Math/Statistics.h
Common/Math/Statistics.cpp
Move fileutil, net, image loaders, ui to Common. (#13506) * Move and rename file_util/fd_util to Common/File/FileUtil and DirListing Let's also move net while we're at it. Move the ZIM/PNG loaders over to Common. Move the UI framework into Common iOS buildfix * Buildfix * Buildfixes * Apple buildfix * This typo again.. * UWP buildfix * Fix build of PPSSPPQt, such as it is (it's not in good condition...) * Guess what? Another buildfix.
2020-10-04 18:48:47 +00:00
Common/Net/HTTPClient.cpp
Common/Net/HTTPClient.h
Common/Net/HTTPHeaders.cpp
Common/Net/HTTPHeaders.h
Common/Net/HTTPServer.cpp
Common/Net/HTTPServer.h
http: Separate out net buffer code from formatting.
2021-05-01 15:36:25 +00:00
Common/Net/NetBuffer.cpp
Common/Net/NetBuffer.h
Move fileutil, net, image loaders, ui to Common. (#13506) * Move and rename file_util/fd_util to Common/File/FileUtil and DirListing Let's also move net while we're at it. Move the ZIM/PNG loaders over to Common. Move the UI framework into Common iOS buildfix * Buildfix * Buildfixes * Apple buildfix * This typo again.. * UWP buildfix * Fix build of PPSSPPQt, such as it is (it's not in good condition...) * Guess what? Another buildfix.
2020-10-04 18:48:47 +00:00
Common/Net/Resolve.cpp
Common/Net/Resolve.h
Common/Net/Sinks.cpp
Common/Net/Sinks.h
Common/Net/URL.cpp
Common/Net/URL.h
Common/Net/WebsocketServer.cpp
Common/Net/WebsocketServer.h
Move the profiler to Common
2020-10-04 08:04:01 +00:00
Common/Profiler/Profiler.cpp
Common/Profiler/Profiler.h
Move most GPU things to Common. It works after the move, on Windows and Android at least. Deletes the D3DX9 shader compiler loader, which was not used.
2020-10-04 21:24:14 +00:00
Common/Render/TextureAtlas.cpp
Common/Render/TextureAtlas.h
Common/Render/DrawBuffer.cpp
Common/Render/DrawBuffer.h
Move AsyncImageFileView to Common, which required some more shuffling around of stuff.
2022-11-21 19:15:22 +00:00
Common/Render/ManagedTexture.cpp
Common/Render/ManagedTexture.h
Move text rendering to Common.
2020-10-04 22:05:28 +00:00
Common/Render/Text/draw_text.cpp
Common/Render/Text/draw_text.h
Common/Render/Text/draw_text_android.cpp
Common/Render/Text/draw_text_android.h
Common/Render/Text/draw_text_win.cpp
Common/Render/Text/draw_text_win.h
Common/Render/Text/draw_text_uwp.cpp
Common/Render/Text/draw_text_uwp.h
Move Display.cpp/h to Common.
2020-10-04 08:10:55 +00:00
Common/System/Display.cpp
Common/System/Display.h
Replace the inputbox queue with a more generic RequestManager.
2023-03-22 11:26:14 +00:00
Common/System/System.h
Common/System/NativeApp.h
Common/System/Request.cpp
Common/System/Request.h
Implement new thread manager, port stuff to it.
2020-11-27 23:12:06 +00:00
Common/Thread/Channel.h
Common/Thread/ParallelLoop.cpp
Common/Thread/ParallelLoop.h
Common/Thread/Promise.h
Move threading utils from native to Common
2020-10-01 07:27:25 +00:00
Common/Thread/ThreadUtil.cpp
Common/Thread/ThreadUtil.h
Implement new thread manager, port stuff to it.
2020-11-27 23:12:06 +00:00
Common/Thread/ThreadManager.cpp
Common/Thread/ThreadManager.h
Move AsyncImageFileView to Common, which required some more shuffling around of stuff.
2022-11-21 19:15:22 +00:00
Common/UI/AsyncImageFileView.cpp
Common/UI/AsyncImageFileView.h
Move fileutil, net, image loaders, ui to Common. (#13506) * Move and rename file_util/fd_util to Common/File/FileUtil and DirListing Let's also move net while we're at it. Move the ZIM/PNG loaders over to Common. Move the UI framework into Common iOS buildfix * Buildfix * Buildfixes * Apple buildfix * This typo again.. * UWP buildfix * Fix build of PPSSPPQt, such as it is (it's not in good condition...) * Guess what? Another buildfix.
2020-10-04 18:48:47 +00:00
Common/UI/Root.cpp
Common/UI/Root.h
Common/UI/Screen.cpp
Common/UI/Screen.h
Common/UI/UI.cpp
Common/UI/UI.h
Common/UI/Context.cpp
Common/UI/Context.h
Common/UI/UIScreen.cpp
Common/UI/UIScreen.h
Common/UI/Tween.cpp
Common/UI/Tween.h
Common/UI/View.cpp
Common/UI/View.h
Common/UI/ViewGroup.cpp
Common/UI/ViewGroup.h
Break out ScrollView from ViewGroup.h, and PopupScreens from UIScreen.h
2023-01-11 09:36:00 +00:00
Common/UI/ScrollView.cpp
Common/UI/ScrollView.h
Common/UI/PopupScreens.cpp
Common/UI/PopupScreens.h
Finish getting rid of basictypes.h
2020-09-29 10:53:18 +00:00
Common/BitScan.h
Common/BitSet.h
Move buffer.cpp/h from base to Common
2020-09-29 11:02:02 +00:00
Common/Buffer.h
Common/Buffer.cpp
Finish getting rid of basictypes.h
2020-09-29 10:53:18 +00:00
Common/CodeBlock.h
Common/Common.h
Common/CommonFuncs.h
Common/CommonTypes.h
Common/ConsoleListener.cpp
Common/ConsoleListener.h
Common/DbgNew.h
Common/FakeEmitter.h
Build: Simplify by always including FakeCPUDetect.
2021-03-21 00:25:50 +00:00
Common/FakeCPUDetect.cpp
Simple exception handler so we can ignore accesses that happen within the PSP memory space.
2019-02-11 10:11:56 +00:00
Common/ExceptionHandlerSetup.cpp
Common/ExceptionHandlerSetup.h
Move MsgHandler into Log.cpp/h
2020-08-16 11:48:31 +00:00
Common/Log.h
Common/Log.cpp
MakeUnique.h in the CMakeLists.txt
2019-08-12 19:53:51 +00:00
Common/LogManager.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/LogManager.h
Reporting: Move message report interface to Common. This makes it so we can call reporting from Common.
2021-06-06 16:19:10 +00:00
Common/LogReporting.cpp
Common/LogReporting.h
The MemArena code has way too many ifdefs. Split it up by platform.
2017-01-25 14:43:24 +00:00
Common/MemArenaAndroid.cpp
Buildfix
2017-01-25 18:29:43 +00:00
Common/MemArenaDarwin.cpp
The MemArena code has way too many ifdefs. Split it up by platform.
2017-01-25 14:43:24 +00:00
Common/MemArenaPosix.cpp
Common/MemArenaWin32.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/MemArena.h
Common/MemoryUtil.cpp
Common/MemoryUtil.h
Hide the D3D11 backend if Windows version is older than Win8
2017-02-14 09:33:42 +00:00
Common/OSVersion.cpp
Common/OSVersion.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
Remove unnecessary use of thread local storage
2020-09-29 13:45:51 +00:00
Common/SysError.h
Common/SysError.cpp
Move timeutil to Common. (Experiment to see how much work it is to move these).
2020-08-15 18:53:08 +00:00
Common/TimeUtil.cpp
Common/TimeUtil.h
Support for showing % on Darwin platforms and some other changes
2023-01-27 08:19:29 +00:00
Common/Battery/Battery.h
Core: Format CMakeLists.txt consistently.
2018-10-28 18:33:25 +00:00
)
Update armips with regex workaround
2017-03-13 22:45:25 +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
include_directories(Common)
setup_target_project(Common Common)
Common: Add cpu_features library.
2023-01-29 21:02:36 +00:00
target_link_libraries(Common Ext::Snappy cpu_features)
cmake: Move some cmake includes to ext
2016-12-18 18:01:05 +00:00
CMake: Fix linking X11 when using EGL and not fbdev Co-authored-by: Unknown W. Brackets <checkins@unknownbrackets.org>
2018-11-06 17:31:05 +00:00
if(USING_GLES2 OR (USING_EGL AND NOT USING_FBDEV))
Add option to shared libzip and libsnappy in CMakeLists.txt.
2015-09-16 01:46:51 +00:00
find_package(X11)
endif()
Mac buildfix (the zlib include path made it include the system glew)
2013-12-05 15:24:40 +00:00
json: Switch to gason instead of vjson. From the same author. Most importantly, reads numbers as doubles rather than as signed ints and floats. This allows us to actually read 32 bit unsigned int parameters. Moved all the native customization to a separate json_reader.cpp.
2018-04-15 18:24:10 +00:00
add_library(gason STATIC
Fix Qt build by simply moving the offending file to the native project. No idea why Qt include paths only work there.
2020-10-05 08:19:04 +00:00
ext/gason/gason.cpp
ext/gason/gason.h
Buildfix cmake
2013-11-26 17:18:30 +00:00
)
Buildfixes
2021-11-22 18:53:00 +00:00
add_library(vma STATIC
ext/vma/vk_mem_alloc.cpp
ext/vma/vk_mem_alloc.h
)
Fix Qt build by simply moving the offending file to the native project. No idea why Qt include paths only work there.
2020-10-05 08:19:04 +00:00
Try to dynamically link against system ffmpeg when possible
2015-06-01 13:29:54 +00:00
if(USE_FFMPEG)
Core: Format CMakeLists.txt consistently.
2018-10-28 18:33:25 +00:00
if(NOT FFMPEG_DIR)
if(NOT USE_SYSTEM_FFMPEG)
if(ANDROID)
if(ARMV7)
set(PLATFORM_ARCH "android/armv7")
elseif(ARM64)
set(PLATFORM_ARCH "android/arm64")
elseif(X86_64)
set(PLATFORM_ARCH "android/x86_64")
elseif(X86)
set(PLATFORM_ARCH "android/x86")
endif()
elseif(IOS)
set(PLATFORM_ARCH "ios/universal")
elseif(MACOSX)
Make universal binary version of ffmpeg work. (#13457) * Make universal binary version of ffmpeg work. * Update ffmpeg * Update ffmpeg dependancy.
2020-12-01 23:25:48 +00:00
set(PLATFORM_ARCH "macosx/universal")
Core: Format CMakeLists.txt consistently.
2018-10-28 18:33:25 +00:00
elseif(LINUX)
if(ARMV7)
set(PLATFORM_ARCH "linux/armv7")
elseif(ARM64)
set(PLATFORM_ARCH "linux/aarch64")
elseif(ARM)
set(PLATFORM_ARCH "linux/arm")
elseif(MIPS)
set(PLATFORM_ARCH "linux/mips32")
Update CMakeLists.txt
2021-06-24 18:56:43 +00:00
elseif(RISCV64)
set(PLATFORM_ARCH "linux/riscv64")
Core: Format CMakeLists.txt consistently.
2018-10-28 18:33:25 +00:00
elseif(CMAKE_SIZEOF_VOID_P EQUAL 8)
set(PLATFORM_ARCH "linux/x86_64")
elseif(X86)
set(PLATFORM_ARCH "linux/x86")
endif()
elseif(WIN32)
if(X86_64)
set(PLATFORM_ARCH "Windows/x86_64")
elseif(X86)
set(PLATFORM_ARCH "Windows/x86")
endif()
endif()
if(PLATFORM_ARCH)
set(FFMPEG_DIR "ffmpeg/${PLATFORM_ARCH}")
else()
message("Couldn't find an internal FFmpeg build, using system FFmpeg instead")
endif()
endif()
endif()
find_package(FFmpeg REQUIRED avcodec avformat avutil swresample swscale)
Another attempt at reordering stuff in the CMakeLists.txt. So fragile.
2013-12-06 11:08:19 +00:00
endif(USE_FFMPEG)
find_package(ZLIB)
Add Gradle build. This time, we don't remove the old build system and we don't switch Travis.
2017-03-13 22:45:25 +00:00
if(ZLIB_FOUND AND NOT ANDROID)
Another attempt at reordering stuff in the CMakeLists.txt. So fragile.
2013-12-06 11:08:19 +00:00
include_directories(${ZLIB_INCLUDE_DIR})
Improve detection of for shared libs in both sdl and Qt (zlib, libzip, snappy and glew).
2015-09-16 03:59:31 +00:00
add_definitions(-DSHARED_ZLIB)
Another attempt at reordering stuff in the CMakeLists.txt. So fragile.
2013-12-06 11:08:19 +00:00
else()
add_library(zlib STATIC
ext/zlib/adler32.c
ext/zlib/compress.c
ext/zlib/crc32.c
ext/zlib/crc32.h
ext/zlib/deflate.c
ext/zlib/deflate.h
ext/zlib/gzclose.c
ext/zlib/gzguts.h
ext/zlib/gzlib.c
ext/zlib/gzread.c
ext/zlib/gzwrite.c
ext/zlib/infback.c
ext/zlib/inffast.c
ext/zlib/inffast.h
ext/zlib/inffixed.h
ext/zlib/inflate.c
ext/zlib/inflate.h
ext/zlib/inftrees.c
ext/zlib/inftrees.h
ext/zlib/make_vms.com
ext/zlib/trees.c
ext/zlib/trees.h
ext/zlib/uncompr.c
ext/zlib/zconf.h
ext/zlib/zlib.h
ext/zlib/zutil.c
ext/zlib/zutil.h
)
include_directories(ext/zlib)
set(ZLIB_LIBRARY zlib)
endif()
Add CityHash back to Linux/iOS/etc. This reverts commit ecfe43c1493d6cfec4e4af99f74ea7d286cf33de.
2013-12-14 23:46:11 +00:00
add_library(cityhash STATIC
Merge ext/native/ext/... directly into ext.
2020-09-29 21:59:05 +00:00
ext/cityhash/city.cpp
ext/cityhash/city.h
ext/cityhash/citycrc.h
Add CityHash back to Linux/iOS/etc. This reverts commit ecfe43c1493d6cfec4e4af99f74ea7d286cf33de.
2013-12-14 23:46:11 +00:00
)
Build: Reduce include spam in CMake. This makes it more like other platforms, which don't globally include these directories.
2022-12-04 16:07:53 +00:00
target_include_directories(cityhash PRIVATE ext/cityhash)
Another attempt at reordering stuff in the CMakeLists.txt. So fragile.
2013-12-06 11:08:19 +00:00
Core: Format CMakeLists.txt consistently.
2018-10-28 18:33:25 +00:00
if(NOT MSVC)
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
# These can be fast even for debug.
There's little reason to build at O3, so let's just not. Changing to O2. See #13920 for a breakage report.
2021-01-17 09:43:21 +00:00
set_target_properties(udis86 PROPERTIES COMPILE_FLAGS "-O2")
set_target_properties(cityhash PROPERTIES COMPILE_FLAGS "-O2")
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 ZLIB_FOUND)
There's little reason to build at O3, so let's just not. Changing to O2. See #13920 for a breakage report.
2021-01-17 09:43:21 +00:00
set_target_properties(zlib PROPERTIES COMPILE_FLAGS "-O2")
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
endif()
endif()
cmake: Silence warning.
2021-01-05 14:38:06 +00:00
find_package(LIBZIP)
Add an option to use the system libzip, to please grumpy package maintainers. This reverts commit 1a34f8833119c7b35a3b9d599b723ddd4c55c35a.
2018-02-07 11:09:06 +00:00
if(LIBZIP_FOUND AND USE_SYSTEM_LIBZIP)
add_definitions(-DSHARED_LIBZIP)
else()
add_library(libzip STATIC
Merge ext/native/ext/... directly into ext.
2020-09-29 21:59:05 +00:00
ext/libzip/zip_add.c
ext/libzip/zip_add_dir.c
Update libzip to 1.7.3.
2021-05-10 02:58:30 +00:00
ext/libzip/zip_add_entry.c
ext/libzip/zip_algorithm_deflate.c
ext/libzip/zip_buffer.c
Merge ext/native/ext/... directly into ext.
2020-09-29 21:59:05 +00:00
ext/libzip/zip_close.c
ext/libzip/zip_delete.c
Update libzip to 1.7.3.
2021-05-10 02:58:30 +00:00
ext/libzip/zip_dir_add.c
Merge ext/native/ext/... directly into ext.
2020-09-29 21:59:05 +00:00
ext/libzip/zip_dirent.c
Update libzip to 1.7.3.
2021-05-10 02:58:30 +00:00
ext/libzip/zip_discard.c
ext/libzip/zip_entry.c
Merge ext/native/ext/... directly into ext.
2020-09-29 21:59:05 +00:00
ext/libzip/zip_error.c
ext/libzip/zip_error_clear.c
ext/libzip/zip_error_get.c
ext/libzip/zip_error_get_sys_type.c
ext/libzip/zip_error_strerror.c
ext/libzip/zip_error_to_str.c
Update libzip to 1.7.3.
2021-05-10 02:58:30 +00:00
ext/libzip/zip_extra_field.c
ext/libzip/zip_extra_field_api.c
Merge ext/native/ext/... directly into ext.
2020-09-29 21:59:05 +00:00
ext/libzip/zip_fclose.c
Update libzip to 1.7.3.
2021-05-10 02:58:30 +00:00
ext/libzip/zip_fdopen.c
ext/libzip/zip_file_add.c
Merge ext/native/ext/... directly into ext.
2020-09-29 21:59:05 +00:00
ext/libzip/zip_file_error_clear.c
ext/libzip/zip_file_error_get.c
Update libzip to 1.7.3.
2021-05-10 02:58:30 +00:00
ext/libzip/zip_file_get_comment.c
ext/libzip/zip_file_get_external_attributes.c
Merge ext/native/ext/... directly into ext.
2020-09-29 21:59:05 +00:00
ext/libzip/zip_file_get_offset.c
Update libzip to 1.7.3.
2021-05-10 02:58:30 +00:00
ext/libzip/zip_file_rename.c
ext/libzip/zip_file_replace.c
ext/libzip/zip_file_set_comment.c
ext/libzip/zip_file_set_encryption.c
ext/libzip/zip_file_set_external_attributes.c
ext/libzip/zip_file_set_mtime.c
Merge ext/native/ext/... directly into ext.
2020-09-29 21:59:05 +00:00
ext/libzip/zip_file_strerror.c
ext/libzip/zip_fopen.c
Update libzip to 1.7.3.
2021-05-10 02:58:30 +00:00
ext/libzip/zip_fopen_encrypted.c
Merge ext/native/ext/... directly into ext.
2020-09-29 21:59:05 +00:00
ext/libzip/zip_fopen_index.c
Update libzip to 1.7.3.
2021-05-10 02:58:30 +00:00
ext/libzip/zip_fopen_index_encrypted.c
Merge ext/native/ext/... directly into ext.
2020-09-29 21:59:05 +00:00
ext/libzip/zip_fread.c
Update libzip to 1.7.3.
2021-05-10 02:58:30 +00:00
ext/libzip/zip_fseek.c
ext/libzip/zip_ftell.c
Merge ext/native/ext/... directly into ext.
2020-09-29 21:59:05 +00:00
ext/libzip/zip_get_archive_comment.c
ext/libzip/zip_get_archive_flag.c
Update libzip to 1.7.3.
2021-05-10 02:58:30 +00:00
ext/libzip/zip_get_encryption_implementation.c
Merge ext/native/ext/... directly into ext.
2020-09-29 21:59:05 +00:00
ext/libzip/zip_get_file_comment.c
ext/libzip/zip_get_name.c
Update libzip to 1.7.3.
2021-05-10 02:58:30 +00:00
ext/libzip/zip_get_num_entries.c
Merge ext/native/ext/... directly into ext.
2020-09-29 21:59:05 +00:00
ext/libzip/zip_get_num_files.c
Update libzip to 1.7.3.
2021-05-10 02:58:30 +00:00
ext/libzip/zip_hash.c
ext/libzip/zip_io_util.c
ext/libzip/zip_libzip_version.c
Merge ext/native/ext/... directly into ext.
2020-09-29 21:59:05 +00:00
ext/libzip/zip_memdup.c
ext/libzip/zip_name_locate.c
ext/libzip/zip_new.c
ext/libzip/zip_open.c
Update libzip to 1.7.3.
2021-05-10 02:58:30 +00:00
ext/libzip/zip_pkware.c
ext/libzip/zip_progress.c
Merge ext/native/ext/... directly into ext.
2020-09-29 21:59:05 +00:00
ext/libzip/zip_rename.c
ext/libzip/zip_replace.c
ext/libzip/zip_set_archive_comment.c
ext/libzip/zip_set_archive_flag.c
Update libzip to 1.7.3.
2021-05-10 02:58:30 +00:00
ext/libzip/zip_set_default_password.c
Merge ext/native/ext/... directly into ext.
2020-09-29 21:59:05 +00:00
ext/libzip/zip_set_file_comment.c
Update libzip to 1.7.3.
2021-05-10 02:58:30 +00:00
ext/libzip/zip_set_file_compression.c
Merge ext/native/ext/... directly into ext.
2020-09-29 21:59:05 +00:00
ext/libzip/zip_set_name.c
Update libzip to 1.7.3.
2021-05-10 02:58:30 +00:00
ext/libzip/zip_source_accept_empty.c
ext/libzip/zip_source_begin_write.c
ext/libzip/zip_source_begin_write_cloning.c
Merge ext/native/ext/... directly into ext.
2020-09-29 21:59:05 +00:00
ext/libzip/zip_source_buffer.c
Update libzip to 1.7.3.
2021-05-10 02:58:30 +00:00
ext/libzip/zip_source_call.c
ext/libzip/zip_source_close.c
ext/libzip/zip_source_commit_write.c
ext/libzip/zip_source_compress.c
ext/libzip/zip_source_crc.c
ext/libzip/zip_source_error.c
ext/libzip/zip_source_file_common.c
ext/libzip/zip_source_file_stdio.c
Merge ext/native/ext/... directly into ext.
2020-09-29 21:59:05 +00:00
ext/libzip/zip_source_free.c
ext/libzip/zip_source_function.c
Update libzip to 1.7.3.
2021-05-10 02:58:30 +00:00
ext/libzip/zip_source_get_file_attributes.c
ext/libzip/zip_source_is_deleted.c
ext/libzip/zip_source_layered.c
ext/libzip/zip_source_open.c
ext/libzip/zip_source_pkware_decode.c
ext/libzip/zip_source_pkware_encode.c
ext/libzip/zip_source_read.c
ext/libzip/zip_source_remove.c
ext/libzip/zip_source_rollback_write.c
ext/libzip/zip_source_seek.c
ext/libzip/zip_source_seek_write.c
ext/libzip/zip_source_stat.c
ext/libzip/zip_source_supports.c
ext/libzip/zip_source_tell.c
ext/libzip/zip_source_tell_write.c
ext/libzip/zip_source_window.c
ext/libzip/zip_source_write.c
Merge ext/native/ext/... directly into ext.
2020-09-29 21:59:05 +00:00
ext/libzip/zip_source_zip.c
Update libzip to 1.7.3.
2021-05-10 02:58:30 +00:00
ext/libzip/zip_source_zip_new.c
Merge ext/native/ext/... directly into ext.
2020-09-29 21:59:05 +00:00
ext/libzip/zip_stat.c
ext/libzip/zip_stat_index.c
ext/libzip/zip_stat_init.c
ext/libzip/zip_strerror.c
Update libzip to 1.7.3.
2021-05-10 02:58:30 +00:00
ext/libzip/zip_string.c
Merge ext/native/ext/... directly into ext.
2020-09-29 21:59:05 +00:00
ext/libzip/zip_unchange.c
ext/libzip/zip_unchange_all.c
ext/libzip/zip_unchange_archive.c
ext/libzip/zip_unchange_data.c
Update libzip to 1.7.3.
2021-05-10 02:58:30 +00:00
ext/libzip/zip_utf-8.c
ext/libzip/zip_err_str.c
Core: Format CMakeLists.txt consistently.
2018-10-28 18:33:25 +00:00
)
Update libzip to 1.7.3.
2021-05-10 02:58:30 +00:00
if(WIN32)
target_sources(libzip PRIVATE
ext/libzip/zip_source_file_win32.c
ext/libzip/zip_source_file_win32_named.c
ext/libzip/zip_source_file_win32_utf16.c
ext/libzip/zip_source_file_win32_utf8.c
)
if(CMAKE_SYSTEM_NAME MATCHES WindowsPhone OR CMAKE_SYSTEM_NAME MATCHES WindowsStore)
target_sources(libzip PRIVATE ext/libzip/zip_random_uwp.c)
else()
target_sources(libzip PRIVATE ext/libzip/zip_source_file_win32_ansi.c ext/libzip/zip_random_win32.c)
endif()
else()
target_sources(libzip PRIVATE
ext/libzip/zip_mkstempm.c
ext/libzip/zip_source_file_stdio_named.c
ext/libzip/zip_random_unix.c
)
endif()
Add an option to use the system libzip, to please grumpy package maintainers. This reverts commit 1a34f8833119c7b35a3b9d599b723ddd4c55c35a.
2018-02-07 11:09:06 +00:00
target_link_libraries(libzip)
Merge ext/native/ext/... directly into ext.
2020-09-29 21:59:05 +00:00
include_directories(ext/libzip)
Add an option to use the system libzip, to please grumpy package maintainers. This reverts commit 1a34f8833119c7b35a3b9d599b723ddd4c55c35a.
2018-02-07 11:09:06 +00:00
set(LIBZIP_LIBRARY libzip)
endif()
CMake-based build system. Tested on Windows with NMake Makefiles and Visual Studio 11 targets. Tested on Linux with GNU Makefiles target, using GCC as the compiler. Tested on FreeBSD using clang as the compiler. Tested for Android on Windows with NMake Makefiles and r8c NDK. Proxy-tested by xsacha for blackberry. The android build requires that the android/android.toolchain.cmake toolchain file is used; an error will be raised if ANDROID is defined without loading the toolchain file. When targeting ANDROID, the resulting .so files will be placed in "android/libs/$ANDROID_ABI" even when building out of tree, since it's where `ant` expects to find them. Since the Core library is expected to be named 'ppsspp_jni' on ANDROID, we also put its name in a variable that is set to 'Core' unless building on ANDROID, where it is 'ppsspp_jni'.
2012-11-18 16:00:27 +00:00
cmake: Improve building with the system libpng. This also now requires at least libpng16 instead of libpng17. v2: Require libpng17 on arm platforms. v3: Fix the android and windows travis builds.
2020-03-22 17:02:00 +00:00
# Arm platforms require at least libpng17.
if(ANDROID OR ARMV7 OR ARM64 OR ARM OR IOS)
set(PNG_REQUIRED_VERSION 1.7)
else()
set(PNG_REQUIRED_VERSION 1.6)
endif()
Add FAT support for macOS with automatic GitHub releases closes #11799 closes #13708 closes #14815
2021-09-12 13:54:40 +00:00
if(USE_SYSTEM_LIBPNG)
cmake: Improve building with the system libpng. This also now requires at least libpng16 instead of libpng17. v2: Require libpng17 on arm platforms. v3: Fix the android and windows travis builds.
2020-03-22 17:02:00 +00:00
find_package(PNG ${PNG_REQUIRED_VERSION})
Add FAT support for macOS with automatic GitHub releases closes #11799 closes #13708 closes #14815
2021-09-12 13:54:40 +00:00
endif()
Core: Format CMakeLists.txt consistently.
2018-10-28 18:33:25 +00:00
if(PNG_FOUND)
cmake: Improve building with the system libpng. This also now requires at least libpng16 instead of libpng17. v2: Require libpng17 on arm platforms. v3: Fix the android and windows travis builds.
2020-03-22 17:02:00 +00:00
include_directories(${PNG_INCLUDE_DIRS})
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)
ios: Fix resource copying
2016-10-11 01:27:54 +00:00
set(PNG_ARM_INCLUDES
Merge ext/native/ext/... directly into ext.
2020-09-29 21:59:05 +00:00
ext/libpng17/arm/arm_init.c
ext/libpng17/arm/filter_neon.S
ext/libpng17/arm/filter_neon_intrinsics.c
Core: Format CMakeLists.txt consistently.
2018-10-28 18:33:25 +00:00
)
ARM64 buildfix I guess previously ARM was defined in 64-bit mode too?
2020-12-14 18:43:11 +00:00
elseif(ARM64)
set(PNG_ARM_INCLUDES
ext/libpng17/arm/arm_init.c
ext/libpng17/arm/filter_neon_intrinsics.c
)
Switch to libpng17 to resolve NEON issue on iOS + other bug fixes.
2014-05-30 18:36:13 +00:00
endif()
add_library(png17 STATIC
Merge ext/native/ext/... directly into ext.
2020-09-29 21:59:05 +00:00
ext/libpng17/pngconf.h
ext/libpng17/pngdebug.h
ext/libpng17/png.c
ext/libpng17/png.h
ext/libpng17/pngerror.c
ext/libpng17/pngget.c
ext/libpng17/pnginfo.h
ext/libpng17/pnglibconf.h
ext/libpng17/pngmem.c
ext/libpng17/pngpread.c
ext/libpng17/pngpriv.h
ext/libpng17/pngread.c
ext/libpng17/pngrio.c
ext/libpng17/pngrtran.c
ext/libpng17/pngrutil.c
ext/libpng17/pngset.c
ext/libpng17/pngstruct.h
ext/libpng17/pngtrans.c
ext/libpng17/pngwio.c
ext/libpng17/pngwrite.c
ext/libpng17/pngwtran.c
ext/libpng17/pngwutil.c
Core: Format CMakeLists.txt consistently.
2018-10-28 18:33:25 +00:00
${PNG_ARM_INCLUDES}
)
cmake: Improve building with the system libpng. This also now requires at least libpng16 instead of libpng17. v2: Require libpng17 on arm platforms. v3: Fix the android and windows travis builds.
2020-03-22 17:02:00 +00:00
set(PNG_LIBRARIES png17)
Merge ext/native/ext/... directly into ext.
2020-09-29 21:59:05 +00:00
include_directories(ext/libpng17)
Use libpng to load PNGs. Fixes #4689.
2013-12-07 15:42:17 +00:00
endif()
Update OS X iconset. The iconset has been updated to include retina versions at all resolutions and has been rasterized from the svg icons available in the assets/unix-icons directory. icon-512.svg was used for all resolutions except 16x16 and 16x16@2x, which were sourced from icon-16.svg
2015-02-02 08:17:03 +00:00
Import all of basisu_transcoder, set up build
2023-03-12 22:50:30 +00:00
add_library(basis_universal STATIC
ext/basis_universal/basisu.h
ext/basis_universal/basisu_containers.h
ext/basis_universal/basisu_containers_impl.h
ext/basis_universal/basisu_file_headers.h
ext/basis_universal/basisu_transcoder.cpp
ext/basis_universal/basisu_transcoder.h
ext/basis_universal/basisu_transcoder_internal.h
ext/basis_universal/basisu_transcoder_tables_astc.inc
ext/basis_universal/basisu_transcoder_tables_astc_0_255.inc
ext/basis_universal/basisu_transcoder_tables_atc_55.inc
ext/basis_universal/basisu_transcoder_tables_atc_56.inc
ext/basis_universal/basisu_transcoder_tables_bc7_m5_alpha.inc
ext/basis_universal/basisu_transcoder_tables_bc7_m5_color.inc
ext/basis_universal/basisu_transcoder_tables_dxt1_5.inc
ext/basis_universal/basisu_transcoder_tables_dxt1_6.inc
ext/basis_universal/basisu_transcoder_tables_pvrtc2_45.inc
ext/basis_universal/basisu_transcoder_tables_pvrtc2_alpha_33.inc
ext/basis_universal/basisu_transcoder_uastc.h
)
set(BASISU_LIBRARIES basis_universal)
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-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)
Core: Format CMakeLists.txt consistently.
2018-10-28 18:33:25 +00:00
set(nativeExtra ${nativeExtra}
Common/GL/GLInterface/EGLAndroid.cpp
Common/GL/GLInterface/EGLAndroid.h
Common/GL/GLInterface/EGL.cpp
Common/GL/GLInterface/EGL.h
Common/GL/GLInterface/GLInterface.cpp
Common/GL/GLInterfaceBase.h
)
Pick some safe changes from the android gradle branch (including windows CMake fixes)
2016-12-05 15:51:28 +00:00
libretro: android: Do not build in the standalone UI
2020-02-05 17:00:08 +00:00
set(NativeAppSource ${NativeAppSource}
Fix CMake build for Android. Seems like some files have been moved.
2016-01-21 21:37:13 +00:00
android/jni/app-android.cpp
Split Android graphics context implementations into their own files.
2018-01-20 20:47:16 +00:00
android/jni/AndroidJavaGLContext.cpp
android/jni/AndroidJavaGLContext.h
android/jni/AndroidVulkanContext.cpp
android/jni/AndroidVulkanContext.h
android/jni/AndroidGraphicsContext.h
Some renaming and cleanup in the Android audio code
2020-07-28 12:22:50 +00:00
android/jni/AndroidAudio.cpp
android/jni/AndroidAudio.h
android/jni/OpenSLContext.cpp
android/jni/OpenSLContext.h
Core: Format CMakeLists.txt consistently.
2018-10-28 18:33:25 +00:00
)
OpenXR - VR framebuffer class added
2022-07-07 17:30:06 +00:00
if (OPENXR)
OpenXR - VR mode initialization added
2022-07-08 12:44:20 +00:00
set(nativeExtraLibs ${nativeExtraLibs} openxr)
OpenXR - VR framebuffer class added
2022-07-07 17:30:06 +00:00
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
# No target
Build for iOS as a libretro core
2023-02-07 04:36:55 +00:00
elseif(IOS AND NOT LIBRETRO)
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(nativeExtra ${nativeExtra}
iOS buildfix.
2013-08-19 03:17:33 +00:00
ios/main.mm
Properly post lost_focus and got_focus notifications when iOS app resigns active state and gains active state. Fixes #7758
2015-05-27 06:35:09 +00:00
ios/AppDelegate.mm
iOS Objective-C code dump. ViewController courtesy of rock88. Made modifications for simplification and code-style. Still missing some files (eg. images). Also, CMake is not set up correctly yet.
2013-02-17 14:04:44 +00:00
ios/AppDelegate.h
Auto switch between internal and external display
2019-06-10 17:24:58 +00:00
ios/DisplayManager.h
ios/DisplayManager.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/ViewController.mm
IOS: added audio output
2013-03-16 14:50:55 +00:00
ios/ViewController.h
Change iOSCoreAudio from cpp to mm. Explicitly activate the audio session. Always set the same mDataByteSize.
2017-12-31 01:56:23 +00:00
ios/iOSCoreAudio.mm
Updated CMakeLists to include new iOS Audio files
2013-06-25 21:38:30 +00:00
ios/iOSCoreAudio.h
Add camera/location support for iOS Add front camera support for Android Allow to change the active camera in-game
2020-01-09 13:57:09 +00:00
ios/CameraHelper.mm
ios/CameraHelper.h
ios/LocationHelper.mm
ios/LocationHelper.h
forget to modify cmakelists
2017-09-04 07:46:05 +00:00
ios/PPSSPPUIApplication.h
ios/PPSSPPUIApplication.mm
ios/SmartKeyboardMap.cpp
ios/SmartKeyboardMap.hpp
Added iCade support to the iOS build
2013-05-31 01:58:41 +00:00
ios/iCade/iCadeReaderView.h
ios/iCade/iCadeReaderView.m
Core: Format CMakeLists.txt consistently.
2018-10-28 18:33:25 +00:00
ios/iCade/iCadeState.h
Browse button on Darwin platforms, rename some classes/functions
2023-01-31 10:36:14 +00:00
UI/DarwinFileSystemServices.mm
UI/DarwinFileSystemServices.h
Support for showing % on Darwin platforms and some other changes
2023-01-27 08:19:29 +00:00
Common/Battery/AppleBatteryClient.m
Core: Format CMakeLists.txt consistently.
2018-10-28 18:33:25 +00:00
)
Renaming and file splitting
2023-03-06 14:30:39 +00:00
Memory stick customization for Darwin
2023-01-22 17:32:34 +00:00
set(nativeExtraLibs ${nativeExtraLibs} "-framework Foundation -framework MediaPlayer -framework AudioToolbox -framework CoreGraphics -framework QuartzCore -framework UIKit -framework GLKit -framework OpenAL -framework AVFoundation -framework CoreLocation -framework CoreVideo -framework CoreMedia -framework CoreServices" )
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()
Remove trailing whitespace from CMakeLists.txt
2017-11-18 16:16:44 +00:00
Update CMakeLists.txt iconv_library check
2015-10-08 05:27:15 +00:00
if(NOT ICONV_LIBRARY)
set(nativeExtraLibs ${nativeExtraLibs} iconv)
endif()
CMake: Make the code more platform-agnostic and cleaner.
2014-05-30 15:22:11 +00:00
Properly post lost_focus and got_focus notifications when iOS app resigns active state and gains active state. Fixes #7758
2015-05-27 06:35:09 +00:00
set_source_files_properties(ios/AppDelegate.mm PROPERTIES COMPILE_FLAGS -fobjc-arc)
CMake: Make the code more platform-agnostic and cleaner.
2014-05-30 15:22:11 +00:00
set_source_files_properties(ios/ViewController.mm PROPERTIES COMPILE_FLAGS -fobjc-arc)
iOS: convert all obj-c source code to ARC
2018-01-01 03:36:47 +00:00
set_source_files_properties(ios/iOSCoreAudio.mm PROPERTIES COMPILE_FLAGS -fobjc-arc)
set_source_files_properties(ios/PPSSPPUIApplication.mm PROPERTIES COMPILE_FLAGS -fobjc-arc)
set_source_files_properties(ios/iCade/iCadeReaderView.m PROPERTIES COMPILE_FLAGS -fobjc-arc)
set_source_files_properties(ios/main.mm PROPERTIES COMPILE_FLAGS -fobjc-arc)
Add camera/location support for iOS Add front camera support for Android Allow to change the active camera in-game
2020-01-09 13:57:09 +00:00
set_source_files_properties(ios/CameraHelper.mm PROPERTIES COMPILE_FLAGS -fobjc-arc)
set_source_files_properties(ios/LocationHelper.mm PROPERTIES COMPILE_FLAGS -fobjc-arc)
Browse button on Darwin platforms, rename some classes/functions
2023-01-31 10:36:14 +00:00
set_source_files_properties(UI/DarwinFileSystemServices.mm PROPERTIES COMPILE_FLAGS -fobjc-arc)
Support for showing % on Darwin platforms and some other changes
2023-01-27 08:19:29 +00:00
set_source_files_properties(Common/Battery/AppleBatteryClient.m PROPERTIES COMPILE_FLAGS -fobjc-arc)
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)
Build for iOS as a libretro core
2023-02-07 04:36:55 +00:00
elseif(IOS AND LIBRETRO)
set(nativeExtraLibs ${nativeExtraLibs} "-framework GLKit")
Qt UI in CMake (for future)
2012-12-16 11:17:13 +00:00
elseif(USING_QT_UI)
Core: Format CMakeLists.txt consistently.
2018-10-28 18:33:25 +00:00
set(CMAKE_AUTOMOC ON)
QT Api for Camera (Linux/macOS) Allow the use of different resolutions (win/android/iOS)
2020-01-25 08:06:00 +00:00
find_package(Qt5 COMPONENTS OpenGL Gui Core Multimedia)
Core: Format CMakeLists.txt consistently.
2018-10-28 18:33:25 +00:00
list(APPEND NativeAppSource
Qt/QtMain.cpp
Qt/QtMain.h
Qt/mainwindow.cpp
Qt/mainwindow.h
)
add_definitions(-DUSING_QT_UI)
if(USING_GLES2)
add_definitions(-DQT_OPENGL_ES -DQT_OPENGL_ES_2)
endif()
Wrap the display globals in a struct (#16998) * Wrap the display globals in a struct Makes it easier to search/replace these, for future refactorings. * Some renaming * Qt buildfix, also fix the Qt build on Mac (got broken with battery changes) * Attempt at buildfixing ios * UWP buildfix
2023-02-25 12:09:44 +00:00
if(APPLE)
list(APPEND NativeAppSource
UI/DarwinFileSystemServices.mm
UI/DarwinFileSystemServices.h
Common/Battery/AppleBatteryClient.m)
set_source_files_properties(Common/Battery/AppleBatteryClient.m PROPERTIES COMPILE_FLAGS -fobjc-arc)
set_source_files_properties(UI/DarwinFileSystemServices.mm PROPERTIES COMPILE_FLAGS -fobjc-arc)
set(nativeExtraLibs ${nativeExtraLibs} ${COCOA_LIBRARY} ${QUARTZ_CORE_LIBRARY} ${IOKIT_LIBRARY})
endif()
Fix Qt build by simply moving the offending file to the native project. No idea why Qt include paths only work there.
2020-10-05 08:19:04 +00:00
include_directories(Qt)
include_directories(${CMAKE_CURRENT_BINARY_DIR})
QT Api for Camera (Linux/macOS) Allow the use of different resolutions (win/android/iOS)
2020-01-25 08:06:00 +00:00
set(nativeExtraLibs ${nativeExtraLibs} Qt5::OpenGL Qt5::Gui Qt5::Core Qt5::Multimedia)
Qt UI in CMake (for future)
2012-12-16 11:17:13 +00:00
set(TargetBin PPSSPPQt)
Add Qt with SDL support to CMake. Fixes #9157.
2017-02-01 06:14:04 +00:00
Fix Qt build by simply moving the offending file to the native project. No idea why Qt include paths only work there.
2020-10-05 08:19:04 +00:00
# Enable SDL joystick if SDL is found
Core: Format CMakeLists.txt consistently.
2018-10-28 18:33:25 +00:00
if(SDL2_FOUND)
add_definitions(-DSDL)
set(nativeExtra ${nativeExtra}
SDL/SDLJoystick.h
SDL/SDLJoystick.cpp
)
set(nativeExtraLibs ${nativeExtraLibs} SDL2::SDL2)
endif()
Add Qt with SDL support to CMake. Fixes #9157.
2017-02-01 06:14:04 +00:00
Pick some safe changes from the android gradle branch (including windows CMake fixes)
2016-12-05 15:51:28 +00:00
elseif(WIN32)
# Don't care about SDL.
set(TargetBin PPSSPPWindows)
if(X86_64)
link_directories(dx9sdk/Lib/x64)
else()
link_directories(dx9sdk/Lib/x86)
endif()
Upgrade SDL for Mac This removes the option to use system SDL, which seems like a trap. Also simplifies the macbundle.sh script accordingly. Buildfix Buildfix fix Moar buildfix
2023-04-24 12:44:07 +00:00
elseif(LIBRETRO)
else()
Fix Gold filenames, more gold prep for mac
2023-04-25 14:34:23 +00:00
if(GOLD)
set(TargetBin PPSSPPGold)
else()
set(TargetBin PPSSPPSDL)
endif()
Core: Format CMakeLists.txt consistently.
2018-10-28 18:33:25 +00:00
# Require SDL
add_definitions(-DSDL)
set(nativeExtra ${nativeExtra}
SDL/SDLJoystick.h
SDL/SDLJoystick.cpp
SDL/SDLMain.cpp
SDL/SDLGLGraphicsContext.cpp
)
Switch: Avoid loading Vulkan.
2022-04-02 23:34:13 +00:00
if(NOT USE_LIBNX)
set(nativeExtra ${nativeExtra}
SDL/SDLVulkanGraphicsContext.cpp
)
endif()
Core: Format CMakeLists.txt consistently.
2018-10-28 18:33:25 +00:00
if(APPLE)
Native 'About' panel
2023-04-23 19:12:15 +00:00
set(nativeExtra ${nativeExtra}
SDL/SDLMain.h
SDL/SDLMain.mm
SDL/SDLCocoaMetalLayer.h
SDL/SDLCocoaMetalLayer.mm
SDL/CocoaBarItems.mm
SDL/CocoaBarItems.h
SDL/PPSSPPAboutViewController.m
SDL/PPSSPPAboutViewController.h
UI/DarwinFileSystemServices.mm
UI/DarwinFileSystemServices.h
Common/Battery/AppleBatteryClient.m
UI/PSPNSApplicationDelegate.mm
UI/PSPNSApplicationDelegate.h)
Browse button on Darwin platforms, rename some classes/functions
2023-01-31 10:36:14 +00:00
set_source_files_properties(UI/DarwinFileSystemServices.mm PROPERTIES COMPILE_FLAGS -fobjc-arc)
Recognize openable types in Info.plist, debug menu in top bar
2023-04-22 15:11:06 +00:00
set_source_files_properties(UI/PSPNSApplicationDelegate.mm PROPERTIES COMPILE_FLAGS -fobjc-arc)
address concerns
2023-02-14 16:11:32 +00:00
set_source_files_properties(SDL/CocoaBarItems.mm PROPERTIES COMPILE_FLAGS -fobjc-arc)
Native 'About' panel
2023-04-23 19:12:15 +00:00
set_source_files_properties(SDL/PPSSPPAboutViewController.m PROPERTIES COMPILE_FLAGS -fobjc-arc)
Support for showing % on Darwin platforms and some other changes
2023-01-27 08:19:29 +00:00
set_source_files_properties(Common/Battery/AppleBatteryClient.m PROPERTIES COMPILE_FLAGS -fobjc-arc)
set(nativeExtraLibs ${nativeExtraLibs} ${COCOA_LIBRARY} ${QUARTZ_CORE_LIBRARY} ${IOKIT_LIBRARY})
Allow usage of system SDL2 on macOS
2023-05-05 21:17:45 +00:00
if(USE_SYSTEM_LIBSDL2)
set(nativeExtraLibs ${nativeExtraLibs} SDL2::SDL2)
else()
set(nativeExtraLibs ${nativeExtraLibs} ${SDL2Fwk})
endif()
Core: Format CMakeLists.txt consistently.
2018-10-28 18:33:25 +00:00
elseif(USING_EGL)
Upgrade SDL for Mac This removes the option to use system SDL, which seems like a trap. Also simplifies the macbundle.sh script accordingly. Buildfix Buildfix fix Moar buildfix
2023-04-24 12:44:07 +00:00
set(nativeExtraLibs ${nativeExtraLibs} pthread SDL2::SDL2)
else()
set(nativeExtraLibs ${nativeExtraLibs} SDL2::SDL2)
Core: Format CMakeLists.txt consistently.
2018-10-28 18:33:25 +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
endif()
Fix Qt build by simply moving the offending file to the native project. No idea why Qt include paths only work there.
2020-10-05 08:19:04 +00:00
if(WIN32)
if(MINGW)
set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> -O coff <INCLUDES> <SOURCE> <OBJECT>")
# required when using the dx9sdk include paths
add_definitions(-include ${CMAKE_CURRENT_SOURCE_DIR}/Windows/mingw_defines.h)
else()
target_link_libraries(Common dxguid)
endif()
target_link_libraries(Common winmm d3d9 dsound)
endif()
Move the resampler usage to a common file, AudioCommon. (#17176) * Move the resampler usage to a common file, AudioCommon. Ports that don't want to use the resampler can now simply exclude that file and provide their own implementation. Next up, libretro will be converted to do it that way. * Android.mk typo * libretro makefile fix * libretro buildfix * libretro: try a different approach for the temporary solution * duh * double duh
2023-03-24 16:19:57 +00:00
if(NOT LIBRETRO)
list(APPEND NativeAppSource
UI/AudioCommon.h
UI/AudioCommon.cpp
)
endif()
qt: Build Qt frontend with CMake. Requires Qt5.
2016-10-12 18:58:50 +00:00
list(APPEND NativeAppSource
Mac buildfix
2014-08-23 12:24:24 +00:00
android/jni/TestRunner.cpp
Don't forget to update the other build systems and try to fix the builds.
2018-08-12 22:25:08 +00:00
UI/DiscordIntegration.cpp
Android: Fixes for CMake and Qt.
2014-06-27 16:49:50 +00:00
UI/NativeApp.cpp
Address a bunch of the feedback
2021-06-06 08:19:17 +00:00
UI/BackgroundAudio.h
Android: Fixes for CMake and Qt.
2014-06-27 16:49:50 +00:00
UI/BackgroundAudio.cpp
Address a bunch of the feedback
2021-06-06 08:19:17 +00:00
UI/ChatScreen.h
cmake buildfix
2016-10-25 10:42:51 +00:00
UI/ChatScreen.cpp
Android: Fixes for CMake and Qt.
2014-06-27 16:49:50 +00:00
UI/DevScreens.cpp
Address a bunch of the feedback
2021-06-06 08:19:17 +00:00
UI/DevScreens.h
Add Display layout editor to use for example on tablets, but also includes automatic screen cropping for 16:9 cases(default). //Rebased & removed atlas stuff which was added with #8096 //squashed with some improvements
2015-10-24 12:40:29 +00:00
UI/DisplayLayoutScreen.cpp
Address a bunch of the feedback
2021-06-06 08:19:17 +00:00
UI/DisplayLayoutScreen.h
UI/EmuScreen.h
Android: Fixes for CMake and Qt.
2014-06-27 16:49:50 +00:00
UI/EmuScreen.cpp
Address a bunch of the feedback
2021-06-06 08:19:17 +00:00
UI/GameInfoCache.h
Android: Fixes for CMake and Qt.
2014-06-27 16:49:50 +00:00
UI/GameInfoCache.cpp
Address a bunch of the feedback
2021-06-06 08:19:17 +00:00
UI/MainScreen.h
Android: Fixes for CMake and Qt.
2014-06-27 16:49:50 +00:00
UI/MainScreen.cpp
Address a bunch of the feedback
2021-06-06 08:19:17 +00:00
UI/MiscScreens.h
Android: Fixes for CMake and Qt.
2014-06-27 16:49:50 +00:00
UI/MiscScreens.cpp
Address a bunch of the feedback
2021-06-06 08:19:17 +00:00
UI/PauseScreen.h
Move GamePauseScreen into its own file
2014-12-22 09:48:17 +00:00
UI/PauseScreen.cpp
Address a bunch of the feedback
2021-06-06 08:19:17 +00:00
UI/GameScreen.h
Android: Fixes for CMake and Qt.
2014-06-27 16:49:50 +00:00
UI/GameScreen.cpp
Address a bunch of the feedback
2021-06-06 08:19:17 +00:00
UI/GameSettingsScreen.h
Android: Fixes for CMake and Qt.
2014-06-27 16:49:50 +00:00
UI/GameSettingsScreen.cpp
Address a bunch of the feedback
2021-06-06 08:19:17 +00:00
UI/GPUDriverTestScreen.h
Build system updates
2018-12-19 13:01:19 +00:00
UI/GPUDriverTestScreen.cpp
Address a bunch of the feedback
2021-06-06 08:19:17 +00:00
UI/TiltAnalogSettingsScreen.h
Android: Fixes for CMake and Qt.
2014-06-27 16:49:50 +00:00
UI/TiltAnalogSettingsScreen.cpp
Address a bunch of the feedback
2021-06-06 08:19:17 +00:00
UI/TouchControlLayoutScreen.h
Android: Fixes for CMake and Qt.
2014-06-27 16:49:50 +00:00
UI/TouchControlLayoutScreen.cpp
Address a bunch of the feedback
2021-06-06 08:19:17 +00:00
UI/TouchControlVisibilityScreen.h
Android: Fixes for CMake and Qt.
2014-06-27 16:49:50 +00:00
UI/TouchControlVisibilityScreen.cpp
Address a bunch of the feedback
2021-06-06 08:19:17 +00:00
UI/GamepadEmu.h
Android: Fixes for CMake and Qt.
2014-06-27 16:49:50 +00:00
UI/GamepadEmu.cpp
Break out the JoystickHistoryView
2023-02-01 13:58:16 +00:00
UI/JoystickHistoryView.h
UI/JoystickHistoryView.cpp
Address a bunch of the feedback
2021-06-06 08:19:17 +00:00
UI/OnScreenDisplay.h
Android: Fixes for CMake and Qt.
2014-06-27 16:49:50 +00:00
UI/OnScreenDisplay.cpp
Address a bunch of the feedback
2021-06-06 08:19:17 +00:00
UI/ControlMappingScreen.h
Android: Fixes for CMake and Qt.
2014-06-27 16:49:50 +00:00
UI/ControlMappingScreen.cpp
Address a bunch of the feedback
2021-06-06 08:19:17 +00:00
UI/RemoteISOScreen.h
http: Add a screen under tools for the server.
2016-07-03 17:24:33 +00:00
UI/RemoteISOScreen.cpp
Address a bunch of the feedback
2021-06-06 08:19:17 +00:00
UI/ReportScreen.h
Initial attempt at a compat report screen.
2014-02-10 09:24:40 +00:00
UI/ReportScreen.cpp
Address a bunch of the feedback
2021-06-06 08:19:17 +00:00
UI/SavedataScreen.h
Make GameInfoCache understand PSP savedata as a "game" type. Use it to create a basic savedata listing screen.
2015-06-11 18:22:16 +00:00
UI/SavedataScreen.cpp
Address a bunch of the feedback
2021-06-06 08:19:17 +00:00
UI/Store.h
Android: Fixes for CMake and Qt.
2014-06-27 16:49:50 +00:00
UI/Store.cpp
Address a bunch of the feedback
2021-06-06 08:19:17 +00:00
UI/CwCheatScreen.h
Android: Fixes for CMake and Qt.
2014-06-27 16:49:50 +00:00
UI/CwCheatScreen.cpp
Address a bunch of the feedback
2021-06-06 08:19:17 +00:00
UI/InstallZipScreen.h
Android: Fixes for CMake and Qt.
2014-06-27 16:49:50 +00:00
UI/InstallZipScreen.cpp
Address a bunch of the feedback
2021-06-06 08:19:17 +00:00
UI/MemStickScreen.h
Assorted plumbing. wip Buildfix
2021-04-24 20:47:57 +00:00
UI/MemStickScreen.cpp
Address a bunch of the feedback
2021-06-06 08:19:17 +00:00
UI/ProfilerDraw.h
Add new shader viewing tool
2015-10-14 15:45:21 +00:00
UI/ProfilerDraw.cpp
More renaming
2023-03-26 09:21:34 +00:00
UI/CustomButtonMappingScreen.h
UI/CustomButtonMappingScreen.cpp
Allow custom UI themes
2022-02-11 11:32:23 +00:00
UI/Theme.h
UI/Theme.cpp
Core: Format CMakeLists.txt consistently.
2018-10-28 18:33:25 +00:00
)
Pick some safe changes from the android gradle branch (including windows CMake fixes)
2016-12-05 15:51:28 +00:00
Android: Fixes for CMake and Qt.
2014-06-27 16:49:50 +00:00
if(ANDROID)
Core: Format CMakeLists.txt consistently.
2018-10-28 18:33:25 +00:00
if(ARM)
Android: Fixes for CMake and Qt.
2014-06-27 16:49:50 +00:00
set(NativeAppSource ${NativeAppSource} android/jni/ArmEmitterTest.cpp)
Core: Format CMakeLists.txt consistently.
2018-10-28 18:33:25 +00:00
elseif(ARM64)
Pick some safe changes from the android gradle branch (including windows CMake fixes)
2016-12-05 15:51:28 +00:00
set(NativeAppSource ${NativeAppSource} android/jni/Arm64EmitterTest.cpp)
Android: Fixes for CMake and Qt.
2014-06-27 16:49:50 +00:00
endif()
libretro: android: Do not build in the standalone UI
2020-02-05 17:00:08 +00:00
if (NOT LIBRETRO)
set(nativeExtra ${nativeExtra} ${NativeAppSource})
endif()
Android: Fixes for CMake and Qt.
2014-06-27 16:49:50 +00:00
endif()
feat(libretro): ios compile settings
2022-12-06 17:23:09 +00:00
if (IOS)
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}
Fix Qt build by simply moving the offending file to the native project. No idea why Qt include paths only work there.
2020-10-05 08:19:04 +00:00
Common/Render/Text/draw_text_qt.cpp
Common/Render/Text/draw_text_qt.h
Merge ext/native/ext/... directly into ext.
2020-09-29 21:59:05 +00:00
ext/jpge/jpgd.cpp
ext/jpge/jpgd.h
ext/jpge/jpge.cpp
ext/jpge/jpge.h
Core: Format CMakeLists.txt consistently.
2018-10-28 18:33:25 +00:00
)
Exclude rt on Mac SDL port
2013-12-19 10:10:46 +00:00
Core: Format CMakeLists.txt consistently.
2018-10-28 18:33:25 +00:00
if(LINUX AND NOT ANDROID)
set(RT_LIB rt)
Exclude rt on Mac SDL port
2013-12-19 10:10:46 +00:00
endif()
Core: Format CMakeLists.txt consistently.
2018-10-28 18:33:25 +00:00
set(ATOMIC_LIB)
riscv: Add libatomic.
2023-03-02 06:20:49 +00:00
if(ANDROID OR (LINUX AND ARM_DEVICE) OR (LINUX AND RISCV64))
Core: Format CMakeLists.txt consistently.
2018-10-28 18:33:25 +00:00
set(ATOMIC_LIB atomic)
Pick some safe changes from the android gradle branch (including windows CMake fixes)
2016-12-05 15:51:28 +00:00
endif()
Import all of basisu_transcoder, set up build
2023-03-12 22:50:30 +00:00
target_link_libraries(native ${LIBZIP_LIBRARY} ${PNG_LIBRARIES} ${BASISU_LIBRARIES} ${ZLIB_LIBRARY} vma gason udis86 ${RT_LIB} ${nativeExtraLibs} ${ATOMIC_LIB} Common)
cmake: Fix linking against system GLEW
2017-01-10 00:19:58 +00:00
if(TARGET Ext::GLEW)
Core: Format CMakeLists.txt consistently.
2018-10-28 18:33:25 +00:00
target_link_libraries(native Ext::GLEW)
glew: Move to ext
2016-10-12 15:30:18 +00:00
endif()
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)
Pick some safe changes from the android gradle branch (including windows CMake fixes)
2016-12-05 15:51:28 +00:00
target_link_libraries(native log EGL OpenSLES)
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)
native: enable backtrace on some BSDs
2018-10-27 17:55:55 +00:00
elseif(${CMAKE_SYSTEM_NAME} MATCHES "^(DragonFly|FreeBSD|NetBSD)$")
target_link_libraries(native execinfo)
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(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
Core: Format CMakeLists.txt consistently.
2018-10-28 18:33:25 +00:00
ext/libkirk/kirk_engine.h
)
Build: Reduce include spam in CMake. This makes it more like other platforms, which don't globally include these directories.
2022-12-04 16:07:53 +00:00
target_include_directories(kirk PRIVATE ext/libkirk)
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
Implement sceSfmt19937 module.
2015-02-15 05:22:20 +00:00
add_library(sfmt19937 STATIC
ext/sfmt19937/SFMT.c
ext/sfmt19937/SFMT.h
ext/sfmt19937/SFMT-common.h
ext/sfmt19937/SFMT-params.h
ext/sfmt19937/SFMT-params19937.h
)
Build: Silence SFMT warning.
2022-12-04 15:53:15 +00:00
target_compile_definitions(sfmt19937 PRIVATE SFMT_MEXP=19937)
target_include_directories(sfmt19937 PRIVATE ext/sfmt19937)
Implement sceSfmt19937 module.
2015-02-15 05:22:20 +00:00
Buildfix
2013-04-30 16:44:20 +00:00
add_library(xbrz STATIC
ext/xbrz/xbrz.cpp
ext/xbrz/xbrz.h
)
Build: Reduce include spam in CMake. This makes it more like other platforms, which don't globally include these directories.
2022-12-04 16:07:53 +00:00
target_include_directories(xbrz PRIVATE ext/xbrz)
Buildfix
2013-04-30 16:44:20 +00:00
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
)
Build: Reduce include spam in CMake. This makes it more like other platforms, which don't globally include these directories.
2022-12-04 16:07:53 +00:00
target_include_directories(xxhash PRIVATE ext/xxhash)
Add xxHash-r32 to build (not used yet.)
2013-08-17 05:58:38 +00:00
CMake-based build system. Tested on Windows with NMake Makefiles and Visual Studio 11 targets. Tested on Linux with GNU Makefiles target, using GCC as the compiler. Tested on FreeBSD using clang as the compiler. Tested for Android on Windows with NMake Makefiles and r8c NDK. Proxy-tested by xsacha for blackberry. The android build requires that the android/android.toolchain.cmake toolchain file is used; an error will be raised if ANDROID is defined without loading the toolchain file. When targeting ANDROID, the resulting .so files will be placed in "android/libs/$ANDROID_ABI" even when building out of tree, since it's where `ant` expects to find them. Since the Core library is expected to be named 'ppsspp_jni' on ANDROID, we also put its name in a variable that is set to 'Core' unless building on ANDROID, where it is 'ppsspp_jni'.
2012-11-18 16:00:27 +00:00
set(CoreExtra)
Remove armips from the generic CMake build again, it didn't build on iOS
2017-03-13 18:28:56 +00:00
set(CoreExtraLibs)
Move the IR interpreter out into its own file. Rename it in the UI. First CMake and Android fixes.
2016-05-08 19:56:52 +00:00
set(CoreExtra ${CoreExtra}
Core/MIPS/IR/IRCompALU.cpp
Core/MIPS/IR/IRCompBranch.cpp
Core/MIPS/IR/IRCompFPU.cpp
Core/MIPS/IR/IRCompLoadStore.cpp
Core/MIPS/IR/IRCompVFPU.cpp
Complete the separation of the IR compiler frontend from the "Jit"
2016-05-09 18:05:06 +00:00
Core/MIPS/IR/IRFrontend.cpp
Core/MIPS/IR/IRFrontend.h
Move the IR interpreter out into its own file. Rename it in the UI. First CMake and Android fixes.
2016-05-08 19:56:52 +00:00
Core/MIPS/IR/IRInst.cpp
Core/MIPS/IR/IRInst.h
Core/MIPS/IR/IRInterpreter.cpp
Core/MIPS/IR/IRInterpreter.h
Core/MIPS/IR/IRJit.cpp
Core/MIPS/IR/IRJit.h
Core/MIPS/IR/IRPassSimplify.cpp
Core/MIPS/IR/IRPassSimplify.h
Core/MIPS/IR/IRRegCache.cpp
Core/MIPS/IR/IRRegCache.h
Core: Format CMakeLists.txt consistently.
2018-10-28 18:33:25 +00:00
)
Move the IR interpreter out into its own file. Rename it in the UI. First CMake and Android fixes.
2016-05-08 19:56:52 +00:00
cmake: Detect features at compile time Instead of relying on manually passed down flags from CMake, we now have ppsspp_config.h file to create the platform defines for us. This improves support for multiplatform builds (such as iOS).
2016-10-12 15:32:52 +00:00
list(APPEND CoreExtra
Core/MIPS/ARM/ArmAsm.cpp
Core/MIPS/ARM/ArmCompALU.cpp
Core/MIPS/ARM/ArmCompBranch.cpp
Core/MIPS/ARM/ArmCompFPU.cpp
Core/MIPS/ARM/ArmCompLoadStore.cpp
Core/MIPS/ARM/ArmCompVFPU.cpp
Core/MIPS/ARM/ArmCompVFPUNEON.cpp
Core/MIPS/ARM/ArmCompVFPUNEONUtil.cpp
Core/MIPS/ARM/ArmCompReplace.cpp
Core/MIPS/ARM/ArmJit.cpp
Core/MIPS/ARM/ArmJit.h
Core/MIPS/ARM/ArmRegCache.cpp
Core/MIPS/ARM/ArmRegCache.h
Core/MIPS/ARM/ArmRegCacheFPU.cpp
Core/MIPS/ARM/ArmRegCacheFPU.h
GPU/Common/VertexDecoderArm.cpp
)
list(APPEND CoreExtra
Core/MIPS/ARM64/Arm64Asm.cpp
Core/MIPS/ARM64/Arm64CompALU.cpp
Core/MIPS/ARM64/Arm64CompBranch.cpp
Core/MIPS/ARM64/Arm64CompFPU.cpp
Core/MIPS/ARM64/Arm64CompLoadStore.cpp
Core/MIPS/ARM64/Arm64CompVFPU.cpp
Core/MIPS/ARM64/Arm64CompReplace.cpp
Core/MIPS/ARM64/Arm64Jit.cpp
Core/MIPS/ARM64/Arm64Jit.h
Core/MIPS/ARM64/Arm64RegCache.cpp
Core/MIPS/ARM64/Arm64RegCache.h
Core/MIPS/ARM64/Arm64RegCacheFPU.cpp
Core/MIPS/ARM64/Arm64RegCacheFPU.h
GPU/Common/VertexDecoderArm64.cpp
Core: Format CMakeLists.txt consistently.
2018-10-28 18:33:25 +00:00
Core/Util/DisArm64.cpp
)
cmake: Detect features at compile time Instead of relying on manually passed down flags from CMake, we now have ppsspp_config.h file to create the platform defines for us. This improves support for multiplatform builds (such as iOS).
2016-10-12 15:32:52 +00:00
list(APPEND CoreExtra
Core/MIPS/x86/Asm.cpp
Core/MIPS/x86/CompALU.cpp
Core/MIPS/x86/CompBranch.cpp
Core/MIPS/x86/CompFPU.cpp
Core/MIPS/x86/CompLoadStore.cpp
Core/MIPS/x86/CompVFPU.cpp
Core/MIPS/x86/CompReplace.cpp
Core/MIPS/x86/Jit.cpp
Core/MIPS/x86/Jit.h
Core/MIPS/x86/JitSafeMem.cpp
Core/MIPS/x86/JitSafeMem.h
Core/MIPS/x86/RegCache.cpp
Core/MIPS/x86/RegCache.h
Core/MIPS/x86/RegCacheFPU.cpp
Core/MIPS/x86/RegCacheFPU.h
GPU/Common/VertexDecoderX86.cpp
softjit: Add stubbed DrawPixel for x64.
2021-11-21 16:46:15 +00:00
GPU/Software/DrawPixelX86.cpp
SoftGPU: Stub a jit for texel fetch.
2017-05-11 00:31:34 +00:00
GPU/Software/SamplerX86.cpp
cmake: Detect features at compile time Instead of relying on manually passed down flags from CMake, we now have ppsspp_config.h file to create the platform defines for us. This improves support for multiplatform builds (such as iOS).
2016-10-12 15:32:52 +00:00
)
list(APPEND CoreExtra
Core/MIPS/MIPS/MipsJit.cpp
Core/MIPS/MIPS/MipsJit.h
)
riscv: Initial vertexjit.
2023-02-12 21:31:39 +00:00
list(APPEND CoreExtra
GPU/Common/VertexDecoderRiscV.cpp
)
Core: Format CMakeLists.txt consistently.
2018-10-28 18:33:25 +00:00
if(NOT MOBILE_DEVICE)
Fix builds for non-Win32
2016-09-02 00:09:56 +00:00
set(CoreExtra ${CoreExtra}
Core/AVIDump.cpp
Clean up various files
2016-09-03 22:26:01 +00:00
Core/AVIDump.h
Core/WaveFile.cpp
Core: Format CMakeLists.txt consistently.
2018-10-28 18:33:25 +00:00
Core/WaveFile.h
)
Fix builds for non-Win32
2016-09-02 00:09:56 +00:00
endif()
Pick some safe changes from the android gradle branch (including windows CMake fixes)
2016-12-05 15:51:28 +00:00
set(GPU_GLES
Split out the depth stuff from the file, move to GPU/Common
2023-02-03 20:06:43 +00:00
GPU/GLES/StencilBufferGLES.cpp
Pick some safe changes from the android gradle branch (including windows CMake fixes)
2016-12-05 15:51:28 +00:00
GPU/GLES/GPU_GLES.cpp
GPU/GLES/GPU_GLES.h
Rename GLES files to match the convention the other backends use.
2017-01-21 21:16:30 +00:00
GPU/GLES/FragmentTestCacheGLES.cpp
GPU/GLES/FragmentTestCacheGLES.h
Buildfix
2017-01-22 06:28:44 +00:00
GPU/GLES/FramebufferManagerGLES.cpp
GPU/GLES/FramebufferManagerGLES.h
Rename GLES files to match the convention the other backends use.
2017-01-21 21:16:30 +00:00
GPU/GLES/ShaderManagerGLES.cpp
GPU/GLES/ShaderManagerGLES.h
GPU/GLES/StateMappingGLES.cpp
GPU/GLES/StateMappingGLES.h
GPU/GLES/TextureCacheGLES.cpp
GPU/GLES/TextureCacheGLES.h
Pick some safe changes from the android gradle branch (including windows CMake fixes)
2016-12-05 15:51:28 +00:00
GPU/GLES/DrawEngineGLES.cpp
GPU/GLES/DrawEngineGLES.h
)
set(GPU_VULKAN
Debug visualization for the Vulkan memory allocator. Shows some interesting behaviour.
2018-01-17 12:59:32 +00:00
GPU/Vulkan/DebugVisVulkan.cpp
GPU/Vulkan/DebugVisVulkan.h
Pick some safe changes from the android gradle branch (including windows CMake fixes)
2016-12-05 15:51:28 +00:00
GPU/Vulkan/DrawEngineVulkan.cpp
GPU/Vulkan/DrawEngineVulkan.h
Rename FramebufferVulkan.cpp/h to FramebufferManagerVulkan.cpp/h
2020-08-03 21:22:11 +00:00
GPU/Vulkan/FramebufferManagerVulkan.cpp
GPU/Vulkan/FramebufferManagerVulkan.h
Pick some safe changes from the android gradle branch (including windows CMake fixes)
2016-12-05 15:51:28 +00:00
GPU/Vulkan/GPU_Vulkan.cpp
GPU/Vulkan/GPU_Vulkan.h
GPU/Vulkan/PipelineManagerVulkan.cpp
GPU/Vulkan/PipelineManagerVulkan.h
GPU/Vulkan/ShaderManagerVulkan.cpp
GPU/Vulkan/ShaderManagerVulkan.h
GPU/Vulkan/StateMappingVulkan.cpp
GPU/Vulkan/StateMappingVulkan.h
GPU/Vulkan/TextureCacheVulkan.cpp
GPU/Vulkan/TextureCacheVulkan.h
GPU/Vulkan/VulkanUtil.cpp
GPU/Vulkan/VulkanUtil.h
)
set(GPU_D3D9
GPU/Directx9/DrawEngineDX9.cpp
GPU/Directx9/DrawEngineDX9.h
Rename FramebufferDX9.cpp/h to FramebufferManagerDX9.cpp/h
2020-08-03 21:24:50 +00:00
GPU/Directx9/FramebufferManagerDX9.cpp
GPU/Directx9/FramebufferManagerDX9.h
Pick some safe changes from the android gradle branch (including windows CMake fixes)
2016-12-05 15:51:28 +00:00
GPU/Directx9/GPU_DX9.cpp
GPU/Directx9/GPU_DX9.h
GPU/Directx9/ShaderManagerDX9.cpp
GPU/Directx9/ShaderManagerDX9.h
GPU/Directx9/StateMappingDX9.cpp
GPU/Directx9/StateMappingDX9.h
GPU/Directx9/TextureCacheDX9.cpp
GPU/Directx9/TextureCacheDX9.h
)
Some mostly empty files for D3D11
2017-02-08 16:47:07 +00:00
set(GPU_D3D11
GPU/D3D11/DrawEngineD3D11.cpp
GPU/D3D11/DrawEngineD3D11.h
GPU/D3D11/FramebufferManagerD3D11.cpp
GPU/D3D11/FramebufferManagerD3D11.h
GPU/D3D11/GPU_D3D11.cpp
GPU/D3D11/GPU_D3D11.h
Buildfix the CMake-based Windows build
2017-02-16 16:06:03 +00:00
GPU/D3D11/D3D11Util.cpp
GPU/D3D11/D3D11Util.h
Some mostly empty files for D3D11
2017-02-08 16:47:07 +00:00
GPU/D3D11/ShaderManagerD3D11.cpp
GPU/D3D11/ShaderManagerD3D11.h
GPU/D3D11/StateMappingD3D11.cpp
GPU/D3D11/StateMappingD3D11.h
GPU/D3D11/TextureCacheD3D11.cpp
GPU/D3D11/TextureCacheD3D11.h
)
Pick some safe changes from the android gradle branch (including windows CMake fixes)
2016-12-05 15:51:28 +00:00
Avoid linking error on MacOSX.
2018-01-29 23:24:27 +00:00
# We build Vulkan even on Apple to avoid annoying build differences.
set(GPU_IMPLS ${GPU_GLES} ${GPU_VULKAN})
Pick some safe changes from the android gradle branch (including windows CMake fixes)
2016-12-05 15:51:28 +00:00
if(WIN32)
Some mostly empty files for D3D11
2017-02-08 16:47:07 +00:00
list(APPEND GPU_IMPLS ${GPU_D3D9} ${GPU_D3D11})
Pick some safe changes from the android gradle branch (including windows CMake fixes)
2016-12-05 15:51:28 +00:00
endif()
cmake: Merge GPU and Core targets
2016-10-12 14:46:29 +00:00
set(GPU_SOURCES
Pick some safe changes from the android gradle branch (including windows CMake fixes)
2016-12-05 15:51:28 +00:00
${GPU_IMPLS}
${GPU_NEON}
Draw2D
2022-08-03 09:42:37 +00:00
GPU/Common/Draw2D.cpp
GPU/Common/Draw2D.h
Split out the depth stuff from the file, move to GPU/Common
2023-02-03 20:06:43 +00:00
GPU/Common/DepthBufferCommon.cpp
DepalettizeCommon -> TextureShaderCommon. Simplifications.
2022-08-22 10:20:21 +00:00
GPU/Common/TextureShaderCommon.cpp
GPU/Common/TextureShaderCommon.h
cmake: Merge GPU and Core targets
2016-10-12 14:46:29 +00:00
GPU/Common/DepalettizeShaderCommon.cpp
GPU/Common/DepalettizeShaderCommon.h
Move the now-renamed fragment shader generator to GPU/Common.
2020-10-31 17:56:44 +00:00
GPU/Common/FragmentShaderGenerator.cpp
GPU/Common/FragmentShaderGenerator.h
Move the generic vertex shader generator into GPU/Common and rename it.
2020-11-01 12:02:53 +00:00
GPU/Common/VertexShaderGenerator.cpp
GPU/Common/VertexShaderGenerator.h
Vulkan: Basic geoshader code generation.
2021-10-26 07:56:14 +00:00
GPU/Common/GeometryShaderGenerator.cpp
GPU/Common/GeometryShaderGenerator.h
Rename FramebufferCommon.cpp/h to FramebufferManagerCommon.cpp/h for consistency
2020-08-03 21:17:22 +00:00
GPU/Common/FramebufferManagerCommon.cpp
GPU/Common/FramebufferManagerCommon.h
cmake: Merge GPU and Core targets
2016-10-12 14:46:29 +00:00
GPU/Common/GPUDebugInterface.cpp
GPU/Common/GPUDebugInterface.h
GPU/Common/GPUStateUtils.cpp
GPU/Common/GPUStateUtils.h
GPU/Common/DrawEngineCommon.cpp
GPU/Common/DrawEngineCommon.h
GPU: Split FramebufferCommon into two classes. Only some things moved over so far. FramebufferCommon does too much, we want to share it with softgpu without all the buffer management stuff.
2020-05-10 05:06:22 +00:00
GPU/Common/PresentationCommon.cpp
GPU/Common/PresentationCommon.h
More reinterpret shader gen and test work. More work on reinterpret Buildsystem fixes
2020-11-02 15:12:45 +00:00
GPU/Common/ReinterpretFramebuffer.cpp
GPU/Common/ReinterpretFramebuffer.h
cmake: Merge GPU and Core targets
2016-10-12 14:46:29 +00:00
GPU/Common/ShaderId.cpp
GPU/Common/ShaderId.h
Buildfix the CMake-based Windows build
2017-02-16 16:06:03 +00:00
GPU/Common/ShaderUniforms.cpp
GPU/Common/ShaderUniforms.h
Add missing file to CMakeLists.txt
2017-03-13 15:51:36 +00:00
GPU/Common/ShaderCommon.cpp
GPU/Common/ShaderCommon.h
cmake: Merge GPU and Core targets
2016-10-12 14:46:29 +00:00
GPU/Common/SplineCommon.cpp
GPU/Common/SplineCommon.h
Remove some code duplication
2017-11-01 13:49:50 +00:00
GPU/Common/StencilCommon.cpp
GPU/Common/StencilCommon.h
cmake: Merge GPU and Core targets
2016-10-12 14:46:29 +00:00
GPU/Common/SoftwareTransformCommon.cpp
GPU/Common/SoftwareTransformCommon.h
GPU/Common/VertexDecoderCommon.cpp
GPU/Common/VertexDecoderCommon.h
GPU/Common/TransformCommon.cpp
GPU/Common/TransformCommon.h
GPU/Common/IndexGenerator.cpp
GPU/Common/IndexGenerator.h
GPU/Common/TextureDecoder.cpp
GPU/Common/TextureDecoder.h
GPU/Common/TextureCacheCommon.cpp
GPU/Common/TextureCacheCommon.h
GPU/Common/TextureScalerCommon.cpp
GPU/Common/TextureScalerCommon.h
GPU/Common/PostShader.cpp
GPU/Common/PostShader.h
Move texture replacer to GPU/Common. Add new files ReplacedTexture.cpp/h too.
2023-03-09 20:11:53 +00:00
GPU/Common/TextureReplacer.cpp
GPU/Common/TextureReplacer.h
GPU/Common/ReplacedTexture.cpp
GPU/Common/ReplacedTexture.h
cmake: Merge GPU and Core targets
2016-10-12 14:46:29 +00:00
GPU/Debugger/Breakpoints.cpp
GPU/Debugger/Breakpoints.h
GE Debugger: Factor out host calls some. Moving more of this to cross platform for the web debugger.
2018-09-01 15:32:03 +00:00
GPU/Debugger/Debugger.cpp
GPU/Debugger/Debugger.h
GE Debugger: Add a table of register metadata. So far, not used, but indicates info about each GE register.
2022-09-05 17:38:38 +00:00
GPU/Debugger/GECommandTable.cpp
GPU/Debugger/GECommandTable.h
GE Debugger: Split playback into a separate file.
2019-06-24 01:48:40 +00:00
GPU/Debugger/Playback.cpp
GPU/Debugger/Playback.h
GE Debugger: Initial structure for GE data dumping. This snapshots the GE commands and drawing to facilitate debugging.
2017-06-03 04:53:20 +00:00
GPU/Debugger/Record.cpp
GPU/Debugger/Record.h
GE Debugger: Split playback into a separate file.
2019-06-24 01:48:40 +00:00
GPU/Debugger/RecordFormat.h
cmake: Merge GPU and Core targets
2016-10-12 14:46:29 +00:00
GPU/Debugger/Stepping.cpp
GPU/Debugger/Stepping.h
Texture from framebuffer: Logging improvements
2020-08-04 12:45:14 +00:00
GPU/ge_constants.h
GPU/GeConstants.cpp
cmake: Merge GPU and Core targets
2016-10-12 14:46:29 +00:00
GPU/GPUInterface.h
GPU/GeDisasm.cpp
GPU/GeDisasm.h
GPU/GPU.cpp
GPU/GPU.h
GPU/GPUCommon.cpp
GPU/GPUCommon.h
Create the GPUCommonHW class.
2023-02-25 13:24:59 +00:00
GPU/GPUCommonHW.cpp
GPU/GPUCommonHW.h
cmake: Merge GPU and Core targets
2016-10-12 14:46:29 +00:00
GPU/GPUState.cpp
GPU/GPUState.h
GPU/Math3D.cpp
GPU/Math3D.h
softgpu: Add class to manage and enqueue for bins. For now, just forwarding.
2022-01-13 17:26:59 +00:00
GPU/Software/BinManager.cpp
GPU/Software/BinManager.h
cmake: Merge GPU and Core targets
2016-10-12 14:46:29 +00:00
GPU/Software/Clipper.cpp
GPU/Software/Clipper.h
softgpu: Move draw pixel code to separate file. This separates things better anyway. No major perf impact.
2021-11-21 15:20:19 +00:00
GPU/Software/DrawPixel.cpp
GPU/Software/DrawPixel.h
softgpu: Add func to calculate pixel func ID. This normalizes some things, and eventually can be used for a jit key.
2021-11-20 21:11:52 +00:00
GPU/Software/FuncId.cpp
GPU/Software/FuncId.h
cmake: Merge GPU and Core targets
2016-10-12 14:46:29 +00:00
GPU/Software/Lighting.cpp
GPU/Software/Lighting.h
GPU/Software/Rasterizer.cpp
GPU/Software/Rasterizer.h
Isolate most of the softgpu specialization code to RasterizerRectangle. See comments.
2019-10-28 08:33:30 +00:00
GPU/Software/RasterizerRectangle.cpp
GPU/Software/RasterizerRectangle.h
softjit: Rename reg cache so it can be reused. Intentionally just the name changes in this commit.
2021-11-28 00:36:14 +00:00
GPU/Software/RasterizerRegCache.cpp
GPU/Software/RasterizerRegCache.h
SoftGPU: Move sampler code to a dedicated file.
2017-05-10 02:48:05 +00:00
GPU/Software/Sampler.cpp
GPU/Software/Sampler.h
cmake: Merge GPU and Core targets
2016-10-12 14:46:29 +00:00
GPU/Software/SoftGpu.cpp
GPU/Software/SoftGpu.h
GPU/Software/TransformUnit.cpp
GPU/Software/TransformUnit.h
Core: Format CMakeLists.txt consistently.
2018-10-28 18:33:25 +00:00
)
cmake: Merge GPU and Core targets
2016-10-12 14:46:29 +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
# '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}
Fix dependency of RISC-V targets on common JIT code Fixes #15861
2022-08-18 14:41:53 +00:00
${CommonJIT}
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/Config.cpp
Core/Config.h
Add ConfigSettings.cpp/h
2023-04-05 09:35:46 +00:00
Core/ConfigSettings.cpp
Core/ConfigSettings.h
Core: Move config enums to separate file. These are a bit strewn about and there are constants that aren't consistently used, which just adds confusion.
2018-06-17 01:42:31 +00:00
Core/ConfigValues.h
Break out EmuScreen's key/axis inputs to ControlMapper.cpp/h Additionally, break out the analog stick mapping to the same file. This will make more sense soon when I change where the analog mapping is called from, but want this refactor in separately for testing.
2021-07-08 19:30:23 +00:00
Core/ControlMapper.cpp
Core/ControlMapper.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/Core.cpp
Core/Core.h
Introduce "Compatibility Flags". These should be used very restrictively, see comment in Compatibility.h. Should help #8004, by disabling depth rounding in Fight Night round 3.
2015-09-26 14:01:16 +00:00
Core/Compatibility.cpp
Core/Compatibility.h
CMakeLists cleanup. Tabified CMakeLists. Introduced USING_GLES2 and X86 option and exposed USING_GLES2 to C++. Removed some redundancies and messiness.
2012-11-26 02:41:57 +00:00
Core/CoreParameter.h
Core/CoreTiming.cpp
Core/CoreTiming.h
Buildfix for Linux, fixes #1994.
2013-05-31 05:42:27 +00:00
Core/CwCheat.cpp
Core/CwCheat.h
Add HDRemaster.cpp/.h to Android.mk and CMakeLists.txt.
2013-06-23 04:25:55 +00:00
Core/HDRemaster.cpp
Core/HDRemaster.h
Make the instance counter global and initialized at startup. Turn off config saving for secondary instances.
2020-07-20 09:38:39 +00:00
Core/Instance.cpp
Core/Instance.h
Move math and some file and data conversion files out from native to Common. Buildfixing Move some file util files Buildfix Move KeyMap.cpp/h to Core where they belong better. libretro buildfix attempt Move ini_file More buildfixes
2020-10-03 22:25:21 +00:00
Core/KeyMap.cpp
Core/KeyMap.h
Move keymap defaults to a separate file. Not exactly a clean separation though.
2021-08-28 13:12:10 +00:00
Core/KeyMapDefaults.cpp
Core/KeyMapDefaults.h
Move ThreadEventQueue to its own file.
2013-08-10 16:08:31 +00:00
Core/ThreadEventQueue.h
TiltEventProcessor belongs in Core, not UI.
2023-02-01 14:04:32 +00:00
Core/TiltEventProcessor.h
Core/TiltEventProcessor.cpp
http: Move web server to core and use flags. This way we can independently control the debugger and disc sharing, since debugger could have security impact.
2018-04-21 20:51:18 +00:00
Core/WebServer.cpp
Core/WebServer.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
Debugger: Add more metadata for memory usage.
2021-02-02 08:08:05 +00:00
Core/Debugger/MemBlockInfo.cpp
Core/Debugger/MemBlockInfo.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/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
Debugger: Serve a simple log listener WebSocket. Planning to add more functionality to it, and sharing the reporting port is possibly not ideal - although it would make discovery easier.
2018-04-13 05:11:11 +00:00
Core/Debugger/WebSocket.cpp
Core/Debugger/WebSocket.h
Debugger: Initial breakpoint APIs.
2018-05-03 13:20:20 +00:00
Core/Debugger/WebSocket/BreakpointSubscriber.cpp
Core/Debugger/WebSocket/BreakpointSubscriber.h
Debugger: Initial register get/set APIs.
2018-04-15 15:50:25 +00:00
Core/Debugger/WebSocket/CPUCoreSubscriber.cpp
Core/Debugger/WebSocket/CPUCoreSubscriber.h
Debugger: Initial disasm API.
2018-04-23 03:35:24 +00:00
Core/Debugger/WebSocket/DisasmSubscriber.cpp
Core/Debugger/WebSocket/DisasmSubscriber.h
Debugger: Organize WebSocket event handling. Just a starting point to organize it. Trying to keep it simple.
2018-04-14 15:54:04 +00:00
Core/Debugger/WebSocket/GameBroadcaster.cpp
Core/Debugger/WebSocket/GameBroadcaster.h
Debugger: Add current game info.
2018-04-22 01:26:36 +00:00
Core/Debugger/WebSocket/GameSubscriber.cpp
Core/Debugger/WebSocket/GameSubscriber.h
Debugger: Add APIs to retrieve render image.
2018-06-16 22:07:25 +00:00
Core/Debugger/WebSocket/GPUBufferSubscriber.cpp
Core/Debugger/WebSocket/GPUBufferSubscriber.h
Debugger: Add an event for GE dump recording.
2018-09-01 17:58:28 +00:00
Core/Debugger/WebSocket/GPURecordSubscriber.cpp
Core/Debugger/WebSocket/GPURecordSubscriber.h
Debugger: Add initial GPU stats shell.
2021-09-19 21:24:43 +00:00
Core/Debugger/WebSocket/GPUStatsSubscriber.cpp
Core/Debugger/WebSocket/GPUStatsSubscriber.h
Debugger: Add HLE API funcs. Lumping function symbols in here too, they're pretty related...
2018-05-09 00:23:14 +00:00
Core/Debugger/WebSocket/HLESubscriber.cpp
Core/Debugger/WebSocket/HLESubscriber.h
Debugger: Broadcast ctrl input events. This can be useful to trigger debugging functionality on button press.
2021-01-19 01:51:35 +00:00
Core/Debugger/WebSocket/InputBroadcaster.cpp
Core/Debugger/WebSocket/InputBroadcaster.h
Debugger: Add API to trigger buttons.
2021-01-19 00:58:34 +00:00
Core/Debugger/WebSocket/InputSubscriber.cpp
Core/Debugger/WebSocket/InputSubscriber.h
Debugger: Organize WebSocket event handling. Just a starting point to organize it. Trying to keep it simple.
2018-04-14 15:54:04 +00:00
Core/Debugger/WebSocket/LogBroadcaster.cpp
Core/Debugger/WebSocket/LogBroadcaster.h
Debugger: Add simple API to control tagging detail. In case a client requires it.
2021-04-05 03:23:51 +00:00
Core/Debugger/WebSocket/MemoryInfoSubscriber.cpp
Core/Debugger/WebSocket/MemoryInfoSubscriber.h
Debugger: Add memory.read_*, memory write_*
2020-07-25 22:18:16 +00:00
Core/Debugger/WebSocket/MemorySubscriber.cpp
Core/Debugger/WebSocket/MemorySubscriber.h
Debugger: Add stub API for replay functionality.
2021-05-24 04:23:13 +00:00
Core/Debugger/WebSocket/ReplaySubscriber.cpp
Core/Debugger/WebSocket/ReplaySubscriber.h
Debugger: Organize WebSocket event handling. Just a starting point to organize it. Trying to keep it simple.
2018-04-14 15:54:04 +00:00
Core/Debugger/WebSocket/SteppingBroadcaster.cpp
Core/Debugger/WebSocket/SteppingBroadcaster.h
Debugger: Add stepping to WebSocket API.
2018-04-30 05:02:04 +00:00
Core/Debugger/WebSocket/SteppingSubscriber.cpp
Core/Debugger/WebSocket/SteppingSubscriber.h
Debugger: Initial register get/set APIs.
2018-04-15 15:50:25 +00:00
Core/Debugger/WebSocket/WebSocketUtils.cpp
Core/Debugger/WebSocket/WebSocketUtils.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
Implement NP Signin Dialog (faked signin)
2021-03-12 07:32:33 +00:00
Core/Dialog/PSPNpSigninDialog.cpp
Core/Dialog/PSPNpSigninDialog.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
GE Debugger: Simple framework to load dumps. This tries to execute them within the context of the emulator as much as possible, so we don't have weird bugs. Going with a file type so we can easily load the dump by opening the file directly.
2017-06-03 19:47:38 +00:00
Core/FileSystems/BlobFileSystem.cpp
Core/FileSystems/BlobFileSystem.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/FileSystems/BlockDevices.cpp
Core/FileSystems/BlockDevices.h
Core/FileSystems/DirectoryFileSystem.cpp
Core/FileSystems/DirectoryFileSystem.h
Core/FileSystems/FileSystem.h
Start untangling our include mess a little.
2013-12-29 22:28:31 +00:00
Core/FileSystems/FileSystem.cpp
CMakeLists cleanup. Tabified CMakeLists. Introduced USING_GLES2 and X86 option and exposed USING_GLES2 to C++. Removed some redundancies and messiness.
2012-11-26 02:41:57 +00:00
Core/FileSystems/ISOFileSystem.cpp
Core/FileSystems/ISOFileSystem.h
Core/FileSystems/MetaFileSystem.cpp
Core/FileSystems/MetaFileSystem.h
Move VirtualDiscFileSystem to its own file.
2013-07-28 06:46:26 +00:00
Core/FileSystems/VirtualDiscFileSystem.cpp
Core/FileSystems/VirtualDiscFileSystem.h
Oops, need to update these too.
2013-02-28 16:13:01 +00:00
Core/Font/PGF.cpp
Core/Font/PGF.h
CMakeLists cleanup. Tabified CMakeLists. Introduced USING_GLES2 and X86 option and exposed USING_GLES2 to C++. Removed some redundancies and messiness.
2012-11-26 02:41:57 +00:00
Core/HLE/FunctionWrappers.h
Core/HLE/HLE.cpp
Core/HLE/HLE.h
Initial preparations for ability to replace game functions with custom implementations. Also auto-saves hashmap additions and reapplies the hashmap on function rename so that if you rename a function that exists in several copies they will all be labelled. Note that actual function replacement is not activated yet.
2013-11-30 19:57:44 +00:00
Core/HLE/ReplaceTables.cpp
Core/HLE/ReplaceTables.h
Add a class to create helper threads from HLE. This should be usable from sceIo as well.
2014-05-23 06:38:21 +00:00
Core/HLE/HLEHelperThread.cpp
Core/HLE/HLEHelperThread.h
CMakeLists cleanup. Tabified CMakeLists. Introduced USING_GLES2 and X86 option and exposed USING_GLES2 to C++. Removed some redundancies and messiness.
2012-11-26 02:41:57 +00:00
Core/HLE/HLETables.cpp
Core/HLE/HLETables.h
Refactor down the begin/end callback stuff.
2013-09-03 00:59:47 +00:00
Core/HLE/KernelWaitHelpers.h
Build fix for non-windows
2016-08-28 12:55:25 +00:00
Core/HLE/KUBridge.h
Core/HLE/KUBridge.cpp
Plugins: Support for loading game-specific plugins.
2020-08-26 02:54:51 +00:00
Core/HLE/Plugins.h
Core/HLE/Plugins.cpp
Move ThreadQueueList to a separate file. Not reused anywhere, but just so it's a little cleaner.
2015-09-12 20:03:15 +00:00
Core/HLE/ThreadQueueList.h
CMakeLists cleanup. Tabified CMakeLists. Introduced USING_GLES2 and X86 option and exposed USING_GLES2 to C++. Removed some redundancies and messiness.
2012-11-26 02:41:57 +00:00
Core/HLE/__sceAudio.cpp
Core/HLE/__sceAudio.h
Implement sceAdler32
2015-02-08 01:35:00 +00:00
Core/HLE/sceAdler.cpp
Core/HLE/sceAdler.h
CMakeLists cleanup. Tabified CMakeLists. Introduced USING_GLES2 and X86 option and exposed USING_GLES2 to C++. Removed some redundancies and messiness.
2012-11-26 02:41:57 +00:00
Core/HLE/sceAtrac.cpp
Core/HLE/sceAtrac.h
Core/HLE/sceAudio.cpp
Buildfix for Linux.
2013-06-09 09:17:17 +00:00
Core/HLE/sceAudiocodec.cpp
Core/HLE/sceAudiocodec.h
Another attempt to fix linux build
2015-03-08 04:50:06 +00:00
Core/HLE/sceAudioRouting.cpp
Core/HLE/sceAudioRouting.h
CMakeLists cleanup. Tabified CMakeLists. Introduced USING_GLES2 and X86 option and exposed USING_GLES2 to C++. Removed some redundancies and messiness.
2012-11-26 02:41:57 +00:00
Core/HLE/sceAudio.h
Add dummy sceCcc Fix loading of Gensou Chronicle
2013-06-30 12:21:56 +00:00
Core/HLE/sceCcc.h
Core/HLE/sceCcc.cpp
Save encryption. Load/Save encrypted/decrypted save RE of Chnnlsv lib Correct size bug in kirk
2013-01-28 23:11:02 +00:00
Core/HLE/sceChnnlsv.cpp
Core/HLE/sceChnnlsv.h
CMakeLists cleanup. Tabified CMakeLists. Introduced USING_GLES2 and X86 option and exposed USING_GLES2 to C++. Removed some redundancies and messiness.
2012-11-26 02:41:57 +00:00
Core/HLE/sceCtrl.cpp
Core/HLE/sceCtrl.h
Buildfix for Android, Linux, iOS. Fixes #1184.
2013-04-05 17:14:12 +00:00
Core/HLE/sceDeflt.cpp
Core/HLE/sceDeflt.h
CMakeLists cleanup. Tabified CMakeLists. Introduced USING_GLES2 and X86 option and exposed USING_GLES2 to C++. Removed some redundancies and messiness.
2012-11-26 02:41:57 +00:00
Core/HLE/sceDisplay.cpp
Core/HLE/sceDisplay.h
Core/HLE/sceDmac.cpp
Core/HLE/sceDmac.h
Add sceG729 module
2015-03-08 05:27:40 +00:00
Core/HLE/sceG729.cpp
Core/HLE/sceG729.h
Non-Windows buildfix
2013-03-19 13:28:26 +00:00
Core/HLE/sceGameUpdate.cpp
Core/HLE/sceGameUpdate.h
CMakeLists cleanup. Tabified CMakeLists. Introduced USING_GLES2 and X86 option and exposed USING_GLES2 to C++. Removed some redundancies and messiness.
2012-11-26 02:41:57 +00:00
Core/HLE/sceGe.cpp
Core/HLE/sceGe.h
Core/HLE/sceFont.cpp
Core/HLE/sceFont.h
Add sceHeap to cmakelists and android.mk
2013-09-04 08:34:00 +00:00
Core/HLE/sceHeap.cpp
Core/HLE/sceHeap.h
CMakeLists cleanup. Tabified CMakeLists. Introduced USING_GLES2 and X86 option and exposed USING_GLES2 to C++. Removed some redundancies and messiness.
2012-11-26 02:41:57 +00:00
Core/HLE/sceHprm.cpp
Core/HLE/sceHprm.h
Core/HLE/sceHttp.cpp
Core/HLE/sceHttp.h
Core/HLE/sceImpose.cpp
Core/HLE/sceImpose.h
Core/HLE/sceIo.cpp
Core/HLE/sceIo.h
Added sceJpeg & sceMd5
2013-05-15 11:49:34 +00:00
Core/HLE/sceJpeg.cpp
Core/HLE/sceJpeg.h
CMakeLists cleanup. Tabified CMakeLists. Introduced USING_GLES2 and X86 option and exposed USING_GLES2 to C++. Removed some redundancies and messiness.
2012-11-26 02:41:57 +00:00
Core/HLE/sceKernel.cpp
Core/HLE/sceKernel.h
Core/HLE/sceKernelAlarm.cpp
Core/HLE/sceKernelAlarm.h
Core/HLE/sceKernelEventFlag.cpp
Core/HLE/sceKernelEventFlag.h
Address Unknown's feedback https://github.com/hrydgard/ppsspp/pull/7965/files
2019-08-08 15:13:47 +00:00
Core/HLE/sceKernelHeap.cpp
Core/HLE/sceKernelHeap.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/sceKernelInterrupt.cpp
Core/HLE/sceKernelInterrupt.h
Core/HLE/sceKernelMbx.cpp
Core/HLE/sceKernelMbx.h
Core/HLE/sceKernelMemory.cpp
Core/HLE/sceKernelMemory.h
Core/HLE/sceKernelModule.cpp
Core/HLE/sceKernelModule.h
Core/HLE/sceKernelMsgPipe.cpp
Core/HLE/sceKernelMsgPipe.h
Core/HLE/sceKernelMutex.cpp
Core/HLE/sceKernelMutex.h
Core/HLE/sceKernelSemaphore.cpp
Core/HLE/sceKernelSemaphore.h
Core/HLE/sceKernelThread.cpp
Core/HLE/sceKernelThread.h
Core/HLE/sceKernelTime.cpp
Core/HLE/sceKernelTime.h
Core/HLE/sceKernelVTimer.cpp
Core/HLE/sceKernelVTimer.h
Core/HLE/sceMpeg.cpp
Core/HLE/sceMpeg.h
Core/HLE/sceNet.cpp
Core/HLE/sceNet.h
Split out sceNetAdhoc* into a separate file from sceNet.
2013-09-06 22:55:42 +00:00
Core/HLE/sceNetAdhoc.cpp
Core/HLE/sceNetAdhoc.h
Moves proAdhoc extra functions to a separate file
2013-11-10 01:26:31 +00:00
Core/HLE/proAdhoc.h
Core/HLE/proAdhoc.cpp
build fix for non-windows
2014-08-04 13:15:58 +00:00
Core/HLE/proAdhocServer.h
Core/HLE/proAdhocServer.cpp
More buildfixing...
2012-12-06 18:44:29 +00:00
Core/HLE/sceOpenPSID.cpp
Core/HLE/sceOpenPSID.h
Non-Windows buildfix.
2013-03-15 14:45:00 +00:00
Core/HLE/sceP3da.cpp
Core/HLE/sceP3da.h
Implement sceMt19937()
2014-01-25 04:19:48 +00:00
Core/HLE/sceMt19937.cpp
Core/HLE/sceMt19937.h
Added sceJpeg & sceMd5
2013-05-15 11:49:34 +00:00
Core/HLE/sceMd5.cpp
Core/HLE/sceMd5.h
Add sceMp4 to cmakelists
2013-04-28 00:27:48 +00:00
Core/HLE/sceMp4.cpp
Core/HLE/sceMp4.h
Separate sceMp3 from sceMpeg
2013-05-06 13:09:40 +00:00
Core/HLE/sceMp3.cpp
Core/HLE/sceMp3.h
More buildfixing...
2012-12-06 18:44:29 +00:00
Core/HLE/sceParseHttp.cpp
Core/HLE/sceParseHttp.h
Core/HLE/sceParseUri.cpp
Core/HLE/sceParseUri.h
CMakeLists cleanup. Tabified CMakeLists. Introduced USING_GLES2 and X86 option and exposed USING_GLES2 to C++. Removed some redundancies and messiness.
2012-11-26 02:41:57 +00:00
Core/HLE/scePower.cpp
Core/HLE/scePower.h
Core/HLE/scePsmf.cpp
Core/HLE/scePsmf.h
Core/HLE/sceRtc.cpp
Core/HLE/sceRtc.h
Core/HLE/sceSas.cpp
Core/HLE/sceSas.h
Implement sceSfmt19937 module.
2015-02-15 05:22:20 +00:00
Core/HLE/sceSfmt19937.cpp
Core/HLE/sceSfmt19937.h
add files include in CMakeLists.txt and Android.mk.
2014-12-05 07:24:39 +00:00
Core/HLE/sceSha256.cpp
Core/HLE/sceSha256.h
More buildfixing...
2012-12-06 18:44:29 +00:00
Core/HLE/sceSsl.cpp
Core/HLE/sceSsl.h
CMakeLists cleanup. Tabified CMakeLists. Introduced USING_GLES2 and X86 option and exposed USING_GLES2 to C++. Removed some redundancies and messiness.
2012-11-26 02:41:57 +00:00
Core/HLE/sceUmd.cpp
Core/HLE/sceUmd.h
Create files for sceUsb
2012-12-17 20:45:32 +00:00
Core/HLE/sceUsb.cpp
Core/HLE/sceUsb.h
Add sceUsbAcc stubs, improves EyePet(fixes endless loop on boot)
2018-08-15 16:35:07 +00:00
Core/HLE/sceUsbAcc.cpp
Core/HLE/sceUsbAcc.h
Integrate sceUsbGps and sceUsbCam with Android
2017-08-20 18:03:06 +00:00
Core/HLE/sceUsbCam.cpp
Core/HLE/sceUsbCam.h
Add sceUsbGps module
2014-08-12 16:11:26 +00:00
Core/HLE/sceUsbGps.cpp
Core/HLE/sceUsbGps.h
sceUsbMic
2019-08-03 15:33:43 +00:00
Core/HLE/sceUsbMic.cpp
Core/HLE/sceUsbMic.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
Moving sceNpMatching2-stuff to sceNp2.cpp/h. PS: Register_sceNpMatching2 not being added to HLETables because currently the callback didn't work properly yet and could crash the game.
2022-03-05 12:58:09 +00:00
Core/HLE/sceNp2.cpp
Core/HLE/sceNp2.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/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
SaveState: Split Do() into a separate header.
2020-08-10 04:20:42 +00:00
Core/HW/BufferQueue.cpp
Core/HW/BufferQueue.h
Add camera support for linux (V4L2)
2020-01-09 13:57:09 +00:00
Core/HW/Camera.cpp
Core/HW/Camera.h
Display: Move listeners to separate HW file. Mixing this in with the HLE management funcs was messy.
2022-01-30 17:41:08 +00:00
Core/HW/Display.cpp
Core/HW/Display.h
Update cmakelists, update pspautotests
2013-01-05 15:23:21 +00:00
Core/HW/MediaEngine.cpp
Core/HW/MediaEngine.h
Buildfixes
2013-06-01 21:37:51 +00:00
Core/HW/MpegDemux.cpp
Core/HW/MpegDemux.h
CMakeLists cleanup. Tabified CMakeLists. Introduced USING_GLES2 and X86 option and exposed USING_GLES2 to C++. Removed some redundancies and messiness.
2012-11-26 02:41:57 +00:00
Core/HW/MemoryStick.cpp
Core/HW/MemoryStick.h
sceSas cleanup
2012-12-16 19:40:49 +00:00
Core/HW/SasAudio.cpp
Core/HW/SasAudio.h
Hook up SasReverb. It sounds more like a buzzsaw than a reverb at the moment, needs debugging. Added a bit of code that only enables it when a reverbed sound is active. This will need to be turned off later but useful right now for hearing when it's used..
2015-10-27 11:34:54 +00:00
Core/HW/SasReverb.cpp
Core/HW/SasReverb.h
Replace outAudioQueue with Dolphin's resampler.
2015-01-11 14:13:43 +00:00
Core/HW/StereoResampler.cpp
Core/HW/StereoResampler.h
CMakeLists cleanup. Tabified CMakeLists. Introduced USING_GLES2 and X86 option and exposed USING_GLES2 to C++. Removed some redundancies and messiness.
2012-11-26 02:41:57 +00:00
Core/Loaders.cpp
Core/Loaders.h
Move file loader code into directories. Not making sense to put these all in the same fiel anymore.
2015-06-27 17:58:44 +00:00
Core/FileLoaders/CachingFileLoader.cpp
Core/FileLoaders/CachingFileLoader.h
Add a file loader to perform disk caching. Had to do some tricks to handle gameinfocache threads properly.
2015-06-28 01:32:21 +00:00
Core/FileLoaders/DiskCachingFileLoader.cpp
Core/FileLoaders/DiskCachingFileLoader.h
Move file loader code into directories. Not making sense to put these all in the same fiel anymore.
2015-06-27 17:58:44 +00:00
Core/FileLoaders/HTTPFileLoader.cpp
Core/FileLoaders/HTTPFileLoader.h
Core/FileLoaders/LocalFileLoader.cpp
Core/FileLoaders/LocalFileLoader.h
Use a background thread to load ISO into RAM. This way we don't get slow startup. This will also cache the CSO data, for example, rather than the raw data, using up less RAM. It might even be reasonable to enable on 32-bit.
2015-12-19 23:23:25 +00:00
Core/FileLoaders/RamCachingFileLoader.cpp
Core/FileLoaders/RamCachingFileLoader.h
Move file loader code into directories. Not making sense to put these all in the same fiel anymore.
2015-06-27 17:58:44 +00:00
Core/FileLoaders/RetryingFileLoader.cpp
Core/FileLoaders/RetryingFileLoader.h
CMakeLists cleanup. Tabified CMakeLists. Introduced USING_GLES2 and X86 option and exposed USING_GLES2 to C++. Removed some redundancies and messiness.
2012-11-26 02:41:57 +00:00
Core/MIPS/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 back our older VFPU approximations, as fallbacks if files are missing. PR #16984 added more accurate versions of these functions, but they require large lookup tables stored in assets/. If these files are missing, PPSSPP would simply crash, which isn't good. We should probably try to warn the user somehow that these files are missing, though...
2023-04-03 09:33:41 +00:00
Core/MIPS/MIPSVFPUFallbacks.cpp
Core/MIPS/MIPSVFPUFallbacks.h
Added MIPS assembler
2013-07-28 12:50:25 +00:00
Core/MIPS/MIPSAsm.cpp
Core/MIPS/MIPSAsm.h
Split the fault handling from MemMap.cpp to MemFault.cpp.
2020-07-15 10:10:33 +00:00
Core/MemFault.cpp
Core/MemFault.h
CMakeLists cleanup. Tabified CMakeLists. Introduced USING_GLES2 and X86 option and exposed USING_GLES2 to C++. Removed some redundancies and messiness.
2012-11-26 02:41:57 +00:00
Core/MemMap.cpp
Core/MemMap.h
Core/MemMapFunctions.cpp
Make Memory::Memcpy() execute memchecks directly. This makes it easier to handle breakpoints in HLE.
2015-04-06 01:03:50 +00:00
Core/MemMapHelpers.h
CMakeLists cleanup. Tabified CMakeLists. Introduced USING_GLES2 and X86 option and exposed USING_GLES2 to C++. Removed some redundancies and messiness.
2012-11-26 02:41:57 +00:00
Core/PSPLoaders.cpp
Core/PSPLoaders.h
Add basic server reporting interface, needs work.
2013-03-01 16:58:05 +00:00
Core/Reporting.cpp
Core/Reporting.h
Replay: Initial structure for replay functionality.
2018-03-18 06:30:04 +00:00
Core/Replay.cpp
Core/Replay.h
Add Verify() method to quickly test states work.
2012-12-27 18:34:22 +00:00
Core/SaveState.cpp
Core/SaveState.h
Take screenshots with savestates.
2014-12-21 07:14:46 +00:00
Core/Screenshot.cpp
Core/Screenshot.h
CMakeLists cleanup. Tabified CMakeLists. Introduced USING_GLES2 and X86 option and exposed USING_GLES2 to C++. Removed some redundancies and messiness.
2012-11-26 02:41:57 +00:00
Core/System.cpp
Core/System.h
Remove Timer.cpp/h. Move various collections into Common/Data/Collections.
2020-10-05 18:58:33 +00:00
Core/ThreadPools.cpp
Core/ThreadPools.h
Add a NEON method to apply the volume.
2015-01-11 21:50:52 +00:00
Core/Util/AudioFormat.cpp
Core/Util/AudioFormat.h
Initial draft of the Homebrew Store. Lets you install a few homebrew.
2013-11-20 13:42:48 +00:00
Core/Util/GameManager.cpp
Core/Util/GameManager.h
Added UPnP Support Fix i18n type
2020-01-17 19:32:09 +00:00
Core/Util/PortManager.cpp
Core/Util/PortManager.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
cmake: Merge GPU and Core targets
2016-10-12 14:46:29 +00:00
${GPU_SOURCES}
glew: Move to ext
2016-10-12 15:30:18 +00:00
ext/disarm.cpp
riscv: Add disassembler. From https://github.com/anthony-coulter/riscv-disassembler. Modified slightly to pull in less headers in the h, prefix funcs.
2022-12-30 19:36:32 +00:00
ext/disarm.h
ext/riscv-disas.cpp
ext/riscv-disas.h
cmake: Generate git-version.cpp in the build dir
2021-11-29 18:05:13 +00:00
${CMAKE_CURRENT_BINARY_DIR}/git-version.cpp
Core: Format CMakeLists.txt consistently.
2018-10-28 18:33:25 +00:00
)
Pick some safe changes from the android gradle branch (including windows CMake fixes)
2016-12-05 15:51:28 +00:00
if(ANDROID)
Core: Format CMakeLists.txt consistently.
2018-10-28 18:33:25 +00:00
set(CoreExtraLibs ${CoreExtraLibs} android)
if(X86_64)
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-Bsymbolic")
endif()
Remove trailing whitespace from CMakeLists.txt
2017-11-18 16:16:44 +00:00
endif()
Build: Allow compiling without armips.
2022-12-17 18:08:46 +00:00
if(USE_ARMIPS)
set(CoreExtraLibs ${CoreExtraLibs} armips)
else()
add_definitions(-DNO_ARMIPS=1)
endif()
Pick some safe changes from the android gradle branch (including windows CMake fixes)
2016-12-05 15:51:28 +00:00
Get Vulkan going on Linux
2017-12-15 15:03:48 +00:00
# needed for VK_USE_PLATFORM_XCB_KHR only
#if(VULKAN AND NOT WIN32)
# target_link_libraries(native X11-xcb X11)
#endif()
CMake: Fix build when ENABLE_SPVREMAPPER=OFF It previously tried to link inconditionally to SPVRemapper. Signed-off-by: Paul Cercueil <paul@crapouillou.net>
2021-03-17 15:23:38 +00:00
set(GlslangLibs glslang OGLCompiler OSDependent SPIRV spirv-cross-glsl)
if (ENABLE_SPVREMAPPER)
list(APPEND GlslangLibs SPVRemapper)
endif()
Buildfix the CMake-based Windows build
2017-02-16 16:06:03 +00:00
fix mingw and msvc cmake builds.
2018-03-23 02:18:13 +00:00
if(WIN32)
Core: Format CMakeLists.txt consistently.
2018-10-28 18:33:25 +00:00
set(GlslangLibs ${GlslangLibs} spirv-cross-hlsl)
fix mingw and msvc cmake builds.
2018-03-23 02:18:13 +00:00
endif()
cmake: use vendor-neutral GL implementation when available; fallback to legacy GL
2021-08-02 18:22:35 +00:00
if(OPENGL_opengl_LIBRARY AND OpenGL_GL_PREFERENCE STREQUAL GLVND AND NOT APPLE)
Build: allow using system zstd library
2021-10-28 08:30:05 +00:00
set(OPENGL_LIBRARIES OpenGL::OpenGL)
endif()
if(USE_SYSTEM_ZSTD)
find_package(ZSTD REQUIRED)
target_include_directories(${CoreLibName} PRIVATE ${ZSTD_INCLUDE_DIR})
target_link_libraries(${CoreLibName} ${ZSTD_LIBRARY})
else()
set(ZSTD_BUILD_PROGRAMS OFF CACHE BOOL "we don't need zstd programs" FORCE)
Build: Get rid of legacy zstd support. This refers to old versions of zstd we never used, and the code also generates warnings when it's built.
2022-12-04 16:08:20 +00:00
set(ZSTD_LEGACY_SUPPORT OFF CACHE BOOL "we don't use any old zstd files" FORCE)
Build: allow using system zstd library
2021-10-28 08:30:05 +00:00
add_subdirectory(ext/zstd/build/cmake EXCLUDE_FROM_ALL)
set(CoreExtraLibs ${CoreExtraLibs} libzstd_static)
include_directories(ext/zstd/lib)
fix overlinking of OpenGL libraries
2021-02-20 09:19:15 +00:00
endif()
Buildfix the CMake-based Windows build
2017-02-16 16:06:03 +00:00
target_link_libraries(${CoreLibName} Common native kirk cityhash sfmt19937 xbrz xxhash ${GlslangLibs}
Build Vulkan on all platforms, won't be used if not supported.
2017-12-21 13:13:55 +00:00
${CoreExtraLibs} ${OPENGL_LIBRARIES} ${X11_LIBRARIES} ${CMAKE_DL_LIBS})
armips: Update to UTF-8/c++17 armips.
2022-01-17 19:13:24 +00:00
target_compile_features(${CoreLibName} PUBLIC cxx_std_17)
cmake: New FindFFmpeg module This new module should be able to handle both libraries in the regular paths and fallback to pkg-config. It is also able to find dynamic libraries, not just static libraries. It will generate imported targets with the name FFmpeg::<lib> that you can use in your scripts. The way it’s used in our main build script has been updated to match. We also won’t link external libraries used by ffmpeg automatically since it is not reliable and depend on custom options. You should use a proper static build with no external dependencies or a shared build that will have the proper dependencies listed.
2016-12-05 09:37:51 +00:00
if(FFmpeg_FOUND)
Core: Format CMakeLists.txt consistently.
2018-10-28 18:33:25 +00:00
target_compile_definitions(${CoreLibName} PRIVATE USE_FFMPEG=1)
Change ffmpeg include headers priority to avoid collission with system ffmpeg
2021-08-13 03:05:43 +00:00
set_target_properties(${CoreLibName} PROPERTIES NO_SYSTEM_FROM_IMPORTED true)
target_include_directories(${CoreLibName} BEFORE PUBLIC ${FFmpeg_INCLUDE_avcodec})
Core: Format CMakeLists.txt consistently.
2018-10-28 18:33:25 +00:00
target_link_libraries(${CoreLibName}
FFmpeg::avcodec
FFmpeg::avformat
FFmpeg::avutil
FFmpeg::swresample
FFmpeg::swscale
${ZLIB_LIBRARY}
)
cmake: New FindFFmpeg module This new module should be able to handle both libraries in the regular paths and fallback to pkg-config. It is also able to find dynamic libraries, not just static libraries. It will generate imported targets with the name FFmpeg::<lib> that you can use in your scripts. The way it’s used in our main build script has been updated to match. We also won’t link external libraries used by ffmpeg automatically since it is not reliable and depend on custom options. You should use a proper static build with no external dependencies or a shared build that will have the proper dependencies listed.
2016-12-05 09:37:51 +00:00
endif()
Enable Discord integration for Mac and Linux.
2018-08-18 08:11:15 +00:00
# Discord integration
cmake: Disable discord-rpc for libretro builds.
2020-03-17 19:32:07 +00:00
if(USE_DISCORD AND NOT IOS AND NOT LIBRETRO)
Discord: Add cmake option to disable.
2018-11-10 15:39:27 +00:00
add_definitions(-DUSE_DISCORD=1)
Core: Format CMakeLists.txt consistently.
2018-10-28 18:33:25 +00:00
target_link_libraries(${CoreLibName} discord-rpc)
Untested attempt to fix ios/mac discord (no machines around right now)
2018-08-26 21:10:37 +00:00
endif()
Enable Discord integration for Mac and Linux.
2018-08-18 08:11:15 +00:00
Added UPnP Support Fix i18n type
2020-01-17 19:32:09 +00:00
# miniUPnPc integration (MiniUPnPc supposed to works on any POSIX system, not sure if some of these are redundant/not needed tho)
if(USE_MINIUPNPC)
ext: Support building with system miniUPnPc
2021-11-30 03:29:28 +00:00
if(USE_SYSTEM_MINIUPNPC)
find_package(MINIUPNPC REQUIRED)
target_include_directories(${CoreLibName} PRIVATE ${MINIUPNP_INCLUDE_DIR})
target_link_libraries(${CoreLibName} ${MINIUPNP_LIBRARY})
Use system headers when building with system miniupnpc Fixes https://github.com/hrydgard/ppsspp/pull/15185
2021-12-05 16:21:14 +00:00
add_definitions(-DWITH_UPNP -DUSE_SYSTEM_MINIUPNPC)
Added UPnP Support Fix i18n type
2020-01-17 19:32:09 +00:00
else()
ext: Support building with system miniUPnPc
2021-11-30 03:29:28 +00:00
set (MINIUPNPC_VERSION 2.1) # used by miniupnpcstrings.h.cmake
set (MINIUPNPC_API_VERSION 17)
option(UPNPC_BUILD_STATIC "Build static library" TRUE)
option(NO_GETADDRINFO "Define NO_GETADDRINFO" FALSE)
mark_as_advanced(NO_GETADDRINFO)
if (NO_GETADDRINFO)
add_definitions(-DNO_GETADDRINFO)
endif()
Change ffmpeg include headers priority to avoid collission with system ffmpeg
2021-08-13 03:05:43 +00:00
ext: Support building with system miniUPnPc
2021-11-30 03:29:28 +00:00
if (NOT WIN32)
add_definitions (-DMINIUPNPC_SET_SOCKET_TIMEOUT)
add_definitions (-D_BSD_SOURCE -D_DEFAULT_SOURCE -D_POSIX_C_SOURCE=200112L)
endif()
if (MACOSX)
add_definitions (-D_DARWIN_C_SOURCE)
endif()
if(WIN32)
Use system headers when building with system miniupnpc Fixes https://github.com/hrydgard/ppsspp/pull/15185
2021-12-05 16:21:14 +00:00
add_definitions(-DWIN32 -DMINIUPNP_EXPORTS)
ext: Support building with system miniUPnPc
2021-11-30 03:29:28 +00:00
else()
add_definitions(-fPIC)
endif()
add_definitions(-DWITH_UPNP -DMINIUPNP_STATICLIB)
set(MINIUPNP_DIR "ext/miniupnp/miniupnpc")
include_directories(${CMAKE_CURRENT_BINARY_DIR})
configure_file(${MINIUPNP_DIR}/miniupnpcstrings.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/miniupnpcstrings.h) # by default miniupnp repo doesn't contains miniupnpcstrings.h and need to be generated
set(MINIUPNPC_SOURCES
# the needed bits of miniupnpc (no python module, no tests, no cli)
${MINIUPNP_DIR}/addr_is_reserved.c
${MINIUPNP_DIR}/connecthostport.c
${MINIUPNP_DIR}/igd_desc_parse.c
${MINIUPNP_DIR}/minisoap.c
${MINIUPNP_DIR}/minissdpc.c
${MINIUPNP_DIR}/miniupnpc.c
${MINIUPNP_DIR}/miniwget.c
${MINIUPNP_DIR}/minixml.c
${MINIUPNP_DIR}/minixmlvalid.c
${MINIUPNP_DIR}/portlistingparse.c
${MINIUPNP_DIR}/receivedata.c
#${MINIUPNP_DIR}/upnpc.c # causing an error due to already existing _main()
${MINIUPNP_DIR}/upnpcommands.c
${MINIUPNP_DIR}/upnpdev.c
${MINIUPNP_DIR}/upnperrors.c
${MINIUPNP_DIR}/upnpreplyparse.c
${CMAKE_CURRENT_BINARY_DIR}/miniupnpcstrings.h
)
if (NOT WIN32 AND NOT CMAKE_SYSTEM_NAME STREQUAL "AmigaOS")
#set(MINIUPNPC_SOURCES ${MINIUPNPC_SOURCES} minissdpc.c) # causing an error due to duplication in MINIUPNPC_SOURCES?
endif()
if (WIN32)
set_source_files_properties(${MINIUPNPC_SOURCES} PROPERTIES COMPILE_DEFINITIONS "MINIUPNP_STATICLIB;MINIUPNP_EXPORTS")
set(LDLIBS ws2_32 iphlpapi ${LDLIBS})
#elseif (CMAKE_SYSTEM_NAME STREQUAL "Solaris")
# find_library (SOCKET_LIBRARY NAMES socket)
# find_library (NSL_LIBRARY NAMES nsl)
# find_library (RESOLV_LIBRARY NAMES resolv)
# set (LDLIBS ${SOCKET_LIBRARY} ${NSL_LIBRARY} ${RESOLV_LIBRARY} ${LDLIBS})
endif()
if (UPNPC_BUILD_STATIC)
add_library(miniupnpc STATIC ${MINIUPNPC_SOURCES})
target_link_libraries(${CoreLibName} miniupnpc ${LDLIBS})
set(UPNPC_LIBRARY miniupnpc)
if (MSVC)
# Suppress noise warnings
target_compile_definitions(miniupnpc PRIVATE _CRT_SECURE_NO_WARNINGS _WINSOCK_DEPRECATED_NO_WARNINGS)
endif()
Fix Windows/CMake build with Visual Studio
2020-08-12 18:15:32 +00:00
endif()
Added UPnP Support Fix i18n type
2020-01-17 19:32:09 +00:00
endif()
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
setup_target_project(${CoreLibName} Core)
Fix Windows/CMake build with Visual Studio
2020-08-12 18:15:32 +00:00
# Generate git-version at build time.
add_custom_target(GitVersion DEPENDS something_that_never_exists)
set(WIN_VERSION_CMD "")
if (WIN32)
set(WIN_VERSION_CMD COMMAND ${CMAKE_SOURCE_DIR}/Windows/git-version-gen.cmd PPSSPPWindows)
endif()
Add git-version.c generation to CMake.
2013-03-02 19:01:08 +00:00
add_custom_command(OUTPUT something_that_never_exists
COMMAND ${CMAKE_COMMAND} -DSOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR}
cmake: Generate git-version.cpp in the build dir
2021-11-29 18:05:13 +00:00
-DOUTPUT_DIR=${CMAKE_CURRENT_BINARY_DIR}
Fix Windows/CMake build with Visual Studio
2020-08-12 18:15:32 +00:00
-P ${CMAKE_CURRENT_SOURCE_DIR}/git-version.cmake
${WIN_VERSION_CMD})
Add git-version.c generation to CMake.
2013-03-02 19:01:08 +00:00
cmake: Generate git-version.cpp in the build dir
2021-11-29 18:05:13 +00:00
set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/git-version.cpp
Qt: Mark git-version.cpp to skip automoc. Fixes #10829.
2018-06-03 15:37:09 +00:00
PROPERTIES GENERATED TRUE
SKIP_AUTOMOC ON)
Add git-version.c generation to CMake.
2013-03-02 19:01:08 +00:00
add_dependencies(${CoreLibName} GitVersion)
Pick some safe changes from the android gradle branch (including windows CMake fixes)
2016-12-05 15:51:28 +00:00
set(WindowsFiles
Windows/DSoundStream.cpp
Windows/DSoundStream.h
Cleanup: Split out the WASAPI code into its own file.
2017-06-27 09:46:10 +00:00
Windows/WindowsAudio.cpp
Windows/WindowsAudio.h
Windows/WASAPIStream.cpp
Windows/WASAPIStream.h
Pick some safe changes from the android gradle branch (including windows CMake fixes)
2016-12-05 15:51:28 +00:00
Windows/Debugger/BreakpointWindow.cpp
Windows/Debugger/BreakpointWindow.h
Windows/Debugger/DumpMemoryWindow.cpp
Windows/Debugger/DumpMemoryWindow.h
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/DebuggerShared.cpp
Windows/Debugger/DebuggerShared.h
Windows/Debugger/Debugger_Disasm.cpp
Windows/Debugger/Debugger_Disasm.h
Windows/Debugger/Debugger_MemoryDlg.cpp
Windows/Debugger/Debugger_MemoryDlg.h
Windows/Debugger/Debugger_Lists.cpp
Windows/Debugger/Debugger_Lists.h
Windows/Debugger/Debugger_SymbolMap.h
Windows/Debugger/Debugger_VFPUDlg.cpp
Windows/Debugger/Debugger_VFPUDlg.h
Debugger: Allow adding/removing watches.
2023-04-09 07:35:37 +00:00
Windows/Debugger/WatchItemWindow.cpp
Windows/Debugger/WatchItemWindow.h
Pick some safe changes from the android gradle branch (including windows CMake fixes)
2016-12-05 15:51:28 +00:00
Windows/GEDebugger/CtrlDisplayListView.cpp
Windows/GEDebugger/SimpleGLWindow.cpp
Windows/GEDebugger/TabState.cpp
Windows/GEDebugger/VertexPreview.cpp
Windows/GEDebugger/CtrlDisplayListView.h
Windows/GEDebugger/SimpleGLWindow.h
Windows/GEDebugger/TabState.h
Windows/GEDebugger/GEDebugger.cpp
Windows/GEDebugger/TabDisplayLists.cpp
Windows/GEDebugger/TabVertices.cpp
Windows/GEDebugger/GEDebugger.h
Windows/GEDebugger/TabDisplayLists.h
Windows/GEDebugger/TabVertices.h
Add camera support for windows.
2020-01-13 07:06:02 +00:00
Windows/BufferLock.h
Windows/CaptureDevice.cpp
Windows/CaptureDevice.h
Pick some safe changes from the android gradle branch (including windows CMake fixes)
2016-12-05 15:51:28 +00:00
Windows/DinputDevice.cpp
Windows/DinputDevice.h
Windows/DSoundStream.cpp
Windows/DSoundStream.h
Windows/EmuThread.cpp
Windows/EmuThread.h
Windows/GeDebugger/GeDebugger.cpp
Windows/GPU/D3D9Context.cpp
Windows/GPU/D3D9Context.h
Buildfix the CMake-based Windows build
2017-02-16 16:06:03 +00:00
Windows/GPU/D3D11Context.cpp
Windows/GPU/D3D11Context.h
Pick some safe changes from the android gradle branch (including windows CMake fixes)
2016-12-05 15:51:28 +00:00
Windows/GPU/WindowsGLContext.cpp
Windows/GPU/WindowsVulkanContext.cpp
Windows/InputBox.cpp
Windows/InputBox.h
Windows/InputDevice.cpp
Windows/InputDevice.h
Debugger: Centralize context menu handling. This deduplicates a bit, but more importantly keeps all the IDs together.
2021-10-08 02:47:16 +00:00
Windows/W32Util/ContextMenu.h
Windows/W32Util/ContextMenu.h
Pick some safe changes from the android gradle branch (including windows CMake fixes)
2016-12-05 15:51:28 +00:00
Windows/W32Util/DialogManager.cpp
Windows/W32Util/DialogManager.h
Windows/W32Util/Misc.cpp
Windows/W32Util/Misc.h
Windows/W32Util/ShellUtil.cpp
Windows/W32Util/ShellUtil.h
Windows/W32Util/TabControl.cpp
Windows/W32Util/TabControl.h
Windows/WindowsHost.cpp
Windows/WindowsHost.h
Windows/MainWindow.cpp
Windows/MainWindow.h
Windows/MainWindowMenu.cpp
Windows/MainWindowMenu.h
Windows/RawInput.cpp
Windows/RawInput.h
Windows/TouchInputHandler.cpp
Windows/TouchInputHandler.h
Windows/XinputDevice.cpp
Windows/XinputDevice.h
Windows/main.cpp
Windows/main.h
Windows/ppsspp.rc
Windows/resource.h
Windows/stdafx.cpp
Core: Format CMakeLists.txt consistently.
2018-10-28 18:33:25 +00:00
Windows/stdafx.h
)
Pick some safe changes from the android gradle branch (including windows CMake fixes)
2016-12-05 15:51:28 +00:00
list(APPEND LinkCommon ${CoreLibName} ${CMAKE_THREAD_LIBS_INIT})
CMake-based build system. Tested on Windows with NMake Makefiles and Visual Studio 11 targets. Tested on Linux with GNU Makefiles target, using GCC as the compiler. Tested on FreeBSD using clang as the compiler. Tested for Android on Windows with NMake Makefiles and r8c NDK. Proxy-tested by xsacha for blackberry. The android build requires that the android/android.toolchain.cmake toolchain file is used; an error will be raised if ANDROID is defined without loading the toolchain file. When targeting ANDROID, the resulting .so files will be placed in "android/libs/$ANDROID_ABI" even when building out of tree, since it's where `ant` expects to find them. Since the Core library is expected to be named 'ppsspp_jni' on ANDROID, we also put its name in a variable that is set to 'Core' unless building on ANDROID, where it is 'ppsspp_jni'.
2012-11-18 16:00:27 +00:00
if(WIN32)
Add camera support for windows.
2020-01-13 07:06:02 +00:00
list(APPEND LinkCommon kernel32 user32 gdi32 shell32 comctl32 dsound xinput d3d9 winmm dinput8 ole32 winspool ksuser mf mfplat mfreadwrite mfuuid shlwapi)
Pick some safe changes from the android gradle branch (including windows CMake fixes)
2016-12-05 15:51:28 +00:00
#setup_target_project(${TargetBin} Windows)
list(APPEND NativeAppSource ${WindowsFiles})
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()
Split the atlas into three, well two, but two different cases for the fonts. Platforms that can use OS fonts don't need font_atlas.zim but they do need ascii font for debug, so does use asciifont_atlas.zim.
2021-12-10 21:43:04 +00:00
set(BigFontAssets
assets/font_atlas.zim
assets/font_atlas.meta
)
Unified assets/ dir for icons/images
2012-12-16 15:47:39 +00:00
set(NativeAssets
Build: Remove old-style android/assets/. We now read everything directly from assets/, so there's no need for outdated duplicates. Also cleanup some outdated files/instructions.
2021-12-11 16:35:43 +00:00
assets/ui_atlas.zim
assets/ui_atlas.meta
assets/asciifont_atlas.zim
assets/asciifont_atlas.meta
Debugger: Add web debugger to build packaging.
2021-09-26 19:27:54 +00:00
assets/debugger
Attempt linux buildfix
2016-10-14 20:46:01 +00:00
assets/lang
Install langregion and shaders for iOS and other CMake builds.
2013-10-17 16:09:44 +00:00
assets/shaders
Add themes to assets
2022-02-14 06:37:56 +00:00
assets/themes
Fix CMakeLists.txt
2023-03-10 10:22:09 +00:00
assets/vfpu
Build: Include Roboto in buildscripts.
2017-06-07 06:25:42 +00:00
assets/Roboto-Condensed.ttf
assets/7z.png
Add compat.ini as a dependency to our various build systems
2015-09-27 09:50:23 +00:00
assets/compat.ini
Added installation of the SDL game controller database to CMakeLists.txt
2016-09-20 21:04:01 +00:00
assets/gamecontrollerdb.txt
Build: Include Roboto in buildscripts.
2017-06-07 06:25:42 +00:00
assets/langregion.ini
assets/ppge_atlas.zim
Switch all images to dynamic lookup in the atlas by string ID. SLN fix It works, but with the wrong images and the wrong characters! Fix another bug in atlastool's binary output Get Android building again. Oops, didn't mean to disable this permanently. Error checking Minor cleanup Gotta tweak my git ignores... Regenerate metadata
2020-02-29 20:51:14 +00:00
assets/ppge_atlas.meta
Build: Include Roboto in buildscripts.
2017-06-07 06:25:42 +00:00
assets/rargray.png
assets/unknown.png
Core: Format CMakeLists.txt consistently.
2018-10-28 18:33:25 +00:00
assets/zip.png
UI sound fix
2020-08-04 21:36:35 +00:00
assets/sfx_back.wav
assets/sfx_confirm.wav
assets/sfx_select.wav
assets/sfx_toggle_off.wav
assets/sfx_toggle_on.wav
Changing it to import some logo files on the iOS port. I searched EVERYWHERE but couldn't find anything even related to logos or fons.. Well reimporting them has no downside so why not
2019-01-06 10:12:55 +00:00
source_assets/image/logo.png
source_assets/image/icon_regular_72.png
Core: Format CMakeLists.txt consistently.
2018-10-28 18:33:25 +00:00
)
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
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)
CMake: Correct headless build on Windows.
2021-02-12 15:38:52 +00:00
set(HeadlessSource
Fix cmake headless build.
2013-10-20 00:35:46 +00:00
headless/Headless.cpp
headless: Rename StubHost to HeadlessHost. It's had that weird name forever, get rid of it.
2023-03-26 00:49:05 +00:00
headless/HeadlessHost.cpp
headless/HeadlessHost.h
Fix cmake headless build.
2013-10-20 00:35:46 +00:00
headless/Compare.cpp
Headless: Add support for SDL.
2017-06-18 19:15:59 +00:00
headless/Compare.h
headless/SDLHeadlessHost.cpp
Core: Format CMakeLists.txt consistently.
2018-10-28 18:33:25 +00:00
headless/SDLHeadlessHost.h
)
CMake: Correct headless build on Windows.
2021-02-12 15:38:52 +00:00
if(WIN32)
list(APPEND HeadlessSource
headless/WindowsHeadlessHost.cpp
headless/WindowsHeadlessHost.h
Windows/GPU/D3D9Context.cpp
Windows/GPU/D3D9Context.h
Windows/GPU/D3D11Context.cpp
Windows/GPU/D3D11Context.h
Windows/GPU/WindowsGLContext.cpp
Windows/GPU/WindowsVulkanContext.cpp
Windows/W32Util/ShellUtil.cpp
Windows/W32Util/ShellUtil.h
Windows/CaptureDevice.cpp
Windows/CaptureDevice.h
Windows/W32Util/Misc.cpp
Windows/W32Util/Misc.h
)
endif()
add_executable(PPSSPPHeadless ${HeadlessSource})
Support for showing % on Darwin platforms and some other changes
2023-01-27 08:19:29 +00:00
target_link_libraries(PPSSPPHeadless ${COCOA_LIBRARY} ${QUARTZ_CORE_LIBRARY} ${IOKIT_LIBRARY} ${LinkCommon})
Fix cmake headless build.
2013-10-20 00:35:46 +00:00
setup_target_project(PPSSPPHeadless headless)
endif()
Make the unittest build using CMake
2014-01-09 11:09:07 +00:00
if(UNITTEST)
unittest: Use more consistent output executable. PPSSPPHeadless has PPSSPP as a prefix, so should PPSSPPUnitTest.
2022-01-29 20:31:13 +00:00
add_executable(PPSSPPUnitTest
Make the unittest build using CMake
2014-01-09 11:09:07 +00:00
unittest/UnitTest.cpp
CMake: add TestShaderGenerators source back to unitTest
2021-02-18 03:31:48 +00:00
unittest/TestShaderGenerators.cpp
Make the unittests build on mac
2015-04-03 21:50:51 +00:00
unittest/TestArmEmitter.cpp
unittest/TestArm64Emitter.cpp
irjit: Add tests for IR passes.
2022-07-24 17:37:54 +00:00
unittest/TestIRPassSimplify.cpp
Make the unittests build on mac
2015-04-03 21:50:51 +00:00
unittest/TestX64Emitter.cpp
Initial structure for vertexjit tests.
2015-07-03 22:25:40 +00:00
unittest/TestVertexJit.cpp
Add a unit test, fix listing zip directories
2023-05-02 09:35:45 +00:00
unittest/TestVFS.cpp
riscv: Add a simple unit test. Since I haven't tried running these yet, at least best to validate...
2022-08-27 22:43:44 +00:00
unittest/TestRiscVEmitter.cpp
softjit: Add tests for compile success.
2022-01-30 02:34:14 +00:00
unittest/TestSoftwareGPUJit.cpp
Unittest buildfixes on mac
2021-06-12 20:42:10 +00:00
unittest/TestThreadManager.cpp
Make the unittests build on mac
2015-04-03 21:50:51 +00:00
unittest/JitHarness.cpp
Core/MIPS/ARM/ArmRegCache.cpp
Core/MIPS/ARM/ArmRegCacheFPU.cpp
Make the unittest build using CMake
2014-01-09 11:09:07 +00:00
)
Support for showing % on Darwin platforms and some other changes
2023-01-27 08:19:29 +00:00
target_link_libraries(PPSSPPUnitTest ${COCOA_LIBRARY} ${QUARTZ_CORE_LIBRARY} ${IOKIT_LIBRARY} ${LinkCommon} Common)
unittest: Use more consistent output executable. PPSSPPHeadless has PPSSPP as a prefix, so should PPSSPPUnitTest.
2022-01-29 20:31:13 +00:00
setup_target_project(PPSSPPUnitTest unittest)
add_test(arm64_emitter PPSSPPUnitTest Arm64Emitter)
add_test(arm_emitter PPSSPPUnitTest ArmEmitter)
add_test(x64_emitter PPSSPPUnitTest X64Emitter)
add_test(vertex_jit PPSSPPUnitTest VertexJit)
add_test(asin PPSSPPUnitTest Asin)
add_test(sincos PPSSPPUnitTest SinCos)
add_test(vfpu_sincos PPSSPPUnitTest VFPUSinCos)
add_test(math_util PPSSPPUnitTest MathUtil)
add_test(parsers PPSSPPUnitTest Parsers)
add_test(jit PPSSPPUnitTest Jit)
add_test(matrix_transpose PPSSPPUnitTest MatrixTranspose)
add_test(parse_lbn PPSSPPUnitTest ParseLBN)
add_test(quick_texhash PPSSPPUnitTest QuickTexHash)
add_test(clz PPSSPPUnitTest CLZ)
add_test(shadergen PPSSPPUnitTest ShaderGenerators)
Make the unittest build using CMake
2014-01-09 11:09:07 +00:00
endif()
Libretro port.
2018-03-24 11:44:53 +00:00
if(LIBRETRO)
add_subdirectory(libretro)
endif()
Core: Format CMakeLists.txt consistently.
2018-10-28 18:33:25 +00:00
if(TargetBin)
Bundle libMoltenVK
2020-12-08 05:46:14 +00:00
if(APPLE)
if(NOT IOS)
Enable building a gold version for mac.
2023-04-19 12:54:58 +00:00
if(GOLD)
set(ICON_PATH_ABS ${CMAKE_CURRENT_SOURCE_DIR}/icons/ppsspp_gold.icns)
set(MACOSX_BUNDLE_ICON_FILE ppsspp_gold.icns)
set(MACOSX_BUNDLE_BUNDLE_NAME "PPSSPP Gold")
set(MACOSX_BUNDLE_GUI_IDENTIFIER org.ppsspp.ppssppgold)
else()
set(ICON_PATH_ABS ${CMAKE_CURRENT_SOURCE_DIR}/icons/ppsspp.icns)
set(MACOSX_BUNDLE_ICON_FILE ppsspp.icns)
set(MACOSX_BUNDLE_BUNDLE_NAME "PPSSPP")
set(MACOSX_BUNDLE_GUI_IDENTIFIER org.ppsspp.ppsspp)
endif()
Core: Format CMakeLists.txt consistently.
2018-10-28 18:33:25 +00:00
set_source_files_properties(${ICON_PATH_ABS} PROPERTIES MACOSX_PACKAGE_LOCATION "Resources")
Do not copy ICNS assets (iOS uses PNGs) or generate a MacOS folder when building for iOS
2015-05-27 07:37:49 +00:00
endif()
OSX assets copy to bundle with cmake. Not a native solution, prone to errors.
2014-07-23 06:12:18 +00:00
# TODO: there must a native way to copy these.
# Now this is very prone to errors when changes occur.
Do not copy ICNS assets (iOS uses PNGs) or generate a MacOS folder when building for iOS
2015-05-27 07:37:49 +00:00
# Also better to have assets under Resources dir for OS X.
Finally move flash0 into assets, fixing #9468 and #9520 CMake fix Fix the innosetup and zip scripts for the new assets location
2017-03-31 21:50:17 +00:00
file(GLOB_RECURSE FLASH0_FILES assets/flash0/*)
Move lang into assets.
2016-10-14 20:33:45 +00:00
file(GLOB_RECURSE LANG_FILES assets/lang/*)
OSX assets copy to bundle with cmake. Not a native solution, prone to errors.
2014-07-23 06:12:18 +00:00
file(GLOB_RECURSE SHADER_FILES assets/shaders/*)
Add themes to assets
2022-02-14 06:37:56 +00:00
file(GLOB_RECURSE THEME_FILE assets/themes/*)
Debugger: Add web debugger to build packaging.
2021-09-26 19:27:54 +00:00
file(GLOB_RECURSE DEBUGGER_FILES assets/debugger/*)
Enable building a gold version for mac.
2023-04-19 12:54:58 +00:00
file(GLOB_RECURSE VFPU_FILES assets/vfpu/*)
Do not copy ICNS assets (iOS uses PNGs) or generate a MacOS folder when building for iOS
2015-05-27 07:37:49 +00:00
Bundle libMoltenVK
2020-12-08 05:46:14 +00:00
if(NOT IOS)
Split the atlas into three, well two, but two different cases for the fonts. Platforms that can use OS fonts don't need font_atlas.zim but they do need ascii font for debug, so does use asciifont_atlas.zim.
2021-12-10 21:43:04 +00:00
set_source_files_properties(${BigFontAssets} PROPERTIES MACOSX_PACKAGE_LOCATION "Resources/assets")
SDL: Read assets from Resources on macOS like on iOS closes #15041
2021-11-06 06:22:08 +00:00
set_source_files_properties(${NativeAssets} PROPERTIES MACOSX_PACKAGE_LOCATION "Resources/assets")
set_source_files_properties(${FLASH0_FILES} PROPERTIES MACOSX_PACKAGE_LOCATION "Resources/assets/flash0/font")
set_source_files_properties(${LANG_FILES} PROPERTIES MACOSX_PACKAGE_LOCATION "Resources/assets/lang")
set_source_files_properties(${SHADER_FILES} PROPERTIES MACOSX_PACKAGE_LOCATION "Resources/assets/shaders")
Add themes to assets
2022-02-14 06:37:56 +00:00
set_source_files_properties(${THEME_FILE} PROPERTIES MACOSX_PACKAGE_LOCATION "Resources/assets/themes")
SDL: Read assets from Resources on macOS like on iOS closes #15041
2021-11-06 06:22:08 +00:00
set_source_files_properties(${DEBUGGER_FILES} PROPERTIES MACOSX_PACKAGE_LOCATION "Resources/assets/debugger")
Enable building a gold version for mac.
2023-04-19 12:54:58 +00:00
set_source_files_properties(${VFPU_FILES} PROPERTIES MACOSX_PACKAGE_LOCATION "Resources/assets/vfpu")
Do not copy ICNS assets (iOS uses PNGs) or generate a MacOS folder when building for iOS
2015-05-27 07:37:49 +00:00
endif()
Update OS X iconset. The iconset has been updated to include retina versions at all resolutions and has been rasterized from the svg icons available in the assets/unix-icons directory. icon-512.svg was used for all resolutions except 16x16 and 16x16@2x, which were sourced from icon-16.svg
2015-02-02 08:17:03 +00:00
Core: Format CMakeLists.txt consistently.
2018-10-28 18:33:25 +00:00
if(IOS)
Add themes to assets
2022-02-14 06:37:56 +00:00
add_executable(${TargetBin} MACOSX_BUNDLE ${ICON_PATH_ABS} ${NativeAssets} ${BigFontAssets} ${SHADER_FILES} ${THEME_FILE} ${DEBUGGER_FILES} ${FLASH0_FILES} ${LANG_FILES} ${NativeAppSource} "ios/Settings.bundle" "ios/Launch Screen.storyboard")
Update CMakeLists.txt & zh_CN.ini
2021-11-06 06:55:44 +00:00
file(INSTALL "${CMAKE_SOURCE_DIR}/ext/vulkan/iOS/Frameworks/libMoltenVK.dylib" DESTINATION "${CMAKE_BINARY_DIR}/PPSSPP.app/Frameworks/")
require iOS 8, add a launch screen
2018-01-04 17:56:49 +00:00
else()
Add themes to assets
2022-02-14 06:37:56 +00:00
add_executable(${TargetBin} MACOSX_BUNDLE ${ICON_PATH_ABS} ${NativeAssets} ${BigFontAssets} ${SHADER_FILES} ${THEME_FILE} ${DEBUGGER_FILES} ${FLASH0_FILES} ${LANG_FILES} ${NativeAppSource})
Fix Gold filenames, more gold prep for mac
2023-04-25 14:34:23 +00:00
file(INSTALL "${CMAKE_SOURCE_DIR}/ext/vulkan/macOS/Frameworks/libMoltenVK.dylib" DESTINATION "${CMAKE_BINARY_DIR}/${TargetBin}.app/Contents/Frameworks/")
Upgrade SDL for Mac This removes the option to use system SDL, which seems like a trap. Also simplifies the macbundle.sh script accordingly. Buildfix Buildfix fix Moar buildfix
2023-04-24 12:44:07 +00:00
if(USING_QT_UI)
Modify Info.plist automatically
2020-02-04 03:55:54 +00:00
add_custom_command(TARGET ${TargetBin} POST_BUILD COMMAND /bin/bash "${CMAKE_SOURCE_DIR}/Qt/macbundle.sh" "${CMAKE_BINARY_DIR}/PPSSPPQt.app")
Allow usage of system SDL2 on macOS
2023-05-05 21:17:45 +00:00
elseif(NOT USE_SYSTEM_LIBSDL2)
Fix Gold filenames, more gold prep for mac
2023-04-25 14:34:23 +00:00
add_custom_command(TARGET ${TargetBin} POST_BUILD COMMAND /bin/bash "${CMAKE_SOURCE_DIR}/SDL/macbundle.sh" "${CMAKE_BINARY_DIR}/${TargetBin}.app" "${TargetBin}")
Bundle libSDL inside app on macOS, fixes #11830
2019-02-23 11:15:17 +00:00
endif()
require iOS 8, add a launch screen
2018-01-04 17:56:49 +00:00
endif()
Commit silly typo
2016-12-05 16:34:26 +00:00
elseif(WIN32)
Buildfix the CMake-based Windows build
2017-02-16 16:06:03 +00:00
add_executable(${TargetBin} WIN32 ${NativeAppSource})
fix mingw and msvc cmake builds.
2018-03-23 02:18:13 +00:00
if(MSVC)
set_target_properties(${TargetBin} PROPERTIES LINK_FLAGS "/SUBSYSTEM:WINDOWS")
else()
set_target_properties(${TargetBin} PROPERTIES LINK_FLAGS "-Wl,-subsystem,windows")
endif()
Commit silly typo
2016-12-05 16:34:26 +00:00
set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT ${TargetBin})
Fix for iOS CMake Update toolchain file to reflect that we want to use clang (rock88 is using clang). Set target in the CMake. Fix for packaging and signing (thanks rock88). Update linking to include audio and GLKit (thanks rock88). Update README
2013-02-24 03:23:04 +00:00
else()
add_executable(${TargetBin} ${NativeAppSource})
endif()
Make the unittests build on mac
2015-04-03 21:50:51 +00:00
target_link_libraries(${TargetBin} ${LinkCommon} Common)
CMake-based build system. Tested on Windows with NMake Makefiles and Visual Studio 11 targets. Tested on Linux with GNU Makefiles target, using GCC as the compiler. Tested on FreeBSD using clang as the compiler. Tested for Android on Windows with NMake Makefiles and r8c NDK. Proxy-tested by xsacha for blackberry. The android build requires that the android/android.toolchain.cmake toolchain file is used; an error will be raised if ANDROID is defined without loading the toolchain file. When targeting ANDROID, the resulting .so files will be placed in "android/libs/$ANDROID_ABI" even when building out of tree, since it's where `ant` expects to find them. Since the Core library is expected to be named 'ppsspp_jni' on ANDROID, we also put its name in a variable that is set to 'Core' unless building on ANDROID, where it is 'ppsspp_jni'.
2012-11-18 16:00:27 +00:00
endif()
Fix for iOS CMake Update toolchain file to reflect that we want to use clang (rock88 is using clang). Set target in the CMake. Fix for packaging and signing (thanks rock88). Update linking to include audio and GLKit (thanks rock88). Update README
2013-02-24 03:23:04 +00:00
# installs
Add Gradle build. This time, we don't remove the old build system and we don't switch Travis.
2017-03-13 22:45:25 +00:00
if(NOT ANDROID)
Split the atlas into three, well two, but two different cases for the fonts. Platforms that can use OS fonts don't need font_atlas.zim but they do need ascii font for debug, so does use asciifont_atlas.zim.
2021-12-10 21:43:04 +00:00
file(INSTALL ${BigFontAssets} DESTINATION assets)
Core: Format CMakeLists.txt consistently.
2018-10-28 18:33:25 +00:00
file(INSTALL ${NativeAssets} DESTINATION assets)
file(INSTALL assets/flash0 DESTINATION assets)
Add Gradle build. This time, we don't remove the old build system and we don't switch Travis.
2017-03-13 22:45:25 +00:00
endif()
Use -O3 for Mac/iOS release builds.
2013-03-24 06:18:00 +00:00
# packaging and code signing
Build for iOS as a libretro core
2023-02-07 04:36:55 +00:00
if(IOS AND NOT LIBRETRO)
Build: Raise macOS/iOS min version for c++17.
2022-10-01 15:01:01 +00:00
set(DEPLOYMENT_TARGET 11.0)
iOS: Package as Universal, include icon.
2013-03-15 08:29:33 +00:00
file(GLOB IOSAssets ios/assets/*.png)
Update CMakeLists.txt Buildfix for Xcode 7(adding iconv library) In IOS 9, the Default-568h.png file must be located in root app directory.
2015-10-08 04:43:33 +00:00
list(REMOVE_ITEM IOSAssets ${CMAKE_CURRENT_SOURCE_DIR}/ios/assets/Default-568h@2x.png)
list(REMOVE_ITEM IOSAssets ${CMAKE_CURRENT_SOURCE_DIR}/ios/assets/Default-568h@3x.png)
ios: Fix resource copying
2016-10-11 01:27:54 +00:00
file(INSTALL ${IOSAssets} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/assets)
Update CMakeLists.txt Buildfix for Xcode 7(adding iconv library) In IOS 9, the Default-568h.png file must be located in root app directory.
2015-10-08 04:43:33 +00:00
file(GLOB IOSAssets ios/assets/Default-568h@*.png)
ios: Fix resource copying
2016-10-11 01:27:54 +00:00
file(INSTALL ${IOSAssets} DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
Core: Format CMakeLists.txt consistently.
2018-10-28 18:33:25 +00:00
if(IOS_DEBUG)
ios: Fix resource copying
2016-10-11 01:27:54 +00:00
file(INSTALL pspautotests DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/assets)
iOS: Fix breakpoints, simplify running unit tests.
2013-03-16 06:50:31 +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
set(RSRC_XIB_FILES assets/Icon@2x.png)
require iOS 8, add a launch screen
2018-01-04 17:56:49 +00:00
set(RSRC_XIB_FILES "Launch Screen.storyboard")
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
)
CMake fixes and new --ios-xcode ./b.sh command. Also enables stencil for the iOS backbuffer. Fixes the GPU test and will doubtlessly fix problems with running non-buffered (which you shouldn't do anyway though). Slim alternative to #13766 with less risk to buildbots.
2021-01-17 10:34:27 +00:00
#This breaks in modern XCode. Not sure when it worked...
#if(CMAKE_GENERATOR STREQUAL "Xcode")
# set(APP_DIR_NAME "$(TARGET_BUILD_DIR)/$(FULL_PRODUCT_NAME)")
#else()
Core: Format CMakeLists.txt consistently.
2018-10-28 18:33:25 +00:00
set(APP_DIR_NAME "$<TARGET_FILE_DIR:PPSSPP>")
CMake fixes and new --ios-xcode ./b.sh command. Also enables stencil for the iOS backbuffer. Fixes the GPU test and will doubtlessly fix problems with running non-buffered (which you shouldn't do anyway though). Slim alternative to #13766 with less risk to buildbots.
2021-01-17 10:34: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
add_custom_command(TARGET PPSSPP POST_BUILD
fix cmake when building for iOS in a path with spaces
2017-12-31 04:16:00 +00:00
COMMAND mkdir -p \"${APP_DIR_NAME}\"
COMMAND tar -c -C ${CMAKE_CURRENT_BINARY_DIR} --exclude .DS_Store --exclude .git assets *.png | tar -x -C \"${APP_DIR_NAME}\"
iOS/macOS : set bundle version
2020-04-30 17:06:03 +00:00
COMMAND /bin/bash "${CMAKE_SOURCE_DIR}/ios/macbundle.sh" \"${APP_DIR_NAME}\"
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
)
require iOS 8, add a launch screen
2018-01-04 17:56:49 +00:00
set(MACOSX_DEPLOYMENT_TARGET ${DEPLOYMENT_TARGET})
iOS: Package as Universal, include icon.
2013-03-15 08:29:33 +00:00
set_target_properties(${TargetBin} PROPERTIES
ios: Fix path to plist file
2016-10-12 11:24:53 +00:00
MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/ios/PPSSPP-Info.plist"
require iOS 8, add a launch screen
2018-01-04 17:56:49 +00:00
RESOURCE "ios/Launch Screen.storyboard"
Disable external display by default Configuration is in system settings
2019-06-19 09:47:14 +00:00
RESOURCE "ios/Settings.bundle"
Update libMoltenVK.dylib to support M1 chips
2020-12-15 01:53:23 +00:00
RESOURCE "ext/vulkan/iOS/Frameworks"
require iOS 8, add a launch screen
2018-01-04 17:56:49 +00:00
XCODE_ATTRIBUTE_IPHONEOS_DEPLOYMENT_TARGET ${DEPLOYMENT_TARGET}
Add back XCode TARGETED_DEVICE_FAMILY config line xcode warns that the value is deprecated or something, but maybe it still does something. Appears iPad support is broken right now.
2021-01-26 17:12:28 +00:00
XCODE_ATTRIBUTE_TARGETED_DEVICE_FAMILY "iPhone/iPad"
Core: Format CMakeLists.txt consistently.
2018-10-28 18:33:25 +00:00
XCODE_ATTRIBUTE_CLANG_ENABLE_OBJC_ARC YES
XCODE_ATTRIBUTE_ENABLE_BITCODE NO
XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY "-"
iOS: Package as Universal, include icon.
2013-03-15 08:29:33 +00:00
)
iOS Objective-C code dump. ViewController courtesy of rock88. Made modifications for simplification and code-style. Still missing some files (eg. images). Also, CMake is not set up correctly yet.
2013-02-17 14:04:44 +00:00
endif()
cmake: Add an install target.
2020-12-06 01:49:21 +00:00
Fix iOS build
2023-04-26 11:25:48 +00:00
if(MACOSX AND NOT IOS)
Fix Gold filenames, more gold prep for mac
2023-04-25 14:34:23 +00:00
if(GOLD)
set_target_properties(${TargetBin} PROPERTIES
MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/macOS/InfoGold.plist"
)
else()
set_target_properties(${TargetBin} PROPERTIES
MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/macOS/Info.plist"
)
endif()
Recognize openable types in Info.plist, debug menu in top bar
2023-04-22 15:11:06 +00:00
endif()
cmake: Enable the install target for non-linux unix systems.
2020-12-10 15:15:53 +00:00
if(UNIX AND NOT ANDROID AND NOT APPLE)
Specify Target
2020-12-07 08:12:55 +00:00
configure_file(
"${CMAKE_SOURCE_DIR}/ppsspp.desktop.in"
"${CMAKE_BINARY_DIR}/ppsspp.desktop"
@ONLY
)
install(
TARGETS ${TargetBin}
DESTINATION "${CMAKE_INSTALL_BINDIR}"
)
install(
DIRECTORY "${CMAKE_BINARY_DIR}/assets"
DESTINATION "${CMAKE_INSTALL_DATADIR}/ppsspp"
PATTERN ".git*" EXCLUDE
Improve Freedesktop integration * Move scalable icon install from `${prefix}/share/pixmaps` (`pixmaps` has been deprecated long time ago) to `${prefix}/share/icons/hicolor/scalable/apps` * Add `Keywords`, `Categories`, and `MimeType` keys to `.desktop` file * Add shared MIME-info on [`application/x-compressed-iso`](https://en.wikipedia.org/wiki/.CSO "Compressed ISO") MIME type
2022-09-30 23:59:59 +00:00
PATTERN "mime" EXCLUDE
PATTERN "lang/README.md" EXCLUDE
Specify Target
2020-12-07 08:12:55 +00:00
)
install(
FILES "${CMAKE_BINARY_DIR}/ppsspp.desktop"
DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/applications"
RENAME ${TargetBin}.desktop
)
install(
DIRECTORY "${CMAKE_SOURCE_DIR}/icons/hicolor"
DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons"
)
install(
FILES "${CMAKE_SOURCE_DIR}/icons/icon-512.svg"
Improve Freedesktop integration * Move scalable icon install from `${prefix}/share/pixmaps` (`pixmaps` has been deprecated long time ago) to `${prefix}/share/icons/hicolor/scalable/apps` * Add `Keywords`, `Categories`, and `MimeType` keys to `.desktop` file * Add shared MIME-info on [`application/x-compressed-iso`](https://en.wikipedia.org/wiki/.CSO "Compressed ISO") MIME type
2022-09-30 23:59:59 +00:00
DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/scalable/apps"
RENAME "ppsspp.svg"
)
install(
FILES "${CMAKE_SOURCE_DIR}/assets/mime/ppsspp.xml"
DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/mime/packages"
Specify Target
2020-12-07 08:12:55 +00:00
)
endif()
Reference in New Issue Copy Permalink