Merge pull request #73 from Kovensky/cmake

CMake-based build system

CMakeLists.txt

@@ -0,0 +1,834 @@
+cmake_minimum_required(VERSION 2.8.8)
+project(PPSSPP)
+
+if(ANDROID OR BLACKBERRY)
+    set(HEADLESS OFF)
+endif()
+
+if(ANDROID_ABI)
+    set(ANDROID ON)
+    if(ARMEABI OR ARMEABI_V7A)
+        set(ARM ON)
+    endif()
+endif()
+
+if(BLACKBERRY)
+    set(ARM ON)
+endif()
+
+# User-editable options (go into CMakeCache.txt)
+option(ARM "Set to ON if targeting an ARM processor" ${ARM})
+option(ANDROID "Set to ON if targeting an Android phone" ${ANDROID})
+option(BLACKBERRY "Set to ON if targeting a Blackberry phone" ${BLACKBERRY})
+option(HEADLESS "Set to OFF to not generate the PPSSPPHeadless target" ${HEADLESS})
+
+if(ANDROID)
+    if(NOT ANDROID_ABI)
+        message(FATAL_ERROR
+"CMAKE_TOOLCHAIN_FILE was not set!!
+Delete the CMakeCache.txt file and CMakeFiles directory.
+Rerun ${CMAKE_COMMAND} with the
+\"-DCMAKE_TOOLCHAIN_FILE=${CMAKE_SOURCE_DIR}/android/android.toolchain.cmake\"
+argument")
+    endif()
+    set(CoreLibName ppsspp_jni)
+    set(CoreLinkType SHARED)
+else()
+    set(CoreLibName Core)
+    set(CoreLinkType STATIC)
+endif()
+
+#find_package(Qt5Widgets)
+if(ANDROID OR BLACKBERRY)
+    set(OPENGL_LIBRARIES GLESv2)
+    set(OPENSL_LIBRARIES OpenSLES)
+else()
+    include(FindOpenGL REQUIRED)
+endif()
+include(FindSDL)
+include(FindThreads)
+
+# needed for Globals.h
+include_directories("${CMAKE_SOURCE_DIR}")
+
+# TODO: Rely on compiler define instead. __BLACKBERRY__ ?
+if(BLACKBERRY)
+    add_definitions(-DBLACKBERRY)
+    if(BLACKBERRY VERSION_GREATER 10)
+        add_definitions(-DBLACKBERRY10)
+    endif()
+endif()
+
+if(ANDROID)
+    add_definitions(-DANDROID)
+endif()
+
+if(ARM)
+    add_definitions(-DARM)
+endif()
+
+#add_definitions(-Wno-multichar)
+#add_definitions(-fno-strict-aliasing)
+#add_definitions(-DUSE_PROFILER)
+
+if(NOT MSVC)
+    add_definitions(-D_XOPEN_SOURCE=600 -D__BSD_VISIBLE=1)
+    add_definitions(-D_LARGEFILE64_SOURCE=1 -D_FILE_OFFSET_BITS=64)
+
+    if(BLACKBERRY)
+        add_definitions(-D_QNX_SOURCE=1 -D_C99=1)
+    endif()
+
+    if(NOT ARM) # ASSUMES x86!!
+        # enable sse2 code generation
+        add_definitions(-msse2)
+    endif()
+
+    if(CMAKE_COMPILER_IS_GNUCXX AND
+        CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.7.0)
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
+    else()
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+    endif()
+endif()
+
+if(MSVC)
+    # disable warnings about MS-specific _s variants of libc functions
+    add_definitions(-D_CRT_SECURE_NO_WARNINGS)
+endif()
+
+set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib")
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib")
+
+if(ANDROID)
+    set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/android/libs/${ANDROID_ABI}")
+endif()
+
+# This sets up the MSVC project dirs according to the physical project dirs
+macro(setup_target_project TargetName ProjectDir)
+    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()
+endmacro()
+
+# Commented-out files are files that don't compile
+# and were disabled in the original MSVC project anyway
+
+set(CommonExtra)
+if(ARM)
+    set(CommonExtra ${CommonExtra}
+        Common/ArmABI.h
+        Common/ArmABI.cpp
+        Common/ArmEmitter.h
+        Common/ArmEmitter.cpp
+        Common/ThunkARM.cpp)
+else()
+    set(CommonExtra ${CommonExtra}
+        Common/ABI.cpp
+        Common/ABI.h
+        Common/CPUDetect.cpp
+        Common/CPUDetect.h
+        Common/MathUtil.cpp
+        Common/MathUtil.h
+        Common/Thunk.cpp
+        Common/Thunk.h
+        Common/x64Analyzer.cpp
+        Common/x64Analyzer.h
+        Common/x64Emitter.cpp
+        Common/x64Emitter.h)
+endif()
+if(WIN32)
+    set(CommonExtra ${CommonExtra}
+        Common/stdafx.cpp
+        Common/stdafx.h)
+endif()
+
+add_library(Common STATIC
+    ${CommonExtra}
+    Common/Action.cpp
+    Common/Action.h
+    Common/ColorUtil.cpp
+    Common/ColorUtil.h
+    Common/ConsoleListener.cpp
+    Common/ConsoleListener.h
+    Common/Crypto/aes_cbc.cpp
+    Common/Crypto/aes_core.cpp
+    Common/Crypto/bn.cpp
+    Common/Crypto/ec.cpp
+    Common/Crypto/md5.cpp
+    Common/Crypto/md5.h
+    Common/Crypto/sha1.cpp
+    Common/Crypto/sha1.h
+    Common/ExtendedTrace.cpp
+    Common/ExtendedTrace.h
+    Common/FPURoundModeGeneric.cpp
+#   Common/FPURoundModeX86.cpp
+    Common/FileSearch.cpp
+    Common/FileSearch.h
+    Common/FileUtil.cpp
+    Common/FileUtil.h
+    Common/Hash.cpp
+    Common/Hash.h
+    Common/IniFile.cpp
+    Common/IniFile.h
+    Common/LogManager.cpp
+    Common/LogManager.h
+    Common/MemArena.cpp
+    Common/MemArena.h
+    Common/MemoryUtil.cpp
+    Common/MemoryUtil.h
+    Common/Misc.cpp
+    Common/MsgHandler.cpp
+    Common/MsgHandler.h
+    Common/StringUtil.cpp
+    Common/StringUtil.h
+    Common/Thread.cpp
+    Common/Thread.h
+    Common/Timer.cpp
+    Common/Timer.h
+    Common/Version.cpp)
+include_directories(Common)
+setup_target_project(Common Common)
+
+if(WIN32)
+    target_link_libraries(Common winmm)
+endif()
+
+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)
+
+add_library(etcpack STATIC
+    native/ext/etcpack/etcdec.cpp
+    native/ext/etcpack/etcdec.h
+    native/ext/etcpack/etcpack.cpp
+    native/ext/etcpack/etcpack.h
+    native/ext/etcpack/image.cpp
+    native/ext/etcpack/image.h)
+include_directories(native/ext/etcpack)
+
+if(NOT ANDROID AND NOT BLACKBERRY)
+    include_directories(${OPENGL_INCLUDE_DIR})
+
+    add_definitions(-DGLEW_STATIC)
+    add_library(glew STATIC
+        native/ext/glew/GL/glew.h
+        native/ext/glew/GL/glxew.h
+        native/ext/glew/GL/wglew.h
+        native/ext/glew/glew.c)
+    target_link_libraries(glew ${OPENGL_LIBRARIES})
+    include_directories(native/ext/glew)
+    set(GLEW_LIBRARIES glew)
+endif()
+
+add_library(sha1 STATIC
+    native/ext/sha1/sha1.cpp
+    native/ext/sha1/sha1.h)
+include_directories(native/ext/sha1)
+
+add_library(stb_image STATIC
+    native/ext/stb_image/stb_image.c
+    native/ext/stb_image/stb_image.h)
+include_directories(native/ext/stb_image)
+
+add_library(stb_vorbis STATIC
+    native/ext/stb_vorbis/stb_vorbis.c
+    native/ext/stb_vorbis/stb_vorbis.h)
+include_directories(native/ext/stb_vorbis)
+
+if(NOT WIN32) # should be ANDROID, but native/file/zip_read.h depends on this
+    add_library(libzip STATIC
+        native/ext/libzip/zip.h
+        native/ext/libzip/mkstemp.c
+        native/ext/libzip/zip_add.c
+        native/ext/libzip/zip_add_dir.c
+        native/ext/libzip/zip_close.c
+        native/ext/libzip/zip_delete.c
+        native/ext/libzip/zip_dirent.c
+        native/ext/libzip/zip_entry_free.c
+        native/ext/libzip/zip_entry_new.c
+        native/ext/libzip/zip_err_str.c
+        native/ext/libzip/zip_error.c
+        native/ext/libzip/zip_error_clear.c
+        native/ext/libzip/zip_error_get.c
+        native/ext/libzip/zip_error_get_sys_type.c
+        native/ext/libzip/zip_error_strerror.c
+        native/ext/libzip/zip_error_to_str.c
+        native/ext/libzip/zip_fclose.c
+        native/ext/libzip/zip_file_error_clear.c
+        native/ext/libzip/zip_file_error_get.c
+        native/ext/libzip/zip_file_get_offset.c
+        native/ext/libzip/zip_file_strerror.c
+        native/ext/libzip/zip_filerange_crc.c
+        native/ext/libzip/zip_fopen.c
+        native/ext/libzip/zip_fopen_index.c
+        native/ext/libzip/zip_fread.c
+        native/ext/libzip/zip_free.c
+        native/ext/libzip/zip_get_archive_comment.c
+        native/ext/libzip/zip_get_archive_flag.c
+        native/ext/libzip/zip_get_file_comment.c
+        native/ext/libzip/zip_get_name.c
+        native/ext/libzip/zip_get_num_files.c
+        native/ext/libzip/zip_memdup.c
+        native/ext/libzip/zip_name_locate.c
+        native/ext/libzip/zip_new.c
+        native/ext/libzip/zip_open.c
+        native/ext/libzip/zip_rename.c
+        native/ext/libzip/zip_replace.c
+        native/ext/libzip/zip_set_archive_comment.c
+        native/ext/libzip/zip_set_archive_flag.c
+        native/ext/libzip/zip_set_file_comment.c
+        native/ext/libzip/zip_set_name.c
+        native/ext/libzip/zip_source_buffer.c
+        native/ext/libzip/zip_source_file.c
+        native/ext/libzip/zip_source_filep.c
+        native/ext/libzip/zip_source_free.c
+        native/ext/libzip/zip_source_function.c
+        native/ext/libzip/zip_source_zip.c
+        native/ext/libzip/zip_stat.c
+        native/ext/libzip/zip_stat_index.c
+        native/ext/libzip/zip_stat_init.c
+        native/ext/libzip/zip_strerror.c
+        native/ext/libzip/zip_unchange.c
+        native/ext/libzip/zip_unchange_all.c
+        native/ext/libzip/zip_unchange_archive.c
+        native/ext/libzip/zip_unchange_data.c)
+    target_link_libraries(libzip zlib)
+    include_directories(native/ext/libzip)
+    set(LIBZIP libzip)
+endif()
+
+set(nativeExtra)
+if(ANDROID)
+    set(nativeExtra ${nativeExtra}
+        native/base/NativeApp.h
+        native/android/app-android.cpp
+        native/android/native_audio.cpp
+        native/android/native_audio.h)
+
+    add_library(native_audio SHARED
+        native/android/native-audio-so.cpp
+        native/android/native-audio-so.h)
+    target_link_libraries(native_audio
+        ${OPENSL_LIBRARIES})
+endif()
+if(BLACKBERRY)
+    set(nativeExtra ${nativeExtra}
+        native/base/BlackberryMain.cpp)
+endif()
+
+if(NOT ARM)
+    set(nativeExtra ${nativeExtra}
+        native/base/backtrace.cpp
+        native/base/backtrace.h)
+endif()
+
+add_library(native STATIC
+    ${nativeExtra}
+    native/audio/mixer.cpp
+    native/audio/mixer.h
+    native/audio/wav_read.cpp
+    native/audio/wav_read.h
+    native/base/basictypes.h
+    native/base/buffer.cpp
+    native/base/buffer.h
+    native/base/color.h
+    native/base/colorutil.cpp
+    native/base/colorutil.h
+    native/base/display.cpp
+    native/base/display.h
+    native/base/error_context.cpp
+    native/base/error_context.h
+    native/base/fastlist.h
+    native/base/fastlist_test.cpp
+    native/base/linked_ptr.h
+    native/base/logging.h
+    native/base/mutex.h
+#    native/base/PCMain.cpp
+    native/base/scoped_ptr.h
+    native/base/stats.h
+    native/base/stringutil.cpp
+    native/base/stringutil.h
+    native/base/threadutil.cpp
+    native/base/threadutil.h
+    native/base/timeutil.cpp
+    native/base/timeutil.h
+    native/file/chunk_file.cpp
+    native/file/chunk_file.h
+    native/file/dialog.cpp
+    native/file/dialog.h
+    native/file/easy_file.cpp
+    native/file/easy_file.h
+    native/file/fd_util.cpp
+    native/file/fd_util.h
+    native/file/file_util.cpp
+    native/file/file_util.h
+    native/file/vfs.h
+    native/file/zip_read.cpp
+    native/file/zip_read.h
+    native/gfx/gl_debug_log.cpp
+    native/gfx/gl_debug_log.h
+    native/gfx/gl_lost_manager.cpp
+    native/gfx/gl_lost_manager.h
+    native/gfx/texture.cpp
+    native/gfx/texture.h
+    native/gfx/texture_atlas.cpp
+    native/gfx/texture_atlas.h
+#    native/gfx/texture_dx11.cpp
+    native/gfx/texture_gen.cpp
+    native/gfx/texture_gen.h
+    native/gfx_es2/draw_buffer.cpp
+    native/gfx_es2/draw_buffer.h
+    native/gfx_es2/fbo.cpp
+    native/gfx_es2/fbo.h
+    native/gfx_es2/glsl_program.cpp
+    native/gfx_es2/glsl_program.h
+    native/gfx_es2/vertex_format.cpp
+    native/gfx_es2/vertex_format.h
+    native/image/png_load.cpp
+    native/image/png_load.h
+    native/image/zim_load.cpp
+    native/image/zim_load.h
+    native/image/zim_save.cpp
+    native/image/zim_save.h
+    native/input/gesture_detector.cpp
+    native/input/gesture_detector.h
+    native/input/input_state.h
+    native/json/json_writer.cpp
+    native/json/json_writer.h
+    native/math/compression.h
+    native/math/curves.cpp
+    native/math/curves.h
+    native/math/lin/aabb.cpp
+    native/math/lin/aabb.h
+    native/math/lin/matrix4x4.cpp
+    native/math/lin/matrix4x4.h
+    native/math/lin/plane.cpp
+    native/math/lin/plane.h
+    native/math/lin/quat.cpp
+    native/math/lin/quat.h
+    native/math/lin/ray.h
+    native/math/lin/vec3.cpp
+    native/math/lin/vec3.h
+    native/math/math_util.cpp
+    native/math/math_util.h
+    native/midi/midi_input.cpp
+    native/midi/midi_input.h
+    native/net/http_client.cpp
+    native/net/http_client.h
+    native/net/resolve.cpp
+    native/net/resolve.h
+    native/profiler/profiler.cpp
+    native/profiler/profiler.h
+    native/ui/screen.cpp
+    native/ui/screen.h
+    native/ui/ui.cpp
+    native/ui/ui.h
+    native/ui/virtual_input.cpp
+    native/ui/virtual_input.h
+    native/util/bits/bits.cpp
+    native/util/bits/bits.h
+    native/util/bits/hamming.h
+    native/util/bits/varint.cpp
+    native/util/bits/varint.h
+    native/util/hash/hash.cpp
+    native/util/hash/hash.h
+    native/util/random/perlin.cpp
+    native/util/random/perlin.h
+    native/util/random/rng.h
+    native/ext/rapidxml/rapidxml.hpp
+    native/ext/rapidxml/rapidxml_iterators.hpp
+    native/ext/rapidxml/rapidxml_print.hpp
+    native/ext/rapidxml/rapidxml_utils.hpp)
+include_directories(native)
+# rapidxml is headers only so we can't make a lib specific for it
+include_directories(native/ext/rapidxml)
+target_link_libraries(native ${LIBZIP}
+    etcpack sha1 stb_image stb_vorbis #vjson
+    zlib ${GLEW_LIBRARIES})
+if(ANDROID)
+    target_link_libraries(native log)
+endif()
+setup_target_project(native native)
+
+if(WIN32)
+    target_link_libraries(native ws2_32 winmm)
+endif()
+
+add_library(kirk STATIC
+    ext/libkirk/AES.c
+    ext/libkirk/AES.h
+    ext/libkirk/SHA1.c
+    ext/libkirk/SHA1.h
+    ext/libkirk/bn.c
+    ext/libkirk/ec.c
+    ext/libkirk/kirk_engine.c
+    ext/libkirk/kirk_engine.h)
+include_directories(ext/libkirk)
+
+set(CoreExtra)
+if(ARM)
+    set(CoreExtra ${CoreExtra}
+        Core/MIPS/ARM/Asm.cpp
+        Core/MIPS/ARM/Asm.h
+        Core/MIPS/ARM/CompALU.cpp
+        Core/MIPS/ARM/CompBranch.cpp
+        Core/MIPS/ARM/CompFPU.cpp
+        Core/MIPS/ARM/CompLoadStore.cpp
+        Core/MIPS/ARM/CompVFPU.cpp
+        Core/MIPS/ARM/Jit.cpp
+        Core/MIPS/ARM/Jit.h
+        Core/MIPS/ARM/JitCache.cpp
+        Core/MIPS/ARM/JitCache.h
+        Core/MIPS/ARM/RegCache.cpp
+        Core/MIPS/ARM/RegCache.h)
+else() # ASSUMES x86!!
+    set(CoreExtra ${CoreExtra}
+        Core/MIPS/x86/Asm.cpp
+        Core/MIPS/x86/Asm.h
+        Core/MIPS/x86/CompALU.cpp
+        Core/MIPS/x86/CompBranch.cpp
+        Core/MIPS/x86/CompFPU.cpp
+        Core/MIPS/x86/CompLoadStore.cpp
+        Core/MIPS/x86/CompVFPU.cpp
+        Core/MIPS/x86/Jit.cpp
+        Core/MIPS/x86/Jit.h
+        Core/MIPS/x86/JitCache.cpp
+        Core/MIPS/x86/JitCache.h
+        Core/MIPS/x86/RegCache.cpp
+        Core/MIPS/x86/RegCache.h)
+endif()
+
+# 'ppsspp_jni' on ANDROID, 'Core' everywhere else
+# SHARED on ANDROID, STATIC everywhere else
+add_library(${CoreLibName} ${CoreLinkType}
+    ${CoreExtra}
+    Core/CPU.cpp
+    Core/CPU.h
+    Core/Config.cpp
+    Core/Config.h
+    Core/Core.cpp
+    Core/Core.h
+    Core/CoreParameter.h
+    Core/CoreTiming.cpp
+    Core/CoreTiming.h
+    Core/Debugger/Breakpoints.cpp
+    Core/Debugger/Breakpoints.h
+    Core/Debugger/DebugInterface.h
+    Core/Debugger/SymbolMap.cpp
+    Core/Debugger/SymbolMap.h
+    Core/ELF/ElfReader.cpp
+    Core/ELF/ElfReader.h
+    Core/ELF/ElfTypes.h
+    Core/ELF/PrxDecrypter.cpp
+    Core/ELF/PrxDecrypter.h
+    Core/FileSystems/BlockDevices.cpp
+    Core/FileSystems/BlockDevices.h
+    Core/FileSystems/DirectoryFileSystem.cpp
+    Core/FileSystems/DirectoryFileSystem.h
+    Core/FileSystems/FileSystem.h
+    Core/FileSystems/ISOFileSystem.cpp
+    Core/FileSystems/ISOFileSystem.h
+    Core/FileSystems/MetaFileSystem.cpp
+    Core/FileSystems/MetaFileSystem.h
+    Core/HLE/FunctionWrappers.h
+    Core/HLE/HLE.cpp
+    Core/HLE/HLE.h
+    Core/HLE/HLETables.cpp
+    Core/HLE/HLETables.h
+    Core/HLE/__sceAudio.cpp
+    Core/HLE/__sceAudio.h
+    Core/HLE/sceAtrac.cpp
+    Core/HLE/sceAtrac.h
+    Core/HLE/sceAudio.cpp
+    Core/HLE/sceAudio.h
+    Core/HLE/sceCtrl.cpp
+    Core/HLE/sceCtrl.h
+    Core/HLE/sceDisplay.cpp
+    Core/HLE/sceDisplay.h
+    Core/HLE/sceDmac.cpp
+    Core/HLE/sceDmac.h
+    Core/HLE/sceGe.cpp
+    Core/HLE/sceGe.h
+    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
+    Core/HLE/sceKernel.cpp
+    Core/HLE/sceKernel.h
+    Core/HLE/sceKernelAlarm.cpp
+    Core/HLE/sceKernelAlarm.h
+    Core/HLE/sceKernelEventFlag.cpp
+    Core/HLE/sceKernelEventFlag.h
+    Core/HLE/sceKernelInterrupt.cpp
+    Core/HLE/sceKernelInterrupt.h
+    Core/HLE/sceKernelMbx.cpp
+    Core/HLE/sceKernelMbx.h
+    Core/HLE/sceKernelMemory.cpp
+    Core/HLE/sceKernelMemory.h
+    Core/HLE/sceKernelModule.cpp
+    Core/HLE/sceKernelModule.h
+    Core/HLE/sceKernelMsgPipe.cpp
+    Core/HLE/sceKernelMsgPipe.h
+    Core/HLE/sceKernelMutex.cpp
+    Core/HLE/sceKernelMutex.h
+    Core/HLE/sceKernelSemaphore.cpp
+    Core/HLE/sceKernelSemaphore.h
+    Core/HLE/sceKernelThread.cpp
+    Core/HLE/sceKernelThread.h
+    Core/HLE/sceKernelTime.cpp
+    Core/HLE/sceKernelTime.h
+    Core/HLE/sceKernelVTimer.cpp
+    Core/HLE/sceKernelVTimer.h
+    Core/HLE/sceMpeg.cpp
+    Core/HLE/sceMpeg.h
+    Core/HLE/sceNet.cpp
+    Core/HLE/sceNet.h
+    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
+    Core/HLE/sceUmd.cpp
+    Core/HLE/sceUmd.h
+    Core/HLE/sceUtility.cpp
+    Core/HLE/sceUtility.h
+    Core/HW/MemoryStick.cpp
+    Core/HW/MemoryStick.h
+    Core/Host.cpp
+    Core/Host.h
+    Core/Loaders.cpp
+    Core/Loaders.h
+    Core/MIPS/JitCommon/JitCommon.cpp
+    Core/MIPS/JitCommon/JitCommon.h
+    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
+    Core/MIPS/MIPSTables.cpp
+    Core/MIPS/MIPSTables.h
+    Core/MIPS/MIPSVFPUUtils.cpp
+    Core/MIPS/MIPSVFPUUtils.h
+    Core/MemMap.cpp
+    Core/MemMap.h
+    Core/MemMapFunctions.cpp
+    Core/PSPLoaders.cpp
+    Core/PSPLoaders.h
+    Core/PSPMixer.cpp
+    Core/PSPMixer.h
+    Core/System.cpp
+    Core/System.h
+    Core/Util/BlockAllocator.cpp
+    Core/Util/BlockAllocator.h
+    Core/Util/PPGeDraw.cpp
+    Core/Util/PPGeDraw.h
+    Core/Util/Pool.h
+    Core/Util/ppge_atlas.cpp
+    Core/Util/ppge_atlas.h
+    $<TARGET_OBJECTS:GPU>
+    Globals.h)
+target_link_libraries(${CoreLibName} Common native kirk
+    ${GLEW_LIBRARIES} ${OPENGL_LIBRARIES})
+setup_target_project(${CoreLibName} Core)
+
+add_library(GPU OBJECT
+    GPU/GLES/DisplayListInterpreter.cpp
+    GPU/GLES/DisplayListInterpreter.h
+    GPU/GLES/FragmentShaderGenerator.cpp
+    GPU/GLES/FragmentShaderGenerator.h
+    GPU/GLES/Framebuffer.cpp
+    GPU/GLES/Framebuffer.h
+    GPU/GLES/ShaderManager.cpp
+    GPU/GLES/ShaderManager.h
+    GPU/GLES/TextureCache.cpp
+    GPU/GLES/TextureCache.h
+    GPU/GLES/TransformPipeline.cpp
+    GPU/GLES/TransformPipeline.h
+    GPU/GLES/VertexDecoder.cpp
+    GPU/GLES/VertexDecoder.h
+    GPU/GLES/VertexShaderGenerator.cpp
+    GPU/GLES/VertexShaderGenerator.h
+    GPU/GPUInterface.h
+    GPU/GPUState.cpp
+    GPU/GPUState.h
+    GPU/Math3D.cpp
+    GPU/Math3D.h
+#    GPU/Null/NullDisplayListInterpreter.cpp
+#    GPU/Null/NullDisplayListInterpreter.h
+    GPU/Null/NullGpu.cpp
+    GPU/Null/NullGpu.h
+    GPU/ge_constants.h)
+setup_target_project(GPU GPU)
+
+if(WIN32)
+    add_executable(PPSSPPWindows WIN32
+        Windows/Breakpoints.h
+        Windows/DSoundStream.cpp
+        Windows/DSoundStream.h
+        Windows/Debugger/CPURegsInterface.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/Debugger.h
+        Windows/Debugger/Debugger_Disasm.cpp
+        Windows/Debugger/Debugger_Disasm.h
+        Windows/Debugger/Debugger_MemoryDlg.cpp
+        Windows/Debugger/Debugger_MemoryDlg.h
+        Windows/Debugger/Debugger_Misc.cpp
+        Windows/Debugger/Debugger_Misc.h
+#        Windows/Debugger/Debugger_Profiler.cpp
+#        Windows/Debugger/Debugger_Profiler.h
+        Windows/Debugger/Debugger_SymbolMap.h
+        Windows/Debugger/Debugger_VFPUDlg.cpp
+        Windows/Debugger/Debugger_VFPUDlg.h
+        Windows/Debugger/SimpleELF.h
+#        Windows/DlgDynaView.cpp
+#        Windows/DlgDynaView.h
+        Windows/EmuThread.cpp
+        Windows/EmuThread.h
+        Windows/Globals.cpp
+        Windows/InputBox.cpp
+        Windows/InputBox.h
+        Windows/InputDevice.cpp
+        Windows/InputDevice.h
+        Windows/KeyboardDevice.cpp
+        Windows/KeyboardDevice.h
+        Windows/MIPSCompALU.h
+        Windows/MIPSCompBranch.h
+        Windows/OpenGLBase.cpp
+        Windows/OpenGLBase.h
+        Windows/W32Util/DialogManager.cpp
+        Windows/W32Util/DialogManager.h
+        Windows/W32Util/Misc.cpp
+        Windows/W32Util/Misc.h
+        Windows/W32Util/PropertySheet.cpp
+        Windows/W32Util/PropertySheet.h
+        Windows/W32Util/ShellUtil.cpp
+        Windows/W32Util/ShellUtil.h
+        Windows/W32Util/XPTheme.h
+        Windows/WindowsFileSystem.h
+        Windows/WindowsHost.cpp
+        Windows/WindowsHost.h
+        Windows/WndMainWindow.cpp
+        Windows/WndMainWindow.h
+        Windows/XPTheme.h
+        Windows/XinputDevice.cpp
+        Windows/XinputDevice.h
+        Windows/main.cpp
+        Windows/main.h
+        Windows/ppsspp.rc
+        Windows/resource.h
+        Windows/stdafx.cpp
+        Windows/stdafx.h)
+    target_link_libraries(PPSSPPWindows ${CoreLibName}
+        kernel32 user32 gdi32 shell32 comctl32 dsound xinput)
+    setup_target_project(PPSSPPWindows Windows)
+endif()
+
+if(HEADLESS)
+    add_executable(PPSSPPHeadless
+        headless/Headless.cpp)
+    target_link_libraries(PPSSPPHeadless ${CoreLibName}
+        ${CMAKE_THREAD_LIBS_INIT})
+    setup_target_project(PPSSPPHeadless headless)
+endif()
+
+if(SDL_FOUND)
+    include_directories(${SDL_INCLUDE_DIR})
+
+    set(NativeAppSource
+        android/jni/NativeApp.cpp
+        android/jni/EmuScreen.cpp
+        android/jni/MenuScreens.cpp
+        android/jni/GamepadEmu.cpp
+        android/jni/UIShader.cpp
+        android/jni/ui_atlas.cpp)
+    set(AndroidAssets
+        android/assets/ui_atlas.zim
+        android/assets/ppge_atlas.zim)
+    set(LinkCommon ${CoreLibName}
+        ${SDL_LIBRARY} ${CMAKE_THREAD_LIBS_INIT})
+
+    if(BLACKBERRY)
+        add_executable(PPSSPPBlackberry
+            native/base/BlackberryMain.cpp
+            ${NativeAppSource})
+        target_link_libraries(PPSSPPBlackberry ${LinkCommon}
+            bps screen socket EGL GLESv2)
+    elseif(ANDROID)
+        # no target
+    else()
+        if(APPLE)
+            set(SDL_Main
+                SDL/SDLMain.h
+                SDL/SDLMain.m)
+        else()
+            set(SDL_Main
+                native/base/PCMain.cpp)
+        endif()
+
+        add_executable(PPSSPPSDL ${SDL_Main} ${NativeAppSource})
+        target_link_libraries(PPSSPPSDL ${LinkCommon})
+    endif()
+
+    file(INSTALL ${AndroidAssets} DESTINATION assets)
+endif()
+
+#include(CPack)

