Commit Graph

38371 Commits

Author SHA1 Message Date
Kovensky
bb47195ca3 Add build*/ dirs to gitignore 2012-11-21 19:04:23 -03:00
Kovensky
6eb81490b8 Update the README 2012-11-21 19:04:13 -03:00
Henrik Rydgård
e1c91b375c Merge pull request #73 from Kovensky/cmake
CMake-based build system
2012-11-21 11:17:02 -08:00
Kovensky
1654eb7f8d Update bar-descriptor.xml and blackberry_package.sh
The binary that the cmake script produces is PPSSPPBlackberry,
not ppsspp like the old system.
2012-11-21 14:59:50 -03:00
Kovensky
d04a1cadca CMake-based build system.
Tested on Windows with NMake Makefiles and Visual Studio 11 targets.
Tested on Linux with GNU Makefiles target, using GCC as the compiler.
Tested on FreeBSD using clang as the compiler.
Tested for Android on Windows with NMake Makefiles and r8c NDK.

Proxy-tested by xsacha for blackberry.

The android build requires that the android/android.toolchain.cmake
toolchain file is used; an error will be raised if ANDROID is defined
without loading the toolchain file.

When targeting ANDROID, the resulting .so files will be placed in
"android/libs/$ANDROID_ABI" even when building out of tree, since it's
where `ant` expects to find them.

Since the Core library is expected to be named 'ppsspp_jni' on ANDROID,
we also put its name in a variable that is set to 'Core' unless building
on ANDROID, where it is 'ppsspp_jni'.
2012-11-21 14:59:45 -03:00
Diogo Franco (Kovensky)
2936c334b5 Add android.toolchain.cmake from http://code.google.com/p/android-cmake
ANDROID_DEFAULT_NDK_API_LEVEL was changed to 9, otherwise the file
is unchanged.
2012-11-21 14:35:18 -03:00
Kovensky
096eae01b2 Update native submodule 2012-11-21 14:35:18 -03:00
Diogo Franco (Kovensky)
6108e36ae9 Several fixes to build under stricter C++11
Add missing #include to various files.

strings.h isn't provided by MSVC so we don't include it there; it's needed
for other OSes/compilers.

Get rid of pre-ISO-C malloc.h includes; malloc is provided by stdlib.h.

Fixes some linuxisms.

Prepend __builtin_ to __clear_cache, calling it without the prefix is a
GNU extension.
2012-11-21 14:33:50 -03:00
Diogo Franco (Kovensky)
cd93e49584 Move toplevel windows-specific files to the Windows dir 2012-11-21 14:33:38 -03:00
Henrik Rydgård
547945d6ce Merge pull request #71 from xsacha/master
Blackberry 10 port
2012-11-21 09:10:24 -08:00
Henrik Rydgård
42fcb79e87 Merge pull request #13 from Kovensky/header_fix
sys/time.h is only included on non-windows
2012-11-21 09:09:17 -08:00
Diogo Franco (Kovensky)
5e3686f92e sys/time.h is only included on non-windows 2012-11-21 17:05:46 +00:00
Henrik Rydgård
aa82ba285f Merge pull request #72 from unknownbrackets/mutexes
Darn, buildfix for debug.
2012-11-21 08:13:59 -08:00
Henrik Rydgård
188c0c1a2f Merge pull request #11 from xsacha/master
Blackberry 10 port [Updated]
2012-11-21 08:01:53 -08:00
Henrik Rydgård
5140c1ba02 Merge pull request #12 from Kovensky/header_fix
Add missing sys/time.h include to fd_util.cpp
2012-11-21 08:01:20 -08:00
Sacha
d968675273 Defines only set for devices using GLES2. Add a missing include for QNX/BSD. 2012-11-22 01:55:04 +10:00
Unknown W. Brackets
1bf04790e9 Darn, buildfix for debug. 2012-11-21 07:28:54 -08:00
Kovensky
9a17f3626c Add missing sys/time.h include to fd_util.cpp 2012-11-21 11:46:26 -03:00
Sacha
0bed6a94f0 Remove redundant Blackberry code in FBO and Main 2012-11-21 23:08:14 +10:00
Sacha
d914c394ae Version update for Blackberry 2012-11-21 23:04:21 +10:00
Henrik Rydgård
3934876908 Merge pull request #70 from unknownbrackets/mutexes
Mutexes
2012-11-21 01:48:44 -08:00
Unknown W. Brackets
879efb25cc Don't allow unlocking someone else's mutex. 2012-11-21 00:28:29 -08:00
Unknown W. Brackets
fa9b9840d0 Implement LwMutex locking and unlocking. 2012-11-21 00:21:25 -08:00
Unknown W. Brackets
db16f9309e Don't crash if something goes wrong with mutexes.
Probably can't happen but being defensive is good.
2012-11-20 22:57:14 -08:00
Henrik Rydgard
237c19be9d Activate some more tests 2012-11-20 22:41:24 +01:00