Merge pull request #187 from xsacha/master

Unified assets/ dir + Qt project files + Readme
2024-11-27 07:20:49 +00:00 · 2012-12-17 03:21:39 -08:00 · 2012-12-17 03:21:39 -08:00 · 5d11bc7c3c
commit 5d11bc7c3c
parent 8b57b2ec0a 3d53f33679
17 changed files with 760 additions and 24 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -890,9 +890,9 @@ set(NativeAppSource
 	android/jni/GamepadEmu.cpp
 	android/jni/UIShader.cpp
 	android/jni/ui_atlas.cpp)
-set(AndroidAssets
+set(NativeAssets
 	android/assets/ui_atlas.zim
-	android/assets/ppge_atlas.zim)
+	assets/ppge_atlas.zim)
 set(LinkCommon ${CoreLibName} ${CMAKE_THREAD_LIBS_INIT} ${nativeExtraLibs})

 if (TargetBin)
@ -900,6 +900,6 @@ if (TargetBin)
 	target_link_libraries(${TargetBin} ${LinkCommon})
 endif()

-file(INSTALL ${AndroidAssets} DESTINATION assets)
+file(INSTALL ${NativeAssets} DESTINATION assets)

 #include(CPack)
--- a/Qt/Common.pro
+++ b/Qt/Common.pro
@ -0,0 +1,68 @@
+QT += opengl
+QT -= gui
+TARGET = Common
+TEMPLATE = lib
+CONFIG += staticlib
+
+blackberry: {
+	QMAKE_CC = ntoarmv7-gcc
+	QMAKE_CXX = ntoarmv7-g++
+	DEFINES += "_QNX_SOURCE=1" "_C99=1"
+}
+
+SOURCES +=		../Common/ArmABI.cpp \
+				../Common/ArmEmitter.cpp \
+				../Common/ThunkARM.cpp \
+				../Common/Action.cpp \
+				../Common/ColorUtil.cpp \
+				../Common/ConsoleListener.cpp \
+				../Common/Crypto/aes_cbc.cpp \
+				../Common/Crypto/aes_core.cpp \
+				../Common/Crypto/bn.cpp \
+				../Common/Crypto/ec.cpp \
+				../Common/Crypto/md5.cpp \
+				../Common/Crypto/sha1.cpp \
+				../Common/ExtendedTrace.cpp \
+				../Common/FPURoundModeGeneric.cpp \
+				../Common/FileSearch.cpp \
+				../Common/FileUtil.cpp \
+				../Common/Hash.cpp \
+				../Common/IniFile.cpp \
+				../Common/LogManager.cpp \
+				../Common/MemArena.cpp \
+				../Common/MemoryUtil.cpp \
+				../Common/Misc.cpp \
+				../Common/MathUtil.cpp \
+				../Common/MsgHandler.cpp \
+				../Common/StringUtil.cpp \
+				../Common/Thread.cpp \
+				../Common/Timer.cpp \
+				../Common/Version.cpp
+HEADERS +=		../Common/ArmABI.h \
+				../Common/ArmEmitter.h \
+				../Common/Action.h \
+				../Common/ColorUtil.h \
+				../Common/ConsoleListener.h \
+				../Common/Crypto/md5.h \
+				../Common/Crypto/sha1.h \
+				../Common/ExtendedTrace.h \
+				../Common/FileSearch.h \
+				../Common/FileUtil.h \
+				../Common/Hash.h \
+				../Common/IniFile.h \
+				../Common/LogManager.h \
+				../Common/MemArena.h \
+				../Common/MemoryUtil.h \
+				../Common/MathUtil.h \
+				../Common/MsgHandler.h \
+				../Common/StringUtil.h \
+				../Common/Thread.h \
+				../Common/Timer.h
+
+QMAKE_CXXFLAGS += -std=c++0x -Wno-unused-function -Wno-unused-variable -Wno-multichar -Wno-uninitialized -Wno-ignored-qualifiers -Wno-missing-field-initializers -Wno-unused-parameter
+DEFINES += ARM USING_GLES2
+blackberry: DEFINES += BLACKBERRY BLACKBERRY10
+symbian: {
+	QMAKE_CXXFLAGS += -march=armv6 -mfpu=vfp -mfloat-abi=softfp -marm -Wno-parentheses -Wno-comment
+	DEFINES += SYMBIAN
+}
--- a/Qt/Core.pro
+++ b/Qt/Core.pro
@ -0,0 +1,239 @@
+QT += opengl
+QT -= gui
+TARGET = Core
+TEMPLATE = lib
+CONFIG += staticlib
+
+blackberry: {
+	QMAKE_CC = ntoarmv7-gcc
+	QMAKE_CXX = ntoarmv7-g++
+	DEFINES += "_QNX_SOURCE=1" "_C99=1"
+}
+
+INCLUDEPATH += ../native ../Common ../
+
+SOURCES += ../Core/MIPS/ARM/Asm.cpp \ #CoreARM
+			../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/JitCache.cpp \
+			../Core/MIPS/ARM/RegCache.cpp \
+			../Core/CPU.cpp \ # Core
+			../Core/Config.cpp \
+			../Core/Core.cpp \
+			../Core/CoreTiming.cpp \
+			../Core/Debugger/Breakpoints.cpp \
+			../Core/Debugger/SymbolMap.cpp \
+			../Core/Dialog/PSPDialog.cpp \
+			../Core/Dialog/PSPMsgDialog.cpp \
+			../Core/Dialog/PSPOskDialog.cpp \
+			../Core/Dialog/PSPPlaceholderDialog.cpp \
+			../Core/Dialog/PSPSaveDialog.cpp \
+			../Core/Dialog/SavedataParam.cpp \
+			../Core/ELF/ElfReader.cpp \
+			../Core/ELF/PrxDecrypter.cpp \
+			../Core/ELF/ParamSFO.cpp \
+			../Core/FileSystems/BlockDevices.cpp \
+			../Core/FileSystems/DirectoryFileSystem.cpp \
+			../Core/FileSystems/ISOFileSystem.cpp \
+			../Core/FileSystems/MetaFileSystem.cpp \
+			../Core/HLE/HLE.cpp \
+			../Core/HLE/HLETables.cpp \
+			../Core/HLE/__sceAudio.cpp \
+			../Core/HLE/sceAtrac.cpp \
+			../Core/HLE/sceAudio.cpp \
+			../Core/HLE/sceCtrl.cpp \
+			../Core/HLE/sceDisplay.cpp \
+			../Core/HLE/sceDmac.cpp \
+			../Core/HLE/sceGe.cpp \
+			../Core/HLE/sceFont.cpp \
+			../Core/HLE/sceHprm.cpp \
+			../Core/HLE/sceHttp.cpp \
+			../Core/HLE/sceImpose.cpp \
+			../Core/HLE/sceIo.cpp \
+			../Core/HLE/sceKernel.cpp \
+			../Core/HLE/sceKernelAlarm.cpp \
+			../Core/HLE/sceKernelEventFlag.cpp \
+			../Core/HLE/sceKernelInterrupt.cpp \
+			../Core/HLE/sceKernelMbx.cpp \
+			../Core/HLE/sceKernelMemory.cpp \
+			../Core/HLE/sceKernelModule.cpp \
+			../Core/HLE/sceKernelMsgPipe.cpp \
+			../Core/HLE/sceKernelMutex.cpp \
+			../Core/HLE/sceKernelSemaphore.cpp \
+			../Core/HLE/sceKernelThread.cpp \
+			../Core/HLE/sceKernelThread.h \
+			../Core/HLE/sceKernelTime.cpp \
+			../Core/HLE/sceKernelVTimer.cpp \
+			../Core/HLE/sceMpeg.cpp \
+			../Core/HLE/sceNet.cpp \
+			../Core/HLE/sceOpenPSID.cpp \
+			../Core/HLE/sceParseHttp.cpp \
+			../Core/HLE/sceParseUri.cpp \
+			../Core/HLE/scePower.cpp \
+			../Core/HLE/scePsmf.cpp \
+			../Core/HLE/sceRtc.cpp \
+			../Core/HLE/sceSas.cpp \
+			../Core/HLE/sceSsl.cpp \
+			../Core/HLE/scesupPreAcc.cpp \
+			../Core/HLE/sceUmd.cpp \
+			../Core/HLE/sceUtility.cpp \
+			../Core/HLE/sceVaudio.cpp \
+			../Core/HW/MemoryStick.cpp \
+			../Core/Host.cpp \
+			../Core/Loaders.cpp \
+			../Core/MIPS/JitCommon/JitCommon.cpp \
+			../Core/MIPS/MIPS.cpp \
+			../Core/MIPS/MIPSAnalyst.cpp \
+			../Core/MIPS/MIPSCodeUtils.cpp \
+			../Core/MIPS/MIPSDebugInterface.cpp \
+			../Core/MIPS/MIPSDis.cpp \
+			../Core/MIPS/MIPSDisVFPU.cpp \
+			../Core/MIPS/MIPSInt.cpp \
+			../Core/MIPS/MIPSIntVFPU.cpp \
+			../Core/MIPS/MIPSTables.cpp \
+			../Core/MIPS/MIPSVFPUUtils.cpp \
+			../Core/MemMap.cpp \
+			../Core/MemMapFunctions.cpp \
+			../Core/PSPLoaders.cpp \
+			../Core/PSPMixer.cpp \
+			../Core/System.cpp \
+			../Core/Util/BlockAllocator.cpp \
+			../Core/Util/PPGeDraw.cpp \
+			../Core/Util/ppge_atlas.cpp \ # GPU
+			../GPU/GLES/DisplayListInterpreter.cpp \
+			../GPU/GLES/FragmentShaderGenerator.cpp \
+			../GPU/GLES/Framebuffer.cpp \
+			../GPU/GLES/ShaderManager.cpp \
+			../GPU/GLES/StateMapping.cpp \
+			../GPU/GLES/TextureCache.cpp \
+			../GPU/GLES/TransformPipeline.cpp \
+			../GPU/GLES/VertexDecoder.cpp \
+			../GPU/GLES/VertexShaderGenerator.cpp \
+			../GPU/GPUState.cpp \
+			../GPU/Math3D.cpp \
+			../GPU/Null/NullGpu.cpp \ # Kirk
+			../ext/libkirk/AES.c \
+			../ext/libkirk/SHA1.c \
+			../ext/libkirk/bn.c \
+			../ext/libkirk/ec.c \
+			../ext/libkirk/kirk_engine.c
+
+HEADERS += ../Core/MIPS/ARM/Asm.h \
+			../Core/MIPS/ARM/Jit.h \
+			../Core/MIPS/ARM/JitCache.h \
+			../Core/MIPS/ARM/RegCache.h \
+			../Core/CPU.h \
+			../Core/Config.h \
+			../Core/Core.h \
+			../Core/CoreParameter.h \
+			../Core/CoreTiming.h \
+			../Core/Debugger/Breakpoints.h \
+			../Core/Debugger/DebugInterface.h \
+			../Core/Debugger/SymbolMap.h \
+			../Core/Dialog/PSPDialog.h \
+			../Core/Dialog/PSPMsgDialog.h \
+			../Core/Dialog/PSPOskDialog.h \
+			../Core/Dialog/PSPPlaceholderDialog.h \
+			../Core/Dialog/PSPSaveDialog.h \
+			../Core/Dialog/SavedataParam.h \
+			../Core/ELF/ElfReader.h \
+			../Core/ELF/ElfTypes.h \
+			../Core/ELF/PrxDecrypter.h \
+			../Core/ELF/ParamSFO.h \
+			../Core/FileSystems/BlockDevices.h \
+			../Core/FileSystems/DirectoryFileSystem.h \
+			../Core/FileSystems/FileSystem.h \
+			../Core/FileSystems/ISOFileSystem.h \
+			../Core/FileSystems/MetaFileSystem.h \
+			../Core/HLE/FunctionWrappers.h \
+			../Core/HLE/HLE.h \
+			../Core/HLE/HLETables.h \
+			../Core/HLE/__sceAudio.h \
+			../Core/HLE/sceAtrac.h \
+			../Core/HLE/sceAudio.h \
+			../Core/HLE/sceCtrl.h \
+			../Core/HLE/sceDisplay.h \
+			../Core/HLE/sceDmac.h \
+			../Core/HLE/sceGe.h \
+			../Core/HLE/sceFont.h \
+			../Core/HLE/sceHprm.h \
+			../Core/HLE/sceHttp.h \
+			../Core/HLE/sceImpose.h \
+			../Core/HLE/sceIo.h \
+			../Core/HLE/sceKernel.h \
+			../Core/HLE/sceKernelAlarm.h \
+			../Core/HLE/sceKernelEventFlag.h \
+			../Core/HLE/sceKernelInterrupt.h \
+			../Core/HLE/sceKernelMbx.h \
+			../Core/HLE/sceKernelMemory.h \
+			../Core/HLE/sceKernelModule.h \
+			../Core/HLE/sceKernelMsgPipe.h \
+			../Core/HLE/sceKernelMutex.h \
+			../Core/HLE/sceKernelSemaphore.h \
+			../Core/HLE/sceMpeg.h \
+			../Core/HLE/sceNet.h \
+			../Core/HLE/sceOpenPSID.h \
+			../Core/HLE/sceParseHttp.h \
+			../Core/HLE/sceParseUri.h \
+			../Core/HLE/scePower.h \
+			../Core/HLE/scePsmf.h \
+			../Core/HLE/sceRtc.h \
+			../Core/HLE/sceSas.h \
+			../Core/HLE/sceSsl.h \
+			../Core/HLE/scesupPreAcc.h \
+			../Core/HLE/sceUmd.h \
+			../Core/HLE/sceUtility.h \
+			../Core/HLE/sceVaudio.h \
+			../Core/HW/MemoryStick.h \
+			../Core/Host.h \
+			../Core/Loaders.h \
+			../Core/MIPS/JitCommon/JitCommon.h \
+			../Core/MIPS/MIPS.h \
+			../Core/MIPS/MIPSAnalyst.h \
+			../Core/HLE/sceKernelTime.h \
+			../Core/HLE/sceKernelVTimer.h \
+			../Core/MIPS/MIPSCodeUtils.h \
+			../Core/MIPS/MIPSDebugInterface.h \
+			../Core/MIPS/MIPSDis.h \
+			../Core/MIPS/MIPSDisVFPU.h \
+			../Core/MIPS/MIPSInt.h \
+			../Core/MIPS/MIPSIntVFPU.h \
+			../Core/MIPS/MIPSTables.h \
+			../Core/MIPS/MIPSVFPUUtils.h \
+			../Core/MemMap.h \
+			../Core/PSPLoaders.h \
+			../Core/PSPMixer.h \
+			../Core/System.h \
+			../Core/Util/BlockAllocator.h \
+			../Core/Util/PPGeDraw.h \
+			../Core/Util/Pool.h \
+			../Core/Util/ppge_atlas.h \
+			../GPU/GLES/DisplayListInterpreter.h \
+			../GPU/GLES/FragmentShaderGenerator.h \
+			../GPU/GLES/Framebuffer.h \
+			../GPU/GLES/ShaderManager.h \
+			../GPU/GLES/StateMapping.h \
+			../GPU/GLES/TextureCache.h \
+			../GPU/GLES/TransformPipeline.h \
+			../GPU/GLES/VertexDecoder.h \
+			../GPU/GLES/VertexShaderGenerator.h \
+			../GPU/GPUInterface.h \
+			../GPU/GPUState.h \
+			../GPU/Math3D.h \
+			../GPU/Null/NullGpu.h \
+			../GPU/ge_constants.h \
+			../ext/libkirk/AES.h \
+			../ext/libkirk/SHA1.h \
+			../ext/libkirk/kirk_engine.h
+
+QMAKE_CXXFLAGS += -std=c++0x -Wno-unused-function -Wno-unused-variable -Wno-multichar -Wno-uninitialized -Wno-ignored-qualifiers -Wno-missing-field-initializers -Wno-unused-parameter
+DEFINES += ARM USING_GLES2
+blackberry: DEFINES += BLACKBERRY BLACKBERRY10
+symbian: {
+	QMAKE_CXXFLAGS += -march=armv6 -mfpu=vfp -mfloat-abi=softfp -marm -Wno-parentheses -Wno-comment
+	DEFINES += SYMBIAN
+}
--- a/Qt/Native.pro
+++ b/Qt/Native.pro
@ -0,0 +1,194 @@
+QT += opengl
+QT -= gui
+TARGET = Native
+TEMPLATE = lib
+CONFIG += staticlib
+
+blackberry: {
+	QMAKE_CC = ntoarmv7-gcc
+	QMAKE_CXX = ntoarmv7-g++
+	DEFINES += "_QNX_SOURCE=1" "_C99=1"
+}
+
+# EtcPack
+
+SOURCES += ../native/ext/etcpack/etcdec.cpp \
+			../native/ext/etcpack/etcpack.cpp \
+			../native/ext/etcpack/image.cpp
+HEADERS += ../native/ext/etcpack/etcdec.h \
+			../native/ext/etcpack/etcpack.h \
+			../native/ext/etcpack/image.h
+INCLUDEPATH += ../native/ext/etcpack
+
+# Stb_image
+
+SOURCES += ../native/ext/stb_image/stb_image.c
+HEADERS += ../native/ext/stb_image/stb_image.h
+INCLUDEPATH += ../native/ext/stb_image
+
+# Stb_vorbis
+
+SOURCES += ../native/ext/stb_vorbis/stb_vorbis.c
+HEADERS += ../native/ext/stb_vorbis/stb_vorbis.h
+INCLUDEPATH += ../native/ext/stb_vorbis
+
+!symbian: {
+# Zlib
+
+SOURCES +=  ../ext/zlib/adler32.c \
+	../ext/zlib/compress.c \
+	../ext/zlib/crc32.c \
+	../ext/zlib/deflate.c \
+	../ext/zlib/gzclose.c \
+	../ext/zlib/gzlib.c \
+	../ext/zlib/gzread.c \
+	../ext/zlib/gzwrite.c \
+	../ext/zlib/infback.c \
+	../ext/zlib/inffast.c \
+	../ext/zlib/inflate.c \
+	../ext/zlib/inflate.h \
+	../ext/zlib/inftrees.c \
+	../ext/zlib/trees.c \
+	../ext/zlib/uncompr.c \
+	../ext/zlib/zutil.c
+HEADERS += ../ext/zlib/crc32.h \
+	../ext/zlib/deflate.h \
+	../ext/zlib/gzguts.h \
+	../ext/zlib/inffast.h \
+	../ext/zlib/inffixed.h \
+	../ext/zlib/inftrees.h \
+	../ext/zlib/trees.h \
+	../ext/zlib/zconf.h \
+	../ext/zlib/zlib.h \
+	../ext/zlib/zutil.h
+INCLUDEPATH += ../ext/zlib
+}
+
+
+# Native
+
+SOURCES +=  ../native/audio/mixer.cpp \
+			../native/audio/wav_read.cpp \
+			../native/base/buffer.cpp \
+			../native/base/colorutil.cpp \
+			../native/base/display.cpp \
+			../native/base/error_context.cpp \
+			../native/base/fastlist_test.cpp \
+			../native/base/stringutil.cpp \
+			 ../native/base/threadutil.cpp \
+			 ../native/base/timeutil.cpp \
+			 ../native/file/chunk_file.cpp \
+			 ../native/file/dialog.cpp \
+			 ../native/file/easy_file.cpp \
+			 ../native/file/fd_util.cpp \
+			 ../native/file/file_util.cpp \
+			 ../native/file/zip_read.cpp \
+			 ../native/gfx/gl_debug_log.cpp \
+			 ../native/gfx/gl_lost_manager.cpp \
+			 ../native/gfx/texture.cpp \
+			 ../native/gfx/texture_atlas.cpp \
+			 ../native/gfx/texture_gen.cpp \
+			 ../native/gfx_es2/draw_buffer.cpp \
+			 ../native/gfx_es2/fbo.cpp \
+			 ../native/gfx_es2/gl_state.cpp \
+			 ../native/gfx_es2/glsl_program.cpp \
+			 ../native/gfx_es2/vertex_format.cpp \
+			 ../native/image/png_load.cpp \
+			 ../native/image/zim_load.cpp \
+			 ../native/image/zim_save.cpp \
+			 ../native/input/gesture_detector.cpp \
+			 ../native/json/json_writer.cpp \
+			 ../native/math/curves.cpp \
+			 ../native/math/lin/aabb.cpp \
+			 ../native/math/lin/matrix4x4.cpp \
+			 ../native/math/lin/plane.cpp \
+			 ../native/math/lin/quat.cpp \
+			 ../native/math/lin/vec3.cpp \
+			 ../native/math/math_util.cpp \
+			 ../native/midi/midi_input.cpp \
+			 ../native/net/http_client.cpp \
+			 ../native/net/resolve.cpp \
+			 ../native/profiler/profiler.cpp \
+			 ../native/ui/screen.cpp \
+			 ../native/ui/ui.cpp \
+			 ../native/ui/virtual_input.cpp \
+			 ../native/util/bits/bits.cpp \
+			 ../native/util/bits/varint.cpp \
+			 ../native/util/hash/hash.cpp \
+			 ../native/util/random/perlin.cpp
+
+HEADERS +=  ../native/audio/mixer.h \
+			../native/audio/wav_read.h \
+			../native/base/basictypes.h \
+			../native/base/buffer.h \
+			../native/base/color.h \
+			../native/base/colorutil.h \
+			../native/base/display.h \
+			../native/base/error_context.h \
+			../native/base/fastlist.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.h \
+			 ../native/base/threadutil.h \
+			 ../native/base/timeutil.h \
+			 ../native/file/chunk_file.h \
+			 ../native/file/dialog.h \
+			 ../native/file/easy_file.h \
+			 ../native/file/fd_util.h \
+			 ../native/file/file_util.h \
+			 ../native/file/vfs.h \
+			 ../native/file/zip_read.h \
+			 ../native/gfx/gl_debug_log.h \
+			 ../native/gfx/gl_lost_manager.h \
+			 ../native/gfx/texture.h \
+			 ../native/gfx/texture_atlas.h \
+			 ../native/gfx/texture_gen.h \
+			 ../native/gfx_es2/fbo.h \
+			 ../native/gfx_es2/gl_state.h \
+			 ../native/gfx_es2/glsl_program.h \
+			 ../native/gfx_es2/vertex_format.h \
+			 ../native/gfx_es2/draw_buffer.h \
+			 ../native/image/png_load.h \
+			 ../native/image/zim_load.h \
+			 ../native/image/zim_save.h \
+			 ../native/input/gesture_detector.h \
+			 ../native/input/input_state.h \
+			 ../native/json/json_writer.h \
+			 ../native/math/compression.h \
+			 ../native/math/curves.h \
+			 ../native/math/lin/aabb.h \
+			 ../native/math/lin/matrix4x4.h \
+			 ../native/math/lin/plane.h \
+			 ../native/math/lin/quat.h \
+			 ../native/math/lin/ray.h \
+			 ../native/math/lin/vec3.h \
+			 ../native/math/math_util.h \
+			 ../native/midi/midi_input.h \
+			 ../native/net/http_client.h \
+			 ../native/net/resolve.h \
+			 ../native/ui/ui.h \
+			 ../native/profiler/profiler.h \
+			 ../native/ui/screen.h \
+			 ../native/ui/virtual_input.h \
+			 ../native/util/bits/bits.h \
+			 ../native/util/bits/hamming.h \
+			 ../native/util/bits/varint.h \
+			 ../native/util/hash/hash.h \
+			 ../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
+INCLUDEPATH+= ../native
+
+QMAKE_CXXFLAGS += -std=c++0x -Wno-unused-function -Wno-unused-variable -Wno-multichar -Wno-uninitialized -Wno-ignored-qualifiers -Wno-missing-field-initializers -Wno-unused-parameter
+DEFINES += ARM USING_GLES2
+blackberry: DEFINES += BLACKBERRY BLACKBERRY10
+symbian: {
+		QMAKE_CXXFLAGS += -march=armv6 -mfpu=vfp -mfloat-abi=softfp -marm -Wno-parentheses -Wno-comment
+		DEFINES += SYMBIAN
+}
--- a/Qt/PPSSPP.pro
+++ b/Qt/PPSSPP.pro
@ -0,0 +1,49 @@
+TARGET = PPSSPPQt
+QT += core gui opengl multimedia
+
+symbian: {
+	LIBS += -lCore.lib -lCommon.lib -lNative.lib -lcone -leikcore -lavkon -lezlib
+	CONFIG += 4.6.3
+}
+# They try to force QCC with all mkspecs
+# QCC is 4.4.1, we need 4.6.3
+blackberry: {
+	QMAKE_CC = ntoarmv7-gcc
+	QMAKE_CXX = ntoarmv7-g++
+	DEFINES += "_QNX_SOURCE=1" "_C99=1"
+	LIBS += -L. -lCore -lCommon -lNative -lscreen -lsocket -lstdc++
+}
+
+# Main
+SOURCES += ../native/base/QtMain.cpp
+HEADERS += ../native/base/QtMain.h
+
+# Native
+
+SOURCES += ../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
+
+INCLUDEPATH += .. ../Common ../native
+
+QMAKE_CXXFLAGS += -std=c++0x -Wno-unused-function -Wno-unused-variable -Wno-multichar -Wno-uninitialized -Wno-ignored-qualifiers -Wno-missing-field-initializers -Wno-unused-parameter
+DEFINES += ARM USING_GLES2
+blackberry: DEFINES += BLACKBERRY BLACKBERRY10
+symbian: {
+	QMAKE_CXXFLAGS += -march=armv6 -mfpu=vfp -mfloat-abi=softfp -marm -Wno-parentheses -Wno-comment
+	DEFINES += SYMBIAN
+
+	vendorinfo = "%{\"Qtness\"}" ":\"Qtness\""
+	packageheader = "$${LITERAL_HASH}{\"PPSSPP\"}, (0xE0095B1D), 0, 0, 4, TYPE=SA"
+	my_deployment.pkg_prerules = packageheader vendorinfo
+	assets.sources = ../android/assets/ui_atlas.zim ../android/assets/ppge_atlas.zim
+	assets.path = E:/PPSSPP
+	DEPLOYMENT += my_deployment assets
+        ICON = ../assets/icon.svg
+# 268MB maximum
+	TARGET.EPOCHEAPSIZE = 0x40000 0x10000000
+	TARGET.EPOCSTACKSIZE = 0x10000
+}
--- a/Qt/PPSSPPQt.pro
+++ b/Qt/PPSSPPQt.pro
@ -0,0 +1,3 @@
+TEMPLATE = subdirs
+SUBDIRS = Native.pro Core.pro Common.pro PPSSPP.pro
+PPSSPP.depends = Native.pro Core.pro Common.pro
--- a/README.md
+++ b/README.md
@ -87,17 +87,15 @@ Introduce a meaningless change to a random .java file such as a whitespace
 to get Eclipse to rebuild the project.

 Also note that the `Visual Studio` generators aren't compatible with compilers
