Commit Graph
162 Commits
Author SHA1 Message Date
sergiobenrocha2 18f452ff29 Ops fix this. 2015-09-16 01:59:22 -03:00
sergiobenrocha2 86051a8f3c Less derp :) 2015-09-16 01:06:56 -03:00
sergiobenrocha2 5ec87f3459 Improve detection of for shared libs in both sdl and Qt (zlib, libzip, snappy and glew). 2015-09-16 00:59:31 -03:00
Unknown W. Brackets 85533dad6e Native merge part 2: update build files.
And a couple minor stragglers.
2015-09-06 13:06:57 -07:00
Jan Beich d408d61137 build/qmake: allow downstream to override linguisttools path 2015-05-26 15:20:11 +03:00
Gabriel 3859b4713a Pass -D SDL when SDL is used
Update the Qt build to use the same define
so that common files can use it.
2014-12-19 00:06:39 +01:00
sergiobenrocha2 a18344e15b Fix Qt build in Linux, problem to recognize SDL2. 2014-10-10 01:28:35 -03:00
Sacha 3e42aae5b0 Fix Symbian build in Travis.
Add a 'no_assets' option to Qt that allows building without pre-compiled assets inside the binary.
GCC has issues with high memory usage when compiling the assets file, so this is used as a workaround for Travis.
2014-08-18 02:00:22 +10:00
Sacha 404766ce33 Qt: Change target name to ppsspp by default.Install icons and desktop file on Linux. Use a different builddir than SDL by default.
Should help distros packaging ppsspp. Note: if you currently use PPSSPPQt, you will need to move the config dir from PPSSPPQt to ppsspp.
For distro packagers, you can now use PREFIX and DESTDIR for installs.
2014-08-05 17:57:17 +10:00
Sacha e48f812584 Make sure OSX compiles out of the box. 2014-07-25 14:41:52 +10:00
Sacha 45263fdc0f Fix up a few minor issues. Spacing/tabs/names 2014-07-25 03:59:51 +10:00
Sacha 1fc526d40f Combine the low and highmem atlas in to one. Add this to the buildatlas script (it's just a diff).
Used USING_QT_UI but technically win32_ui should use this too?
2014-07-25 03:50:58 +10:00
Sacha 7745ba264a Sailfish: define override since it is stuck on gcc 4.6.4. Compiles now. 2014-07-25 01:55:20 +10:00
Sacha 6ce3765b12 Sailfish: More compatibility with SailFish OS. It also needs stddef where Maemo does.
Set packaging by default for iOS with b.sh.
2014-07-24 23:20:09 +10:00
Sacha 2c2345c509 Qt: Use 'systeminfo' in Qt5 to disable screensaver. 2014-07-22 16:04:24 +10:00
Sacha cd20288d99 Fix some compiler warnings. 2014-07-17 00:49:58 +10:00
Sacha 45de6f5baf Qt: Buildfix ffmpeg search 2014-07-09 05:22:56 +10:00
Sacha d1fffede2c Qt: Modularise the settings file in to platforms with Arch / OS detection. 2014-07-08 17:15:28 +10:00
Sacha 5c6ccfe56d Qt: Drop QtMultimedia dependency if SDL is used. Force OSX10.9 SDK. Should fix #5835 2014-07-01 17:16:13 +10:00
Sacha d2f43889a0 Android: Fixes for CMake and Qt. 2014-06-28 02:50:24 +10:00
Sacha 5215d12385 Qt: Let Qt decide directories in Qt5. Require OSX use Qt5. Fix config directory. Fixes #5409. 2014-06-25 16:10:00 +10:00
Sacha 92db2c89c1 Qt: Fix some qmake replace commands that work differently on different versions of qmake. Use SDL Audio when available. Fix a bug. Qt4+Qt5 tested working perfectly on Arch Linux. 2014-06-25 13:25:05 +10:00
Sacha 946deda4b3 Remove some redundancy (Symbian/Qt). Symbian has cstdint now. 2014-06-24 08:29:04 +10:00
Sacha e2664c7ec2 Qt: The .desktop version isn't related to app version.
App uses VERSION from Settings.pri instead.
Also, Qt version checker didn't work in Qt3 anyway so no need for this check.
Update outdated comments in PPSSPP.pro.
2014-06-24 00:11:31 +10:00
Henrik Rydgård b2ae317560 Merge pull request #6393 from hrydgard/menu-audio
Play the game's SND0.AT3 when a game is selected in the menu and on the "game screen".
2014-06-22 19:35:16 +02:00
Sacha 6e5d7ed455 Qt: Fix up lrelease path when outside of qtdir and version string for Symbian. 2014-06-23 01:59:42 +10:00
Henrik Rydgard cefc0bc96f Play the game's SND0.AT3 when a game is selected in the menu and on the "game screen". 2014-06-22 17:02:04 +02:00
Sacha 46abce78c0 Qt: Use inbuilt png handler instead of building libpng. Resolves a conflict with QWidget and QPainter in desktop menus. 2014-06-18 15:37:12 +10:00
Sacha f92a842a34 Qt: Move debugger files to a new dir. 2014-06-18 15:37:12 +10:00
Sacha 73aa17a2de Misc fixes. CMake: Don't compile neon on armv6 (rpi). Qt: Correct path for lrelease. SDL: Fix a warning. 2014-06-18 03:28:33 +10:00
Sacha 5876823478 Qt: Icons on more platforms. Fix for lrelease suffix (qt4/qt5). Fixes #6327 2014-06-18 00:34:11 +10:00
Sacha 53642d3cc4 Qt: Optimisations for ARM desktop/tablet hosts. 2014-06-17 14:23:36 +10:00
Sacha f11e2aaf69 Qt: Split GPU from Core to fix Debugger conflict. 2014-06-15 03:43:52 +10:00
Sacha 89fde3bc7c Typo 2014-06-12 03:20:17 +10:00
Sacha e65798014a Qt: Allow Mac OSX to use SDL Joysticks as well. Fixes #6284 2014-06-12 02:19:53 +10:00
Sacha b57c3e0fe5 Qt: Some bug fixes. Get Meego Harmattan compiling with gcc4.8.2 2014-06-06 14:17:47 +10:00
Sacha d50f08fb6e Fix Symbian debug build. 2014-06-05 18:15:24 +10:00
xsacha 818f898d5a Maemo/Meego buildfix. Compiles but requires arm ffmpeg. 2014-06-05 05:01:01 +10:00
Sacha 1378b891dc Qt .pro cleanup. Use armv7 on Android. 2014-06-03 17:30:37 +10:00
Sacha 438b219eb2 Qt: Support Android armv6. Compiles and runs fine with gcc4.8. Creates 16MB APK but less than 10MB with Ministro. 2014-06-03 09:27:30 +10:00
Sacha fd034b25cf Qt Mac: Fix #5835 (update lib for new ffmpeg) 2014-05-28 02:16:53 +10:00
Sacha ed4f5054c6 Qt: Clean up QtHost. 2014-03-02 01:09:38 +10:00
Henrik Rydgård 5d4ac24858 Merge pull request #5000 from amirzaim/patch-6
Qt Linux buildfix for Qt 5.2.0
2014-01-09 04:33:29 -08:00
Sacha bb864bdb9a Fix Qt for Maemo 2014-01-05 10:54:05 +10:00
Amir Zaim Mohd Zaini 33f26a68c2 Qt buildfix for Qt 5.2.0
adding the -lz in line "LIBS" in Linux section to fix compilation error when compiling under Qt version 5.2.0. See issue #4885
2014-01-04 16:43:37 +08:00
Sacha ec3815e4f1 Qt: Add Maemo compatibility. Hopefully an alternative to EGL/SDL frontend. 2014-01-02 16:16:13 +10:00
Henrik Rydgård b0bfda6333 Merge pull request #4515 from bollu/improvedTilControls
Redid the tilt controls in a nicer way
2013-12-22 02:13:28 -08:00
Henrik Rydgard 83534c0490 Linux build fixes. See #4880 2013-12-19 01:03:22 +01:00
bollu 094bc01848 fixed Qt build 2013-12-16 08:15:18 +05:30
Sacha 2387509896 Proper fix for libpng16 includes.
Improve Blackberry CMake toolchain.
2013-12-10 02:14:56 +10:00