Common/ArmEmitter.cpp

@@ -61,7 +61,7 @@ const u8 *ARMXEmitter::AlignCodePage()
 
 void ARMXEmitter::Flush()
 {
-	__clear_cache (startcode, code);
+	__builtin___clear_cache (startcode, code);
 	SLEEP(0);
 }
 void ARMXEmitter::SetCC(CCFlags cond)

Common/CPUDetect.cpp

@@ -93,6 +93,10 @@ CPUInfo::CPUInfo() {
 	Detect();
 }
 
+#ifdef _WIN32
+#include <windows.h>
+#endif
+
 // Detects the various cpu features
 void CPUInfo::Detect()
 {

Common/FileUtil.cpp

@@ -48,7 +48,7 @@
 #define S_ISDIR(m)  (((m)&S_IFMT) == S_IFDIR)
 #endif
 
-#ifdef BSD4_4
+#if !defined(__linux__) && !defined(_WIN32) && !defined(__QNX__)
 #define stat64 stat
 #define fstat64 fstat
 #endif

Common/IniFile.cpp

@@ -19,6 +19,10 @@
 #include <stdlib.h>
 #include <stdio.h>
 
+#ifndef _MSC_VER
+#include <strings.h>
+#endif
+
 #include <string>
 #include <vector>
 #include <iostream>

Common/MemoryUtil.cpp

@@ -25,11 +25,8 @@
 #else
 #include <errno.h>
 #include <stdio.h>
+#endif
 #include <stdlib.h>
-#ifndef __APPLE__
-#include <malloc.h>
-#endif
-#endif
 
 
 #if !defined(_WIN32) && defined(__x86_64__) && !defined(MAP_32BIT)

Common/Misc.cpp

@@ -21,6 +21,10 @@
 #define __thread
 #endif
 
+#ifdef _WIN32
+#include <windows.h>
+#endif
+
 // Generic function to get last error message.
 // Call directly after the command or use the error num.
 // This function might change the error code.

Common/MsgHandler.cpp

@@ -98,6 +98,10 @@ bool MsgAlert(bool yes_no, int Style, const char* format, ...)
 	return true;
 }
 