-other than microsoft's, but `NMake Makefiles` works fine.
-
-[ppsspp-repo]: <https://github.com/hrydgard/ppsspp>
-    "https://github.com/hrydgard/ppsspp"
-[ppsspp-devel]: <http://www.ppsspp.org/development.html>
-    "http://www.ppsspp.org/development.html"
+other than Microsoft's, but `NMake Makefiles` works fine.

 Building for Blackberry
 -----------------------

-To build for Blackberry, you must first have the latest Native SDK installed from developer.blackberry.com/native and have compiled the SDL port available from github.com/blackberry/SDL to your NDK workspace. Then checkout the latest version of PPSSPP to your NDK workspace.
+To build for Blackberry, you must first have the latest Native SDK installed
+from developer.blackberry.com/native and have compiled the SDL port available
+from github.com/blackberry/SDL to your NDK workspace. Then checkout the latest
+version of PPSSPP to your NDK workspace.

 To set up your environment for cross-compiling you must then use:
    source ~/bbndk/bbndk-env.sh
@ -105,6 +103,22 @@ To set up your environment for cross-compiling you must then use:
 Finally, you are ready to compile. Change directory to ppsspp/SDL and run:
    ./blackberry_build.sh

-If you are on Windows, you will need GNU tools and CMake to run the bash script.
+If you are on Windows, you will need GNU and CMake to run the bash script.

