From 85533dad6e4ad9e94afa6b30174a05bbdc33daa1 Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Sun, 6 Sep 2015 12:52:33 -0700 Subject: [PATCH] Native merge part 2: update build files. And a couple minor stragglers. --- CMakeLists.txt | 540 +++++++++---------- Common/Common.vcxproj | 10 +- Core/Core.vcxproj | 10 +- GPU/Directx9/StateMappingDX9.h | 2 +- GPU/GPU.vcxproj | 24 +- Qt/Common.pro | 2 +- Qt/Core.pro | 4 +- Qt/Debugger/debugger_disasm.cpp | 2 +- Qt/GPU.pro | 4 +- Qt/Native.pro | 194 +++---- Qt/PPSSPP.pro | 10 +- Qt/Platform/android.pri | 2 +- UI/UI.vcxproj | 8 +- Windows/PPSSPP.sln | 6 +- Windows/PPSSPP.vcxproj | 28 +- android/.settings/org.eclipse.cdt.core.prefs | 6 +- android/ab.cmd | 2 +- android/ab.sh | 2 +- android/jni/Android.mk | 4 +- android/project.properties | 2 +- buildatlas.sh | 4 +- ext/native/native.vcxproj | 8 +- headless/Headless.vcxproj | 28 +- unittest/UnitTests.vcxproj | 20 +- 24 files changed, 461 insertions(+), 461 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 19b16ba0df..1745edbf38 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -126,7 +126,7 @@ else() set(CoreLinkType STATIC) endif() -include_directories(native) +include_directories(ext/native) if(RPI) include_directories(/opt/vc/include /opt/vc/include/interface/vcos/pthreads) @@ -389,12 +389,12 @@ if(NOT USING_GLES2) 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) + ext/native/ext/glew/GL/glew.h + ext/native/ext/glew/GL/glxew.h + ext/native/ext/glew/GL/wglew.h + ext/native/ext/glew/glew.c) target_link_libraries(glew ${OPENGL_LIBRARIES}) - include_directories(native/ext/glew) + include_directories(ext/native/ext/glew) set(GLEW_LIBRARIES glew) endif() @@ -402,21 +402,21 @@ add_subdirectory(ext/snappy) add_subdirectory(ext/udis86) add_library(vjson STATIC - native/ext/vjson/json.cpp - native/ext/vjson/json.h - native/ext/vjson/block_allocator.cpp - native/ext/vjson/block_allocator.h + ext/native/ext/vjson/json.cpp + ext/native/ext/vjson/json.h + ext/native/ext/vjson/block_allocator.cpp + ext/native/ext/vjson/block_allocator.h ) add_library(rg_etc1 STATIC - native/ext/rg_etc1/rg_etc1.cpp - native/ext/rg_etc1/rg_etc1.h) -include_directories(native/ext/rg_etc1) + ext/native/ext/rg_etc1/rg_etc1.cpp + ext/native/ext/rg_etc1/rg_etc1.h) +include_directories(ext/native/ext/rg_etc1) 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) + ext/native/ext/stb_vorbis/stb_vorbis.c + ext/native/ext/stb_vorbis/stb_vorbis.h) +include_directories(ext/native/ext/stb_vorbis) if(USE_FFMPEG) if(USE_SYSTEM_FFMPEG) @@ -610,9 +610,9 @@ else() endif() add_library(cityhash STATIC - native/ext/cityhash/city.cpp - native/ext/cityhash/city.h - native/ext/cityhash/citycrc.h + ext/native/ext/cityhash/city.cpp + ext/native/ext/cityhash/city.h + ext/native/ext/cityhash/citycrc.h ) include_directories(ext/cityhash) @@ -628,63 +628,63 @@ endif() 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) + ext/native/ext/libzip/zip.h + ext/native/ext/libzip/mkstemp.c + ext/native/ext/libzip/zip_add.c + ext/native/ext/libzip/zip_add_dir.c + ext/native/ext/libzip/zip_close.c + ext/native/ext/libzip/zip_delete.c + ext/native/ext/libzip/zip_dirent.c + ext/native/ext/libzip/zip_entry_free.c + ext/native/ext/libzip/zip_entry_new.c + ext/native/ext/libzip/zip_err_str.c + ext/native/ext/libzip/zip_error.c + ext/native/ext/libzip/zip_error_clear.c + ext/native/ext/libzip/zip_error_get.c + ext/native/ext/libzip/zip_error_get_sys_type.c + ext/native/ext/libzip/zip_error_strerror.c + ext/native/ext/libzip/zip_error_to_str.c + ext/native/ext/libzip/zip_fclose.c + ext/native/ext/libzip/zip_file_error_clear.c + ext/native/ext/libzip/zip_file_error_get.c + ext/native/ext/libzip/zip_file_get_offset.c + ext/native/ext/libzip/zip_file_strerror.c + ext/native/ext/libzip/zip_filerange_crc.c + ext/native/ext/libzip/zip_fopen.c + ext/native/ext/libzip/zip_fopen_index.c + ext/native/ext/libzip/zip_fread.c + ext/native/ext/libzip/zip_free.c + ext/native/ext/libzip/zip_get_archive_comment.c + ext/native/ext/libzip/zip_get_archive_flag.c + ext/native/ext/libzip/zip_get_file_comment.c + ext/native/ext/libzip/zip_get_name.c + ext/native/ext/libzip/zip_get_num_files.c + ext/native/ext/libzip/zip_memdup.c + ext/native/ext/libzip/zip_name_locate.c + ext/native/ext/libzip/zip_new.c + ext/native/ext/libzip/zip_open.c + ext/native/ext/libzip/zip_rename.c + ext/native/ext/libzip/zip_replace.c + ext/native/ext/libzip/zip_set_archive_comment.c + ext/native/ext/libzip/zip_set_archive_flag.c + ext/native/ext/libzip/zip_set_file_comment.c + ext/native/ext/libzip/zip_set_name.c + ext/native/ext/libzip/zip_source_buffer.c + ext/native/ext/libzip/zip_source_file.c + ext/native/ext/libzip/zip_source_filep.c + ext/native/ext/libzip/zip_source_free.c + ext/native/ext/libzip/zip_source_function.c + ext/native/ext/libzip/zip_source_zip.c + ext/native/ext/libzip/zip_stat.c + ext/native/ext/libzip/zip_stat_index.c + ext/native/ext/libzip/zip_stat_init.c + ext/native/ext/libzip/zip_strerror.c + ext/native/ext/libzip/zip_unchange.c + ext/native/ext/libzip/zip_unchange_all.c + ext/native/ext/libzip/zip_unchange_archive.c + ext/native/ext/libzip/zip_unchange_data.c) target_link_libraries(libzip ${ZLIB_LIBRARY}) -include_directories(native/ext/libzip) +include_directories(ext/native/ext/libzip) set(LIBZIP_LIBRARY libzip) # FindPNG does a few things we don't want. So do it ourselves. Fixed to libpng17 @@ -696,35 +696,35 @@ if (PNG_FOUND) include_directories(${PNG_PNG_INCLUDE_DIR}) else() if(ARM) - file(GLOB PNG_ARM_INCLUDES native/ext/libpng17/arm/*) + file(GLOB PNG_ARM_INCLUDES ext/native/ext/libpng17/arm/*) endif() add_library(png17 STATIC - native/ext/libpng17/pngconf.h - native/ext/libpng17/pngdebug.h - native/ext/libpng17/png.c - native/ext/libpng17/png.h - native/ext/libpng17/pngerror.c - native/ext/libpng17/pngget.c - native/ext/libpng17/pnginfo.h - native/ext/libpng17/pnglibconf.h - native/ext/libpng17/pngmem.c - native/ext/libpng17/pngpread.c - native/ext/libpng17/pngpriv.h - native/ext/libpng17/pngread.c - native/ext/libpng17/pngrio.c - native/ext/libpng17/pngrtran.c - native/ext/libpng17/pngrutil.c - native/ext/libpng17/pngset.c - native/ext/libpng17/pngstruct.h - native/ext/libpng17/pngtest.c - native/ext/libpng17/pngtrans.c - native/ext/libpng17/pngwio.c - native/ext/libpng17/pngwrite.c - native/ext/libpng17/pngwtran.c - native/ext/libpng17/pngwutil.c + ext/native/ext/libpng17/pngconf.h + ext/native/ext/libpng17/pngdebug.h + ext/native/ext/libpng17/png.c + ext/native/ext/libpng17/png.h + ext/native/ext/libpng17/pngerror.c + ext/native/ext/libpng17/pngget.c + ext/native/ext/libpng17/pnginfo.h + ext/native/ext/libpng17/pnglibconf.h + ext/native/ext/libpng17/pngmem.c + ext/native/ext/libpng17/pngpread.c + ext/native/ext/libpng17/pngpriv.h + ext/native/ext/libpng17/pngread.c + ext/native/ext/libpng17/pngrio.c + ext/native/ext/libpng17/pngrtran.c + ext/native/ext/libpng17/pngrutil.c + ext/native/ext/libpng17/pngset.c + ext/native/ext/libpng17/pngstruct.h + ext/native/ext/libpng17/pngtest.c + ext/native/ext/libpng17/pngtrans.c + ext/native/ext/libpng17/pngwio.c + ext/native/ext/libpng17/pngwrite.c + ext/native/ext/libpng17/pngwtran.c + ext/native/ext/libpng17/pngwutil.c ${PNG_ARM_INCLUDES} ) set(PNG_LIBRARY png17) - include_directories(native/ext) + include_directories(ext/native/ext) endif() set(nativeExtra) @@ -739,24 +739,24 @@ if(ARMV7) set (CMAKE_ASM_FLAGS "${CMAKE_ASM_FLAGS} -march=armv7-a -mfpu=neon -mcpu=cortex-a9") endif() set(nativeExtra ${nativeExtra} - native/math/fast/fast_matrix_neon.S) + ext/native/math/fast/fast_matrix_neon.S) endif() if(X86 AND NOT MIPS) set(nativeExtra ${nativeExtra} - native/math/fast/fast_matrix_sse.c) + ext/native/math/fast/fast_matrix_sse.c) endif() if(ANDROID) set(nativeExtra ${nativeExtra} - native/base/NativeApp.h - native/android/app-android.cpp - native/android/native_audio.cpp - native/android/native_audio.h) + ext/native/base/NativeApp.h + ext/native/android/app-android.cpp + ext/native/android/native_audio.cpp + ext/native/android/native_audio.h) add_library(native_audio SHARED - native/android/native-audio-so.cpp - native/android/native-audio-so.h) + ext/native/android/native-audio-so.cpp + ext/native/android/native-audio-so.h) target_link_libraries(native_audio OpenSLES log) # No target elseif(IOS) @@ -785,8 +785,8 @@ elseif(USING_QT_UI) message(FATAL_ERROR "Cmake does not yet support Qt. Please use qmake instead.") find_package(Qt4 COMPONENTS QtMultimedia QtOpenGL QtGui QtCore) include(${QT_USE_FILE}) - qt4_wrap_cpp(nativeQtHeader native/base/QtMain.h) - set(nativeExtra ${nativeExtra} native/base/QtMain.cpp ${nativeQtHeader}) + qt4_wrap_cpp(nativeQtHeader ext/native/base/QtMain.h) + set(nativeExtra ${nativeExtra} ext/native/base/QtMain.cpp ${nativeQtHeader}) if(NOT MOBILE_DEVICE) qt4_wrap_cpp(nativeQtHeader Qt/mainwindow.h) set(nativeExtra ${nativeExtra} Qt/mainwindow.cpp) @@ -798,7 +798,7 @@ elseif(USING_QT_UI) endif() elseif(BLACKBERRY) unset(CMAKE_DL_LIBS) - set(nativeExtra ${nativeExtra} native/base/BlackberryMain.cpp native/base/BlackberryDisplay.cpp) + set(nativeExtra ${nativeExtra} ext/native/base/BlackberryMain.cpp ext/native/base/BlackberryDisplay.cpp) set(nativeExtraLibs ${nativeExtraLibs} OpenAL bps screen socket EGL) set(TargetBin PPSSPPBlackberry) elseif(SDL2_FOUND) @@ -809,7 +809,7 @@ elseif(SDL2_FOUND) set(nativeExtra ${nativeExtra} SDL/SDLJoystick.h SDL/SDLJoystick.cpp - native/base/PCMain.cpp) + ext/native/base/PCMain.cpp) set(nativeExtraLibs ${nativeExtraLibs} ${SDL2_LIBRARY}) if(APPLE) set(nativeExtra ${nativeExtra} SDL/SDLMain.h SDL/SDLMain.mm) @@ -856,164 +856,164 @@ endif() add_library(native STATIC ${nativeExtra} - native/base/backtrace.cpp - native/base/backtrace.h - 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/functional.h - native/base/linked_ptr.h - native/base/logging.h - native/base/mutex.h - native/base/scoped_ptr.h - native/base/stats.h - native/base/stringutil.cpp - native/base/stringutil.h - native/base/timeutil.cpp - native/base/timeutil.h - native/data/compression.cpp - native/data/compression.h - native/ext/vjson/json.cpp - native/ext/vjson/json.h - native/ext/vjson/block_allocator.cpp - native/ext/vjson/block_allocator.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/ini_file.cpp - native/file/ini_file.h - native/file/path.cpp - native/file/path.h - native/file/vfs.h - native/file/zip_read.cpp - native/file/zip_read.h - native/gfx/gl_common.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/draw_text.cpp - native/gfx_es2/draw_text.h - native/gfx_es2/gpu_features.cpp - native/gfx_es2/gpu_features.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/gfx_es2/gl3stub.c - native/gfx_es2/gl3stub.h - native/i18n/i18n.cpp - native/i18n/i18n.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/keycodes.h - native/input/input_state.h - native/input/input_state.cpp - native/math/fast/fast_math.c - native/math/fast/fast_matrix.c - native/math/curves.cpp - native/math/curves.h - native/math/expression_parser.cpp - native/math/expression_parser.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/net/http_client.cpp - native/net/http_client.h - native/net/resolve.cpp - native/net/resolve.h - native/net/url.cpp - native/net/url.h - native/profiler/profiler.cpp - native/profiler/profiler.h - native/thin3d/thin3d.cpp - native/thin3d/thin3d.h - native/thin3d/thin3d_gl.cpp - native/thread/prioritizedworkqueue.cpp - native/thread/prioritizedworkqueue.h - native/thread/threadutil.cpp - native/thread/threadutil.h - native/thread/threadpool.cpp - native/thread/threadpool.h - native/ui/screen.cpp - native/ui/screen.h - native/ui/ui.cpp - native/ui/ui.h - native/ui/ui_context.cpp - native/ui/ui_context.h - native/ui/ui_screen.cpp - native/ui/ui_screen.h - native/ui/view.cpp - native/ui/view.h - native/ui/viewgroup.cpp - native/ui/viewgroup.h - 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/util/text/utf8.h - native/util/text/utf8.cpp - native/util/text/parsers.h - native/util/text/parsers.cpp - native/util/const_map.h - native/ext/jpge/jpgd.cpp - native/ext/jpge/jpgd.h - native/ext/jpge/jpge.cpp - native/ext/jpge/jpge.h) -include_directories(native) + ext/native/base/backtrace.cpp + ext/native/base/backtrace.h + ext/native/audio/mixer.cpp + ext/native/audio/mixer.h + ext/native/audio/wav_read.cpp + ext/native/audio/wav_read.h + ext/native/base/basictypes.h + ext/native/base/buffer.cpp + ext/native/base/buffer.h + ext/native/base/color.h + ext/native/base/colorutil.cpp + ext/native/base/colorutil.h + ext/native/base/display.cpp + ext/native/base/display.h + ext/native/base/error_context.cpp + ext/native/base/error_context.h + ext/native/base/fastlist.h + ext/native/base/fastlist_test.cpp + ext/native/base/functional.h + ext/native/base/linked_ptr.h + ext/native/base/logging.h + ext/native/base/mutex.h + ext/native/base/scoped_ptr.h + ext/native/base/stats.h + ext/native/base/stringutil.cpp + ext/native/base/stringutil.h + ext/native/base/timeutil.cpp + ext/native/base/timeutil.h + ext/native/data/compression.cpp + ext/native/data/compression.h + ext/native/ext/vjson/json.cpp + ext/native/ext/vjson/json.h + ext/native/ext/vjson/block_allocator.cpp + ext/native/ext/vjson/block_allocator.h + ext/native/file/chunk_file.cpp + ext/native/file/chunk_file.h + ext/native/file/dialog.cpp + ext/native/file/dialog.h + ext/native/file/easy_file.cpp + ext/native/file/easy_file.h + ext/native/file/fd_util.cpp + ext/native/file/fd_util.h + ext/native/file/file_util.cpp + ext/native/file/file_util.h + ext/native/file/ini_file.cpp + ext/native/file/ini_file.h + ext/native/file/path.cpp + ext/native/file/path.h + ext/native/file/vfs.h + ext/native/file/zip_read.cpp + ext/native/file/zip_read.h + ext/native/gfx/gl_common.h + ext/native/gfx/gl_debug_log.cpp + ext/native/gfx/gl_debug_log.h + ext/native/gfx/gl_lost_manager.cpp + ext/native/gfx/gl_lost_manager.h + ext/native/gfx/texture.cpp + ext/native/gfx/texture.h + ext/native/gfx/texture_atlas.cpp + ext/native/gfx/texture_atlas.h +# ext/native/gfx/texture_dx11.cpp + ext/native/gfx/texture_gen.cpp + ext/native/gfx/texture_gen.h + ext/native/gfx_es2/draw_buffer.cpp + ext/native/gfx_es2/draw_buffer.h + ext/native/gfx_es2/draw_text.cpp + ext/native/gfx_es2/draw_text.h + ext/native/gfx_es2/gpu_features.cpp + ext/native/gfx_es2/gpu_features.h + ext/native/gfx_es2/glsl_program.cpp + ext/native/gfx_es2/glsl_program.h + ext/native/gfx_es2/vertex_format.cpp + ext/native/gfx_es2/vertex_format.h + ext/native/gfx_es2/gl3stub.c + ext/native/gfx_es2/gl3stub.h + ext/native/i18n/i18n.cpp + ext/native/i18n/i18n.h + ext/native/image/png_load.cpp + ext/native/image/png_load.h + ext/native/image/zim_load.cpp + ext/native/image/zim_load.h + ext/native/image/zim_save.cpp + ext/native/image/zim_save.h + ext/native/input/gesture_detector.cpp + ext/native/input/gesture_detector.h + ext/native/input/keycodes.h + ext/native/input/input_state.h + ext/native/input/input_state.cpp + ext/native/math/fast/fast_math.c + ext/native/math/fast/fast_matrix.c + ext/native/math/curves.cpp + ext/native/math/curves.h + ext/native/math/expression_parser.cpp + ext/native/math/expression_parser.h + ext/native/math/lin/aabb.cpp + ext/native/math/lin/aabb.h + ext/native/math/lin/matrix4x4.cpp + ext/native/math/lin/matrix4x4.h + ext/native/math/lin/plane.cpp + ext/native/math/lin/plane.h + ext/native/math/lin/quat.cpp + ext/native/math/lin/quat.h + ext/native/math/lin/ray.h + ext/native/math/lin/vec3.cpp + ext/native/math/lin/vec3.h + ext/native/math/math_util.cpp + ext/native/math/math_util.h + ext/native/net/http_client.cpp + ext/native/net/http_client.h + ext/native/net/resolve.cpp + ext/native/net/resolve.h + ext/native/net/url.cpp + ext/native/net/url.h + ext/native/profiler/profiler.cpp + ext/native/profiler/profiler.h + ext/native/thin3d/thin3d.cpp + ext/native/thin3d/thin3d.h + ext/native/thin3d/thin3d_gl.cpp + ext/native/thread/prioritizedworkqueue.cpp + ext/native/thread/prioritizedworkqueue.h + ext/native/thread/threadutil.cpp + ext/native/thread/threadutil.h + ext/native/thread/threadpool.cpp + ext/native/thread/threadpool.h + ext/native/ui/screen.cpp + ext/native/ui/screen.h + ext/native/ui/ui.cpp + ext/native/ui/ui.h + ext/native/ui/ui_context.cpp + ext/native/ui/ui_context.h + ext/native/ui/ui_screen.cpp + ext/native/ui/ui_screen.h + ext/native/ui/view.cpp + ext/native/ui/view.h + ext/native/ui/viewgroup.cpp + ext/native/ui/viewgroup.h + ext/native/ui/virtual_input.cpp + ext/native/ui/virtual_input.h + ext/native/util/bits/bits.cpp + ext/native/util/bits/bits.h + ext/native/util/bits/hamming.h + ext/native/util/bits/varint.cpp + ext/native/util/bits/varint.h + ext/native/util/hash/hash.cpp + ext/native/util/hash/hash.h + ext/native/util/random/perlin.cpp + ext/native/util/random/perlin.h + ext/native/util/random/rng.h + ext/native/util/text/utf8.h + ext/native/util/text/utf8.cpp + ext/native/util/text/parsers.h + ext/native/util/text/parsers.cpp + ext/native/util/const_map.h + ext/native/ext/jpge/jpgd.cpp + ext/native/ext/jpge/jpgd.h + ext/native/ext/jpge/jpge.cpp + ext/native/ext/jpge/jpge.h) +include_directories(ext/native) if (LINUX AND NOT ANDROID) SET(RT_LIB rt) diff --git a/Common/Common.vcxproj b/Common/Common.vcxproj index 5901f1208c..faed024de8 100644 --- a/Common/Common.vcxproj +++ b/Common/Common.vcxproj @@ -73,7 +73,7 @@ USING_WIN_UI;_CRT_SECURE_NO_WARNINGS;WIN32;_ARCH_32=1;_M_IX86=1;_DEBUG;_LIB;_UNICODE;UNICODE;%(PreprocessorDefinitions) stdafx.h MultiThreadedDebug - ../native + ../ext/native StreamingSIMDExtensions2 Fast true @@ -100,7 +100,7 @@ stdafx.h MultiThreadedDebug USING_WIN_UI;_CRT_SECURE_NO_WARNINGS;WIN32;_ARCH_64=1;_M_X64=1;_DEBUG;_LIB;_UNICODE;UNICODE;%(PreprocessorDefinitions) - ../native + ../ext/native NotSet Fast false @@ -132,7 +132,7 @@ false StreamingSIMDExtensions2 Fast - ../native + ../ext/native Speed true false @@ -161,7 +161,7 @@ true USING_WIN_UI;_CRT_SECURE_NO_WARNINGS;WIN32;_ARCH_64=1;_M_X64=1;NDEBUG;_LIB;_UNICODE;UNICODE;%(PreprocessorDefinitions) stdafx.h - ../native + ../ext/native false NotSet Fast @@ -282,7 +282,7 @@ - + {c4df647e-80ea-4111-a0a8-218b1b711e18} diff --git a/Core/Core.vcxproj b/Core/Core.vcxproj index 2644e8be55..a7c8394b87 100644 --- a/Core/Core.vcxproj +++ b/Core/Core.vcxproj @@ -70,7 +70,7 @@ Level3 Disabled - ..\ffmpeg\WindowsInclude;..\ffmpeg\Windows\x86\include;../common;..;../native;../native/ext/glew;../ext/zlib;../native/ext + ..\ffmpeg\WindowsInclude;..\ffmpeg\Windows\x86\include;../common;..;../ext/native;../ext/native/ext/glew;../ext/zlib;../ext/native/ext USING_WIN_UI;_CRT_SECURE_NO_WARNINGS;USE_FFMPEG;WIN32;_ARCH_32=1;_M_IX86=1;_DEBUG;_LIB;_UNICODE;UNICODE;%(PreprocessorDefinitions) StreamingSIMDExtensions2 Fast @@ -91,7 +91,7 @@ Level3 Disabled - ..\ffmpeg\WindowsInclude;..\ffmpeg\Windows\x86_64\include;../common;..;../native;../native/ext/glew;../ext/zlib;../native/ext + ..\ffmpeg\WindowsInclude;..\ffmpeg\Windows\x86_64\include;../common;..;../ext/native;../ext/native/ext/glew;../ext/zlib;../ext/native/ext USING_WIN_UI;_CRT_SECURE_NO_WARNINGS;USE_FFMPEG;WIN32;_ARCH_64=1;_M_X64=1;_DEBUG;_LIB;_UNICODE;UNICODE;%(PreprocessorDefinitions) NotSet Fast @@ -115,7 +115,7 @@ MaxSpeed true true - ..\ffmpeg\WindowsInclude;..\ffmpeg\Windows\x86\include;../common;..;../native;../native/ext/glew;../ext/zlib;../native/ext + ..\ffmpeg\WindowsInclude;..\ffmpeg\Windows\x86\include;../common;..;../ext/native;../ext/native/ext/glew;../ext/zlib;../ext/native/ext false StreamingSIMDExtensions2 Fast @@ -145,7 +145,7 @@ MaxSpeed true true - ..\ffmpeg\WindowsInclude;..\ffmpeg\Windows\x86_64\include;../common;..;../native;../native/ext/glew;../ext/zlib;../native/ext + ..\ffmpeg\WindowsInclude;..\ffmpeg\Windows\x86_64\include;../common;..;../ext/native;../ext/native/ext/glew;../ext/zlib;../ext/native/ext NotSet Fast false @@ -731,7 +731,7 @@ {457f45d2-556f-47bc-a31d-aff0d15beaed} - + {C4DF647E-80EA-4111-A0A8-218B1B711E18} diff --git a/GPU/Directx9/StateMappingDX9.h b/GPU/Directx9/StateMappingDX9.h index eb5d94659f..28bed35866 100644 --- a/GPU/Directx9/StateMappingDX9.h +++ b/GPU/Directx9/StateMappingDX9.h @@ -2,4 +2,4 @@ #include "helper/global.h" #include "helper/dx_state.h" -//#include "../native/gfx/gl_common.h" + diff --git a/GPU/GPU.vcxproj b/GPU/GPU.vcxproj index ccbf958d6b..4892f5d66d 100644 --- a/GPU/GPU.vcxproj +++ b/GPU/GPU.vcxproj @@ -68,26 +68,26 @@ - ..\dx9sdk\Include;$(VC_IncludePath);$(WindowsSdk_71A_IncludePath); - ..\dx9sdk\Lib\x86;$(VC_LibraryPath_x86);$(WindowsSdk_71A_LibraryPath_x86); + dx9sdk\Include;$(VC_IncludePath);$(WindowsSdk_71A_IncludePath); + dx9sdk\Lib\x86;$(VC_LibraryPath_x86);$(WindowsSdk_71A_LibraryPath_x86); - ..\dx9sdk\Include;$(VC_IncludePath);$(WindowsSdk_71A_IncludePath); - ..\dx9sdk\Lib\x64;$(VC_LibraryPath_x64);$(WindowsSdk_71A_LibraryPath_x64); + dx9sdk\Include;$(VC_IncludePath);$(WindowsSdk_71A_IncludePath); + dx9sdk\Lib\x64;$(VC_LibraryPath_x64);$(WindowsSdk_71A_LibraryPath_x64); - ..\dx9sdk\Include;$(VC_IncludePath);$(WindowsSdk_71A_IncludePath); - ..\dx9sdk\Lib\x64;$(VC_LibraryPath_x64);$(WindowsSdk_71A_LibraryPath_x64); + dx9sdk\Include;$(VC_IncludePath);$(WindowsSdk_71A_IncludePath); + dx9sdk\Lib\x64;$(VC_LibraryPath_x64);$(WindowsSdk_71A_LibraryPath_x64); - ..\dx9sdk\Include;$(VC_IncludePath);$(WindowsSdk_71A_IncludePath); - ..\dx9sdk\Lib\x86;$(VC_LibraryPath_x86);$(WindowsSdk_71A_LibraryPath_x86); + dx9sdk\Include;$(VC_IncludePath);$(WindowsSdk_71A_IncludePath); + dx9sdk\Lib\x86;$(VC_LibraryPath_x86);$(WindowsSdk_71A_LibraryPath_x86); Level3 Disabled - ../common;..;../native;../native/ext/glew; + ../common;..;../ext/native;../ext/native/ext/glew; USING_WIN_UI;_CRT_SECURE_NO_WARNINGS;WIN32;_ARCH_32=1;_M_IX86=1;_DEBUG;_LIB;_UNICODE;UNICODE;%(PreprocessorDefinitions) StreamingSIMDExtensions2 Fast @@ -108,7 +108,7 @@ Level3 Disabled - ../common;..;../native;../native/ext/glew; + ../common;..;../ext/native;../ext/native/ext/glew; NotSet Fast false @@ -132,7 +132,7 @@ MaxSpeed true true - ../common;..;../native;../native/ext/glew; + ../common;..;../ext/native;../ext/native/ext/glew; false StreamingSIMDExtensions2 Fast @@ -158,7 +158,7 @@ MaxSpeed true true - ../common;..;../native;../native/ext/glew; + ../common;..;../ext/native;../ext/native/ext/glew; false NotSet Fast diff --git a/Qt/Common.pro b/Qt/Common.pro index ec3b4a8d0e..3a9b41a5ec 100644 --- a/Qt/Common.pro +++ b/Qt/Common.pro @@ -71,5 +71,5 @@ HEADERS += $$P/Common/ChunkFile.h \ $$P/Common/Timer.h \ $$P/Common/Crypto/*.h -INCLUDEPATH += $$P/native +INCLUDEPATH += $$P/ext/native diff --git a/Qt/Core.pro b/Qt/Core.pro index 2b1f058f0c..d7c45ad6cc 100644 --- a/Qt/Core.pro +++ b/Qt/Core.pro @@ -5,8 +5,8 @@ CONFIG += staticlib include(Settings.pri) -INCLUDEPATH += $$P/ $$P/native $$P/Core/MIPS $$P/ext/xbrz -!contains(DEFINES, USING_GLES2): INCLUDEPATH += $$P/native/ext/glew +INCLUDEPATH += $$P/ $$P/ext/native $$P/Core/MIPS $$P/ext/xbrz +!contains(DEFINES, USING_GLES2): INCLUDEPATH += $$P/ext/native/ext/glew arm { SOURCES += $$P/Core/MIPS/ARM/*.cpp #CoreARM diff --git a/Qt/Debugger/debugger_disasm.cpp b/Qt/Debugger/debugger_disasm.cpp index a3286cfe7b..59276c0080 100644 --- a/Qt/Debugger/debugger_disasm.cpp +++ b/Qt/Debugger/debugger_disasm.cpp @@ -13,7 +13,7 @@ #include "Core/CoreTiming.h" #include "mainwindow.h" #include "ctrlregisterlist.h" -#include "native/base/stringutil.h" +#include "base/stringutil.h" #include "Core/Debugger/SymbolMap.h" #include "GPU/GPUState.h" #include "GPU/GPUInterface.h" diff --git a/Qt/GPU.pro b/Qt/GPU.pro index cebea5ef92..cc6af94dcc 100644 --- a/Qt/GPU.pro +++ b/Qt/GPU.pro @@ -6,8 +6,8 @@ CONFIG += staticlib include(Settings.pri) -INCLUDEPATH += $$P/ $$P/native -!contains(DEFINES, USING_GLES2): INCLUDEPATH += $$P/native/ext/glew +INCLUDEPATH += $$P/ $$P/ext/native +!contains(DEFINES, USING_GLES2): INCLUDEPATH += $$P/ext/native/ext/glew win32 { SOURCES += $$P/Windows/OpenGLBase.cpp diff --git a/Qt/Native.pro b/Qt/Native.pro index abccc61a3d..9b853990fa 100644 --- a/Qt/Native.pro +++ b/Qt/Native.pro @@ -9,36 +9,36 @@ include(Settings.pri) # To support Sailfish which is stuck on GCC 4.6 linux-g++:system($$QMAKE_CXX --version | grep "4.6."): DEFINES+=override -INCLUDEPATH += $$P/native +INCLUDEPATH += $$P/ext/native !contains(DEFINES,USING_GLES2) { - SOURCES += $$P/native/ext/glew/glew.c - HEADERS += $$P/native/ext/glew/GL/*.h - INCLUDEPATH += $$P/native/ext/glew + SOURCES += $$P/ext/native/ext/glew/glew.c + HEADERS += $$P/ext/native/ext/glew/GL/*.h + INCLUDEPATH += $$P/ext/native/ext/glew } # RG_ETC1 -SOURCES += $$P/native/ext/rg_etc1/rg_etc1.cpp -HEADERS += $$P/native/ext/rg_etc1/rg_etc1.h -INCLUDEPATH += $$P/native/ext/rg_etc1 +SOURCES += $$P/ext/native/ext/rg_etc1/rg_etc1.cpp +HEADERS += $$P/ext/native/ext/rg_etc1/rg_etc1.h +INCLUDEPATH += $$P/ext/native/ext/rg_etc1 # Cityhash -SOURCES += ../native/ext/cityhash/city.cpp -HEADERS += ../native/ext/cityhash/*.h -INCLUDEPATH += ../native/ext/cityhash +SOURCES += ../ext/native/ext/cityhash/city.cpp +HEADERS += ../ext/native/ext/cityhash/*.h +INCLUDEPATH += ../ext/native/ext/cityhash # JPGE -SOURCES += $$P/native/ext/jpge/*.cpp -HEADERS += $$P/native/ext/jpge/*.h -INCLUDEPATH += $$P/native/ext/jpge +SOURCES += $$P/ext/native/ext/jpge/*.cpp +HEADERS += $$P/ext/native/ext/jpge/*.h +INCLUDEPATH += $$P/ext/native/ext/jpge # Stb_vorbis -SOURCES += $$P/native/ext/stb_vorbis/stb_vorbis.c -HEADERS += $$P/native/ext/stb_vorbis/stb_vorbis.h -INCLUDEPATH += $$P/native/ext/stb_vorbis +SOURCES += $$P/ext/native/ext/stb_vorbis/stb_vorbis.c +HEADERS += $$P/ext/native/ext/stb_vorbis/stb_vorbis.h +INCLUDEPATH += $$P/ext/native/ext/stb_vorbis # Snappy @@ -54,11 +54,11 @@ INCLUDEPATH += $$P/ext/udis86 # VJSON -SOURCES += $$P/native/ext/vjson/json.cpp \ - $$P/native/ext/vjson/block_allocator.cpp -HEADERS += $$P/native/ext/vjson/json.h \ - $$P/native/ext/vjson/block_allocator.h -INCLUDEPATH += $$P/native/ext/vjson +SOURCES += $$P/ext/native/ext/vjson/json.cpp \ + $$P/ext/native/ext/vjson/block_allocator.cpp +HEADERS += $$P/ext/native/ext/vjson/json.h \ + $$P/ext/native/ext/vjson/block_allocator.h +INCLUDEPATH += $$P/ext/native/ext/vjson # Zlib win32|contains(QT_CONFIG, no-zlib) { @@ -67,85 +67,85 @@ win32|contains(QT_CONFIG, no-zlib) { } # Libzip -SOURCES += $$P/native/ext/libzip/*.c -HEADERS += $$P/native/ext/libzip/*.h +SOURCES += $$P/ext/native/ext/libzip/*.c +HEADERS += $$P/ext/native/ext/libzip/*.h # Native -SOURCES += $$P/native/audio/*.cpp \ - $$P/native/base/backtrace.cpp \ - $$P/native/base/buffer.cpp \ - $$P/native/base/colorutil.cpp \ - $$P/native/base/compat.cpp \ - $$P/native/base/display.cpp \ - $$P/native/base/error_context.cpp \ - $$P/native/base/fastlist_test.cpp \ - $$P/native/base/stringutil.cpp \ - $$P/native/base/timeutil.cpp \ - $$P/native/data/compression.cpp \ - $$P/native/file/*.cpp \ - $$P/native/gfx/gl_debug_log.cpp \ - $$P/native/gfx/gl_lost_manager.cpp \ - $$P/native/gfx/texture.cpp \ - $$P/native/gfx/texture_atlas.cpp \ - $$P/native/gfx/texture_gen.cpp \ - $$P/native/gfx_es2/*.cpp \ - $$P/native/gfx_es2/*.c \ - $$P/native/i18n/*.cpp \ - $$P/native/image/*.cpp \ - $$P/native/input/*.cpp \ - $$P/native/math/curves.cpp \ - $$P/native/math/expression_parser.cpp \ - $$P/native/math/math_util.cpp \ - $$P/native/math/lin/*.cpp \ - $$P/native/math/fast/*.c \ - $$P/native/net/*.cpp \ - $$P/native/profiler/profiler.cpp \ - $$P/native/thin3d/thin3d.cpp \ - $$P/native/thin3d/thin3d_gl.cpp \ - $$P/native/thread/*.cpp \ - $$P/native/ui/*.cpp \ - $$P/native/util/bits/*.cpp \ - $$P/native/util/hash/hash.cpp \ - $$P/native/util/random/perlin.cpp \ - $$P/native/util/text/utf8.cpp \ - $$P/native/util/text/parsers.cpp +SOURCES += $$P/ext/native/audio/*.cpp \ + $$P/ext/native/base/backtrace.cpp \ + $$P/ext/native/base/buffer.cpp \ + $$P/ext/native/base/colorutil.cpp \ + $$P/ext/native/base/compat.cpp \ + $$P/ext/native/base/display.cpp \ + $$P/ext/native/base/error_context.cpp \ + $$P/ext/native/base/fastlist_test.cpp \ + $$P/ext/native/base/stringutil.cpp \ + $$P/ext/native/base/timeutil.cpp \ + $$P/ext/native/data/compression.cpp \ + $$P/ext/native/file/*.cpp \ + $$P/ext/native/gfx/gl_debug_log.cpp \ + $$P/ext/native/gfx/gl_lost_manager.cpp \ + $$P/ext/native/gfx/texture.cpp \ + $$P/ext/native/gfx/texture_atlas.cpp \ + $$P/ext/native/gfx/texture_gen.cpp \ + $$P/ext/native/gfx_es2/*.cpp \ + $$P/ext/native/gfx_es2/*.c \ + $$P/ext/native/i18n/*.cpp \ + $$P/ext/native/image/*.cpp \ + $$P/ext/native/input/*.cpp \ + $$P/ext/native/math/curves.cpp \ + $$P/ext/native/math/expression_parser.cpp \ + $$P/ext/native/math/math_util.cpp \ + $$P/ext/native/math/lin/*.cpp \ + $$P/ext/native/math/fast/*.c \ + $$P/ext/native/net/*.cpp \ + $$P/ext/native/profiler/profiler.cpp \ + $$P/ext/native/thin3d/thin3d.cpp \ + $$P/ext/native/thin3d/thin3d_gl.cpp \ + $$P/ext/native/thread/*.cpp \ + $$P/ext/native/ui/*.cpp \ + $$P/ext/native/util/bits/*.cpp \ + $$P/ext/native/util/hash/hash.cpp \ + $$P/ext/native/util/random/perlin.cpp \ + $$P/ext/native/util/text/utf8.cpp \ + $$P/ext/native/util/text/parsers.cpp -armv7: SOURCES += $$files($$P/native/math/fast/fast_matrix_neon.S) +armv7: SOURCES += $$files($$P/ext/native/math/fast/fast_matrix_neon.S) -HEADERS += $$P/native/audio/*.h \ - $$P/native/base/backtrace.h \ - $$P/native/base/basictypes.h \ - $$P/native/base/buffer.h \ - $$P/native/base/color.h \ - $$P/native/base/colorutil.h \ - $$P/native/base/display.h \ - $$P/native/base/error_context.h \ - $$P/native/base/fastlist.h \ - $$P/native/base/linked_ptr.h \ - $$P/native/base/logging.h \ - $$P/native/base/mutex.h \ - $$P/native/base/scoped_ptr.h \ - $$P/native/base/stats.h \ - $$P/native/base/stringutil.h \ - $$P/native/base/timeutil.h \ - $$P/native/data/compression.h \ - $$P/native/file/*.h \ - $$P/native/gfx/*.h \ - $$P/native/gfx_es2/*.h \ - $$P/native/i18n/*.h \ - $$P/native/image/*.h \ - $$P/native/input/*.h \ - $$P/native/math/*.h \ - $$P/native/math/lin/*.h \ - $$P/native/math/fast/*.h \ - $$P/native/net/*.h \ - $$P/native/profiler/profiler.h \ - $$P/native/thread/*.h \ - $$P/native/ui/*.h \ - $$P/native/util/bits/*.h \ - $$P/native/util/hash/hash.h \ - $$P/native/util/random/*.h \ - $$P/native/util/text/utf8.h \ - $$P/native/util/text/parsers.h +HEADERS += $$P/ext/native/audio/*.h \ + $$P/ext/native/base/backtrace.h \ + $$P/ext/native/base/basictypes.h \ + $$P/ext/native/base/buffer.h \ + $$P/ext/native/base/color.h \ + $$P/ext/native/base/colorutil.h \ + $$P/ext/native/base/display.h \ + $$P/ext/native/base/error_context.h \ + $$P/ext/native/base/fastlist.h \ + $$P/ext/native/base/linked_ptr.h \ + $$P/ext/native/base/logging.h \ + $$P/ext/native/base/mutex.h \ + $$P/ext/native/base/scoped_ptr.h \ + $$P/ext/native/base/stats.h \ + $$P/ext/native/base/stringutil.h \ + $$P/ext/native/base/timeutil.h \ + $$P/ext/native/data/compression.h \ + $$P/ext/native/file/*.h \ + $$P/ext/native/gfx/*.h \ + $$P/ext/native/gfx_es2/*.h \ + $$P/ext/native/i18n/*.h \ + $$P/ext/native/image/*.h \ + $$P/ext/native/input/*.h \ + $$P/ext/native/math/*.h \ + $$P/ext/native/math/lin/*.h \ + $$P/ext/native/math/fast/*.h \ + $$P/ext/native/net/*.h \ + $$P/ext/native/profiler/profiler.h \ + $$P/ext/native/thread/*.h \ + $$P/ext/native/ui/*.h \ + $$P/ext/native/util/bits/*.h \ + $$P/ext/native/util/hash/hash.h \ + $$P/ext/native/util/random/*.h \ + $$P/ext/native/util/text/utf8.h \ + $$P/ext/native/util/text/parsers.h diff --git a/Qt/PPSSPP.pro b/Qt/PPSSPP.pro index 6533fe2695..2f0d0cf088 100644 --- a/Qt/PPSSPP.pro +++ b/Qt/PPSSPP.pro @@ -64,11 +64,11 @@ unix:contains(QT_CONFIG, system-zlib) { } # Main -SOURCES += $$P/native/base/QtMain.cpp -HEADERS += $$P/native/base/QtMain.h +SOURCES += $$P/ext/native/base/QtMain.cpp +HEADERS += $$P/ext/native/base/QtMain.h symbian { - SOURCES += $$P/native/base/SymbianMediaKeys.cpp - HEADERS += $$P/native/base/SymbianMediaKeys.h + SOURCES += $$P/ext/native/base/SymbianMediaKeys.cpp + HEADERS += $$P/ext/native/base/SymbianMediaKeys.h } # UI @@ -77,7 +77,7 @@ SOURCES += $$P/UI/*.cpp \ arm:android: SOURCES += $$P/android/jni/ArmEmitterTest.cpp HEADERS += $$P/UI/*.h -INCLUDEPATH += $$P $$P/Common $$P/native $$P/native/ext $$P/native/ext/glew +INCLUDEPATH += $$P $$P/Common $$P/ext/native $$P/ext/native/ext $$P/ext/native/ext/glew mobile_platform { !no_assets: RESOURCES += $$P/Qt/assets.qrc diff --git a/Qt/Platform/android.pri b/Qt/Platform/android.pri index e23ae0e38c..f7df4ab671 100644 --- a/Qt/Platform/android.pri +++ b/Qt/Platform/android.pri @@ -1,5 +1,5 @@ DEFINES += ANDROID -INCLUDEPATH += $$P/native/ext/libzip +INCLUDEPATH += $$P/ext/native/ext/libzip !contains(CONFIG, staticlib) { # Packaging diff --git a/UI/UI.vcxproj b/UI/UI.vcxproj index 4333d5c889..8249e4ac41 100644 --- a/UI/UI.vcxproj +++ b/UI/UI.vcxproj @@ -123,7 +123,7 @@ Level3 Disabled USING_WIN_UI;_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_LIB;_UNICODE;UNICODE;%(PreprocessorDefinitions) - ../common;..;../native;../native/ext/glew;../ext/zlib;../native/ext + ../common;..;../ext/native;../ext/native/ext/glew;../ext/zlib;../ext/native/ext true false false @@ -145,7 +145,7 @@ Level3 Disabled USING_WIN_UI;_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_LIB;_UNICODE;UNICODE;%(PreprocessorDefinitions) - ../common;..;../native;../native/ext/glew;../ext/zlib;../native/ext + ../common;..;../ext/native;../ext/native/ext/glew;../ext/zlib;../ext/native/ext true false false @@ -169,7 +169,7 @@ true true USING_WIN_UI;_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_LIB;_UNICODE;UNICODE;%(PreprocessorDefinitions) - ../common;..;../native;../native/ext/glew;../ext/zlib;../native/ext + ../common;..;../ext/native;../ext/native/ext/glew;../ext/zlib;../ext/native/ext false Speed true @@ -196,7 +196,7 @@ true true USING_WIN_UI;_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_LIB;_UNICODE;UNICODE;%(PreprocessorDefinitions) - ../common;..;../native;../native/ext/glew;../ext/zlib;../native/ext + ../common;..;../ext/native;../ext/native/ext/glew;../ext/zlib;../ext/native/ext false true false diff --git a/Windows/PPSSPP.sln b/Windows/PPSSPP.sln index 431d9751ad..ea61f91312 100644 --- a/Windows/PPSSPP.sln +++ b/Windows/PPSSPP.sln @@ -1,6 +1,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2013 -VisualStudioVersion = 12.0.30723.0 +# Visual Studio 14 +VisualStudioVersion = 14.0.23107.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PPSSPPWindows", "PPSSPP.vcxproj", "{567AF8DB-42C1-4D08-96CD-D70A2DFEFC6B}" ProjectSection(ProjectDependencies) = postProject @@ -35,7 +35,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Core", "..\Core\Core.vcxpro {3FCDBAE2-5103-4350-9A8E-848CE9C73195} = {3FCDBAE2-5103-4350-9A8E-848CE9C73195} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "native", "..\native\native.vcxproj", "{C4DF647E-80EA-4111-A0A8-218B1B711E18}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "native", "..\ext\native\native.vcxproj", "{C4DF647E-80EA-4111-A0A8-218B1B711E18}" ProjectSection(ProjectDependencies) = postProject {F761046E-6C38-4428-A5F1-38391A37BB34} = {F761046E-6C38-4428-A5F1-38391A37BB34} EndProjectSection diff --git a/Windows/PPSSPP.vcxproj b/Windows/PPSSPP.vcxproj index 37135c38da..f963ed5b1d 100644 --- a/Windows/PPSSPP.vcxproj +++ b/Windows/PPSSPP.vcxproj @@ -97,25 +97,25 @@ ..\ PPSSPPDebug false - ..\dx9sdk\Include;$(VC_IncludePath);$(WindowsSdk_71A_IncludePath); - ..\dx9sdk\Lib\x86;$(VC_LibraryPath_x86);$(WindowsSdk_71A_LibraryPath_x86); + dx9sdk\Include;$(VC_IncludePath);$(WindowsSdk_71A_IncludePath); + dx9sdk\Lib\x86;$(VC_LibraryPath_x86);$(WindowsSdk_71A_LibraryPath_x86); PPSSPPDebug64 false - ..\dx9sdk\Include;$(VC_IncludePath);$(WindowsSdk_71A_IncludePath); - ..\dx9sdk\Lib\x64;$(VC_LibraryPath_x64);$(WindowsSdk_71A_LibraryPath_x64); + dx9sdk\Include;$(VC_IncludePath);$(WindowsSdk_71A_IncludePath); + dx9sdk\Lib\x64;$(VC_LibraryPath_x64);$(WindowsSdk_71A_LibraryPath_x64); PPSSPPWindows64 false - ..\dx9sdk\Include;$(VC_IncludePath);$(WindowsSdk_71A_IncludePath); - ..\dx9sdk\Lib\x64;$(VC_LibraryPath_x64);$(WindowsSdk_71A_LibraryPath_x64); + dx9sdk\Include;$(VC_IncludePath);$(WindowsSdk_71A_IncludePath); + dx9sdk\Lib\x64;$(VC_LibraryPath_x64);$(WindowsSdk_71A_LibraryPath_x64); false - ..\dx9sdk\Include;$(VC_IncludePath);$(WindowsSdk_71A_IncludePath); - ..\dx9sdk\Lib\x86;$(VC_LibraryPath_x86);$(WindowsSdk_71A_LibraryPath_x86); + dx9sdk\Include;$(VC_IncludePath);$(WindowsSdk_71A_IncludePath); + dx9sdk\Lib\x86;$(VC_LibraryPath_x86);$(WindowsSdk_71A_LibraryPath_x86); @@ -126,7 +126,7 @@ Use Level3 EditAndContinue - ../common;..;../native;../native/ext/glew;../ext/zlib + ../common;..;../ext/native;../ext/native/ext/glew;../ext/zlib stdafx.h MultiThreadedDebug StreamingSIMDExtensions2 @@ -163,7 +163,7 @@ Use Level3 ProgramDatabase - ../common;..;../native;../native/ext/glew;../ext/zlib + ../common;..;../ext/native;../ext/native/ext/glew;../ext/zlib stdafx.h MultiThreadedDebug false @@ -203,7 +203,7 @@ Use Level3 ProgramDatabase - ../common;..;../native;../native/ext/glew;../ext/zlib + ../common;..;../ext/native;../ext/native/ext/glew;../ext/zlib stdafx.h stdafx.h true @@ -248,7 +248,7 @@ Use Level3 ProgramDatabase - ../common;..;../native;../native/ext/glew;../ext/zlib + ../common;..;../ext/native;../ext/native/ext/glew;../ext/zlib stdafx.h true false @@ -282,7 +282,7 @@ true - + NotUsing @@ -427,7 +427,7 @@ {457f45d2-556f-47bc-a31d-aff0d15beaed} - + {C4DF647E-80EA-4111-A0A8-218B1B711E18} diff --git a/android/.settings/org.eclipse.cdt.core.prefs b/android/.settings/org.eclipse.cdt.core.prefs index f8b6ebd1f6..f4e926d548 100644 --- a/android/.settings/org.eclipse.cdt.core.prefs +++ b/android/.settings/org.eclipse.cdt.core.prefs @@ -1,16 +1,16 @@ eclipse.preferences.version=1 environment/project/com.android.toolchain.gcc.2140973729.1677696028.85809333/NDK_MODULE_PATH/delimiter=; environment/project/com.android.toolchain.gcc.2140973729.1677696028.85809333/NDK_MODULE_PATH/operation=append -environment/project/com.android.toolchain.gcc.2140973729.1677696028.85809333/NDK_MODULE_PATH/value=.;..;..\\native\\ext +environment/project/com.android.toolchain.gcc.2140973729.1677696028.85809333/NDK_MODULE_PATH/value=.;..;..\\ext\\native\\ext environment/project/com.android.toolchain.gcc.2140973729.1677696028.85809333/append=true environment/project/com.android.toolchain.gcc.2140973729.1677696028.85809333/appendContributed=true environment/project/com.android.toolchain.gcc.2140973729.1677696028/NDK_MODULE_PATH/delimiter=; environment/project/com.android.toolchain.gcc.2140973729.1677696028/NDK_MODULE_PATH/operation=append -environment/project/com.android.toolchain.gcc.2140973729.1677696028/NDK_MODULE_PATH/value=.;..;..\\native\\ext +environment/project/com.android.toolchain.gcc.2140973729.1677696028/NDK_MODULE_PATH/value=.;..;..\\ext\\native\\ext environment/project/com.android.toolchain.gcc.2140973729.1677696028/append=true environment/project/com.android.toolchain.gcc.2140973729.1677696028/appendContributed=true environment/project/com.android.toolchain.gcc.2140973729/NDK_MODULE_PATH/delimiter=; environment/project/com.android.toolchain.gcc.2140973729/NDK_MODULE_PATH/operation=append -environment/project/com.android.toolchain.gcc.2140973729/NDK_MODULE_PATH/value=.;..;..\\native\\ext +environment/project/com.android.toolchain.gcc.2140973729/NDK_MODULE_PATH/value=.;..;..\\ext\\native\\ext environment/project/com.android.toolchain.gcc.2140973729/append=true environment/project/com.android.toolchain.gcc.2140973729/appendContributed=true diff --git a/android/ab.cmd b/android/ab.cmd index 3d98d63e7a..8b4617f9d4 100644 --- a/android/ab.cmd +++ b/android/ab.cmd @@ -4,5 +4,5 @@ xcopy ..\assets\shaders assets\shaders /s /y UI/ui_atlas.cpp rm ui_atlas_highmem.cpp ui_atlas_lowmem.cpp ui_atlas.h diff --git a/ext/native/native.vcxproj b/ext/native/native.vcxproj index 7fc789350a..c2de05e385 100644 --- a/ext/native/native.vcxproj +++ b/ext/native/native.vcxproj @@ -82,7 +82,7 @@ Level3 Disabled WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) - ..\dx9sdk\Include;..\zlib;..\ext\zlib;..\native;..\RollerballGL;..\native\ext\glew;..\SDL\include;..\native\ext;%(AdditionalIncludeDirectories); + ..\..\dx9sdk\Include;..\zlib;..\ext\zlib;..\native;..\RollerballGL;..\native\ext\glew;..\SDL\include;..\native\ext;%(AdditionalIncludeDirectories); ProgramDatabase true false @@ -104,7 +104,7 @@ Level3 Disabled WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) - ..\dx9sdk\Include;..\zlib;..\ext\zlib;..\native;..\RollerballGL;..\native\ext\glew;..\SDL\include;..\native\ext;%(AdditionalIncludeDirectories); + ..\..\dx9sdk\Include;..\zlib;..\ext\zlib;..\native;..\RollerballGL;..\native\ext\glew;..\SDL\include;..\native\ext;%(AdditionalIncludeDirectories); true false false @@ -127,7 +127,7 @@ true true WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) - ..\dx9sdk\Include;..\zlib;..\ext\zlib;..\native;..\RollerballGL;..\native\ext\glew;..\SDL\include;..\native\ext;%(AdditionalIncludeDirectories); + ..\..\dx9sdk\Include;..\zlib;..\ext\zlib;..\native;..\RollerballGL;..\native\ext\glew;..\SDL\include;..\native\ext;%(AdditionalIncludeDirectories); StreamingSIMDExtensions2 Fast true @@ -153,7 +153,7 @@ true true WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) - ..\dx9sdk\Include;..\zlib;..\ext\zlib;..\native;..\RollerballGL;..\native\ext\glew;..\SDL\include;..\native\ext;%(AdditionalIncludeDirectories); + ..\..\dx9sdk\Include;..\zlib;..\ext\zlib;..\native;..\RollerballGL;..\native\ext\glew;..\SDL\include;..\native\ext;%(AdditionalIncludeDirectories); NotSet Fast true diff --git a/headless/Headless.vcxproj b/headless/Headless.vcxproj index 8c4e6231cd..31343c9f92 100644 --- a/headless/Headless.vcxproj +++ b/headless/Headless.vcxproj @@ -69,23 +69,23 @@ true - ..\dx9sdk\Include;$(VC_IncludePath);$(WindowsSdk_71A_IncludePath); - ..\dx9sdk\Lib\x86;$(VC_LibraryPath_x86);$(WindowsSdk_71A_LibraryPath_x86); + dx9sdk\Include;$(VC_IncludePath);$(WindowsSdk_71A_IncludePath); + dx9sdk\Lib\x86;$(VC_LibraryPath_x86);$(WindowsSdk_71A_LibraryPath_x86); true - ..\dx9sdk\Include;$(VC_IncludePath);$(WindowsSdk_71A_IncludePath); - ..\dx9sdk\Lib\x64;$(VC_LibraryPath_x64);$(WindowsSdk_71A_LibraryPath_x64); + dx9sdk\Include;$(VC_IncludePath);$(WindowsSdk_71A_IncludePath); + dx9sdk\Lib\x64;$(VC_LibraryPath_x64);$(WindowsSdk_71A_LibraryPath_x64); false - ..\dx9sdk\Include;$(VC_IncludePath);$(WindowsSdk_71A_IncludePath); - ..\dx9sdk\Lib\x86;$(VC_LibraryPath_x86);$(WindowsSdk_71A_LibraryPath_x86); + dx9sdk\Include;$(VC_IncludePath);$(WindowsSdk_71A_IncludePath); + dx9sdk\Lib\x86;$(VC_LibraryPath_x86);$(WindowsSdk_71A_LibraryPath_x86); false - ..\dx9sdk\Include;$(VC_IncludePath);$(WindowsSdk_71A_IncludePath); - ..\dx9sdk\Lib\x64;$(VC_LibraryPath_x64);$(WindowsSdk_71A_LibraryPath_x64); + dx9sdk\Include;$(VC_IncludePath);$(WindowsSdk_71A_IncludePath); + dx9sdk\Lib\x64;$(VC_LibraryPath_x64);$(WindowsSdk_71A_LibraryPath_x64); @@ -93,7 +93,7 @@ Level3 Disabled USING_WIN_UI;GLEW_STATIC;_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_CONSOLE;_UNICODE;UNICODE;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS - ../Common;..;../Core;../native/ext/glew;../native + ../Common;..;../Core;../ext/native/ext/glew;../ext/native Default StreamingSIMDExtensions2 Fast @@ -125,7 +125,7 @@ Level3 Disabled USING_WIN_UI;GLEW_STATIC;_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_CONSOLE;_UNICODE;UNICODE;%(PreprocessorDefinitions) - ../Common;..;../Core;../native/ext/glew;../native + ../Common;..;../Core;../ext/native/ext/glew;../ext/native NotSet Fast false @@ -159,7 +159,7 @@ true true USING_WIN_UI;GLEW_STATIC;_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;_UNICODE;UNICODE;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS - ../Common;..;../Core;../native/ext/glew;../native + ../Common;..;../Core;../ext/native/ext/glew;../ext/native false StreamingSIMDExtensions2 Fast @@ -194,7 +194,7 @@ true true USING_WIN_UI;GLEW_STATIC;_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;_UNICODE;UNICODE;%(PreprocessorDefinitions) - ../Common;..;../Core;../native/ext/glew;../native + ../Common;..;../Core;../ext/native/ext/glew;../ext/native false NotSet Fast @@ -223,7 +223,7 @@ - + @@ -252,7 +252,7 @@ {457f45d2-556f-47bc-a31d-aff0d15beaed} - + {C4DF647E-80EA-4111-A0A8-218B1B711E18} diff --git a/unittest/UnitTests.vcxproj b/unittest/UnitTests.vcxproj index 6995756ccb..7ef73999a1 100644 --- a/unittest/UnitTests.vcxproj +++ b/unittest/UnitTests.vcxproj @@ -69,19 +69,19 @@ true - ..\dx9sdk\Lib\x86;$(VC_LibraryPath_x86);$(WindowsSdk_71A_LibraryPath_x86); + dx9sdk\Lib\x86;$(VC_LibraryPath_x86);$(WindowsSdk_71A_LibraryPath_x86); true - ..\dx9sdk\Lib\x64;$(VC_LibraryPath_x64);$(WindowsSdk_71A_LibraryPath_x64); + dx9sdk\Lib\x64;$(VC_LibraryPath_x64);$(WindowsSdk_71A_LibraryPath_x64); false - ..\dx9sdk\Lib\x86;$(VC_LibraryPath_x86);$(WindowsSdk_71A_LibraryPath_x86); + dx9sdk\Lib\x86;$(VC_LibraryPath_x86);$(WindowsSdk_71A_LibraryPath_x86); false - ..\dx9sdk\Lib\x64;$(VC_LibraryPath_x64);$(WindowsSdk_71A_LibraryPath_x64); + dx9sdk\Lib\x64;$(VC_LibraryPath_x64);$(WindowsSdk_71A_LibraryPath_x64); @@ -90,7 +90,7 @@ Level3 Disabled USING_WIN_UI;GLEW_STATIC;_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_WINDOWS;_UNICODE;UNICODE;%(PreprocessorDefinitions) - ../common;..;../native;../native/ext/glew;../ext/zlib + ../common;..;../ext/native;../ext/native/ext/glew;../ext/zlib true false false @@ -112,7 +112,7 @@ Level3 Disabled USING_WIN_UI;GLEW_STATIC;_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_WINDOWS;_UNICODE;UNICODE;%(PreprocessorDefinitions) - ../common;..;../native;../native/ext/glew;../ext/zlib + ../common;..;../ext/native;../ext/native/ext/glew;../ext/zlib true false false @@ -136,7 +136,7 @@ true true USING_WIN_UI;GLEW_STATIC;_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_WINDOWS;_UNICODE;UNICODE;%(PreprocessorDefinitions) - ../common;..;../native;../native/ext/glew;../ext/zlib + ../common;..;../ext/native;../ext/native/ext/glew;../ext/zlib false Speed true @@ -162,7 +162,7 @@ true true USING_WIN_UI;GLEW_STATIC;_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_WINDOWS;_UNICODE;UNICODE;%(PreprocessorDefinitions) - ../common;..;../native;../native/ext/glew;../ext/zlib + ../common;..;../ext/native;../ext/native/ext/glew;../ext/zlib false true false @@ -179,7 +179,7 @@ - + @@ -203,7 +203,7 @@ {457f45d2-556f-47bc-a31d-aff0d15beaed} - + {c4df647e-80ea-4111-a0a8-218b1b711e18}