+#ifdef _WIN32
+#include <windows.h>
+#endif
+
 // Default non library dependent panic alert
 bool DefaultMsgHandler(const char* caption, const char* text, bool yes_no, int Style)
 {

Common/x64Emitter.h

@@ -24,7 +24,7 @@
 #include "MemoryUtil.h"
 
 #if !defined(_M_IX86) && !defined(_M_X64)
-#error Don't build this on arm.
+#error "Don't build this on arm."
 #endif
 
 namespace Gen

Core/MIPS/MIPSIntVFPU.cpp

@@ -26,10 +26,6 @@
 
 #include <limits>
 
-#ifndef _MSC_VER
-using std::isnan;
-#endif
-
 #define R(i)   (currentMIPS->r[i])
 #define RF(i)  (*(float*)(&(currentMIPS->r[i])))
 #define V(i)   (currentMIPS->v[i])

SDL/bar-descriptor.xml

@@ -2,7 +2,7 @@
 <qnx xmlns="http://www.qnx.com/schemas/application/1.0">
     <id>com.Qtness.PPSSPP</id>
     <name>PPSSPP</name>
-    <filename>ppsspp</filename>
+    <filename>PPSSPPBlackberry</filename>
     <versionNumber>0.31</versionNumber>
     <buildId>1</buildId>
     <description>Playstation portable emulator.</description>

SDL/blackberry_package.sh

@@ -4,7 +4,7 @@ TYPE=Device-Release
 DEBUG="-devMode -debugToken ${HOME}/debugtoken.bar"
 PPSSPP_ROOT=${PWD}/..
 WORKSPACE=${PPSSPP_ROOT}/..
-blackberry-nativepackager -package PPSSPP.bar bar-descriptor.xml ppsspp \
+blackberry-nativepackager -package PPSSPP.bar bar-descriptor.xml PPSSPPBlackberry \
 -e icon-114.png icon-114.png $DEBUG \
 -e ../android/assets assets \
 -e ${WORKSPACE}/SDL12/${TYPE}/libSDL12.so lib/libSDL12.so \

Windows/DSoundStream.h

@@ -1,6 +1,8 @@
 #ifndef __SOUNDSTREAM_H__
 #define __SOUNDSTREAM_H__
 
+#include <windows.h>
+
 namespace DSound
 {
 	typedef int (*StreamCallback)(short *buffer, int numSamples, int bits, int rate, int channels);

Windows/Debugger/CtrlDisAsmView.cpp

@@ -13,6 +13,9 @@
 #include "../../globals.h"
 #include "../main.h"
 
+#include <windows.h>
+#include <tchar.h>
+
 TCHAR CtrlDisAsmView::szClassName[] = _T("CtrlDisAsmView");
 extern HMENU g_hPopupMenus;
 

Windows/Debugger/CtrlDisAsmView.h

@@ -20,6 +20,7 @@
 
 #include "../../Core/Debugger/DebugInterface.h"
 
+#include <windows.h>
 
 class CtrlDisAsmView
 {

Windows/Debugger/Debugger_Disasm.cpp

@@ -21,6 +21,10 @@
 #include "../XPTheme.h"
 #endif
 
+#include <windows.h>
+#include <windowsx.h>
+#include <commctrl.h>
+
 namespace MainWindow
 {
 	void UpdateMenus();

Windows/Debugger/Debugger_Disasm.h

@@ -10,6 +10,8 @@
 #include "../../Globals.h"
 #include "../../Core/CPU.h"
 
+#include <windows.h>
+
 class CDisasm : public Dialog
 {
 private:

Windows/Debugger/Debugger_MemoryDlg.h

@@ -8,6 +8,8 @@
 
 #include "../../Core/Debugger/DebugInterface.h"
 
+#include <windows.h>
+
 class CMemoryDlg : public Dialog
 {
 private:

Windows/EmuThread.cpp

@@ -10,6 +10,9 @@
 #include "../Core/System.h"
 #include "../Core/Config.h"
 
+#include <tchar.h>
+#include <process.h>
+
 char fileToStart[MAX_PATH];
 
 static HANDLE emuThread;

Windows/InputBox.h

@@ -2,5 +2,7 @@
 
 #include "../Globals.h"
 
+#include <windows.h>
+
 bool InputBox_GetString(HINSTANCE hInst, HWND hParent, TCHAR *title, TCHAR *defaultvalue, TCHAR *outvalue);
 bool InputBox_GetHex(HINSTANCE hInst, HWND hParent, TCHAR *title, u32 defaultvalue, u32 &outvalue);

Windows/InputDevice.h

@@ -8,6 +8,7 @@ public:
 	virtual int UpdateState() = 0;
 };
 
+#include <windows.h>
 #include <list>
 #include <memory>
 std::list<std::shared_ptr<InputDevice>> getInputDevices();

Windows/PPSSPP.vcxproj

@@ -279,9 +279,9 @@
     <ClCompile Include="DSoundStream.cpp" />
     <ClCompile Include="OpenGLBase.cpp" />
     <ClCompile Include="WindowsHost.cpp" />
-    <ClCompile Include="..\Globals.cpp" />
+    <ClCompile Include="Globals.cpp" />
-    <ClCompile Include="..\main.cpp" />
+    <ClCompile Include="main.cpp" />
-    <ClCompile Include="..\stdafx.cpp">
+    <ClCompile Include="stdafx.cpp">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
@@ -359,4 +359,4 @@
       <UserProperties RESOURCE_FILE="DaSh.rc" />
     </VisualStudio>
   </ProjectExtensions>
-</Project>
+</Project>

Windows/W32Util/DialogManager.h

@@ -1,5 +1,6 @@
 #pragma once
 
+#include <windows.h>
 
 class Dialog
 {

Windows/W32Util/Misc.h

@@ -1,5 +1,7 @@
 #pragma once
 
+#include <windows.h>
+
 namespace W32Util
 {
 	void CenterWindow(HWND hwnd);

Windows/W32Util/PropertySheet.cpp

@@ -2,6 +2,8 @@
 #include "Misc.h"
 #include "PropertySheet.h"
 
+#include <commctrl.h>
+
 namespace W32Util
 {
 	bool centered;

Windows/W32Util/ShellUtil.cpp

@@ -5,6 +5,9 @@
 
 #include "ShellUtil.h"
 
+#include <shlobj.h>
+#include <commdlg.h>
+
 namespace W32Util
 {
 	std::string BrowseForFolder(HWND parent, char *title)

Windows/WndMainWindow.cpp

@@ -5,6 +5,7 @@
 
 
 #include <windows.h>
+#include <tchar.h>
 #include "../globals.h"
 
 #include "shellapi.h"

Windows/WndMainWindow.h

@@ -1,5 +1,6 @@
 #pragma once
 
+#include <windows.h>
 
 namespace MainWindow
 {

Windows/main.h

@@ -21,6 +21,8 @@
 #include "Debugger/Debugger_Disasm.h"
 #include "Debugger/Debugger_MemoryDlg.h"
 
+#include <windows.h>
+
 #define MAX_CPUCOUNT 1
 
 extern CDisasm *disasmWindow[MAX_CPUCOUNT];

android/jni/Android.mk

@@ -53,7 +53,6 @@ LOCAL_SRC_FILES := \
   $(SRC)/ext/libkirk/bn.c \
   $(SRC)/ext/libkirk/ec.c \
   $(SRC)/ext/libkirk/kirk_engine.c \
-  $(SRC)/Globals.cpp \
   $(SRC)/Common/ArmABI.cpp \
   $(SRC)/Common/ArmEmitter.cpp \
   $(SRC)/Common/LogManager.cpp \

native

@@ -1 +1 @@
-Subproject commit 0598fc425c6b898af9fee5b49b2054b2fffa55e6
+Subproject commit 188c0c1a2f9e4d93bc2c7ebda5a73a204dc432f5