-Currently SDL is required for sound output. EGL is used for the GLES2 interface, which is identical to the Android one. There are plans to move to a Qt interface and a different sound library (such as asound) in future.
+Alternatively, you can use the Qt UI by compiling the PPSSPPQt.pro in the Qt/
+directory with qmake from the NDK or QtCreator 2.6+.
+
+Building for Symbian
+--------------------
+
+To build for Symbian, you require:
+1) GCC 4.6.3 from Mentor Graphics: http://www.mentor.com/embedded-software/sourcery-tools/sourcery-codebench/editions/lite-edition/
+2) Symbian Qt libraries. You can find these in the final Nokia Qt SDK.
+
+Then simply compile the PPSSPPQt.pro with qmake from the SDK or QtCreator 2.6+.
+
+
+[ppsspp-repo]: <https://github.com/hrydgard/ppsspp>
+    "https://github.com/hrydgard/ppsspp"
+[ppsspp-devel]: <http://www.ppsspp.org/development.html>
+    "http://www.ppsspp.org/development.html"
--- a/SDL/bar-descriptor.xml
+++ b/SDL/bar-descriptor.xml
@ -18,7 +18,7 @@
    </initialWindow>

    <asset path="PPSSPPBlackberry" entry="true" type="Qnx/Elf">PPSSPPBlackberry</asset>
-    <asset path="icon-114.png">icon-114.png</asset>
+    <asset path="../assets/icon-114.png">icon-114.png</asset>
    <asset path="../android/assets">assets</asset>
    
    <category>core.games</category>
--- a/SDL/buildassets.sh
+++ b/SDL/buildassets.sh
@ -1,2 +1,2 @@
 cp -r ../android/assets .
-cp ../ppge_atlas.zim assets
+cp ../assets/ppge_atlas.zim assets
--- a/android/buildassets.sh
+++ b/android/buildassets.sh
@ -1,6 +1,6 @@
 mkdir -p assets
 ./buildatlas.sh
-cp ../ppge_atlas.zim assets
+cp ../assets/ppge_atlas.zim assets
 #cp -r source_assets/songs assets
 #cp -r source_assets/samples assets
 #cp -r ../shaders assets
--- a/assets/build_ppgeatlas.sh
+++ b/assets/build_ppgeatlas.sh
@ -0,0 +1 @@
+../native/tools/build/atlastool ppge_atlasscript.txt ppge && mv ppge_atlas.cpp ppge_atlas.h ../Core/Util
--- a/assets/icon-114.png
+++ b/assets/icon-114.png
--- a/assets/icon.svg
+++ b/assets/icon.svg
@ -0,0 +1,169 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg"
+xmlns:xlink="http://www.w3.org/1999/xlink"
+contentScriptType="text/ecmascript" zoomAndPan="magnify"
+baseProfile="tiny" contentStyleType="text/css"
+version="1.0" width="96" preserveAspectRatio="xMidYMid meet"
+viewBox="0 0 96 96" height="96"
+fill-rule="evenodd">
+
+<g><metadata/><g>
+
+<image x="-48" y="-48" transform="matrix(1 0 0 1
+48 48)" width="96" xlink:href="data:image/png;base64, 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" xlink:type="simple"
+xlink:actuate="onLoad" height="96" preserveAspectRatio="xMidYMid
+meet" xlink:show="embed"/>
+
+</g></g></svg>
--- a/assets/ppge_atlas.zim
+++ b/assets/ppge_atlas.zim
--- a/assets/ppge_atlasscript.txt
+++ b/assets/ppge_atlasscript.txt
@ -0,0 +1,8 @@
+256
+font UBUNTU24 ../android/source_assets/font/zrnic.ttf 30
+image I_CROSS ../android/source_assets/image/cross.png copy
+image I_CIRCLE ../android/source_assets/image/circle.png copy
+image I_SQUARE ../android/source_assets/image/square.png copy
+image I_TRIANGLE ../android/source_assets/image/triangle.png copy
+image I_BUTTON ../android/source_assets/image/button.png copy
+image I_LOGO ../android/res/drawable-mdpi/ic_launcher.png copy
--- a/build_ppgeatlas.sh
+++ b/build_ppgeatlas.sh
@ -1 +0,0 @@
-native/tools/build/atlastool ppge_atlasscript.txt ppge && mv ppge_atlas.cpp ppge_atlas.h Core/Util
--- a/ppge_atlasscript.txt
+++ b/ppge_atlasscript.txt
@ -1,8 +0,0 @@
-256
-font UBUNTU24 android/source_assets/font/zrnic.ttf 30
-image I_CROSS android/source_assets/image/cross.png copy
-image I_CIRCLE android/source_assets/image/circle.png copy
-image I_SQUARE android/source_assets/image/square.png copy
-image I_TRIANGLE android/source_assets/image/triangle.png copy
-image I_BUTTON android/source_assets/image/button.png copy
-image I_LOGO android/res/drawable-mdpi/ic_launcher.png copy
				`@ -0,0 +1 @@`
				`../native/tools/build/atlastool ppge_atlasscript.txt ppge && mv ppge_atlas.cpp ppge_atlas.h ../Core/Util`
				`@ -1 +0,0 @@`
				`native/tools/build/atlastool ppge_atlasscript.txt ppge && mv ppge_atlas.cpp ppge_atlas.h Core/Util`