Mirror/ppsspp
1
0 Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2026-10-01 14:58:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Qt: Allow building with system ffmpeg. Also update b.sh to set cmake and qmake flags in case --qt is at the end of the arguments.

Browse Source
This commit is contained in:
Sacha committed 2014-08-05 17:00:16 +10:00
1 parent ee9eb00656
commit b7982729b0
2 files changed
+9 -14
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Qt/Settings.pri
+2 -4
View File
@@ -19,13 +19,11 @@ include(Platform/ArchDetection.pri)
# Work out platform name
include(Platform/OSDetection.pri)
# OS dependent paths
INCLUDEPATH += $$P/ffmpeg/$${PLATFORM_NAME}/$${PLATFORM_ARCH}/include
!system_ffmpeg: INCLUDEPATH += $$P/ffmpeg/$${PLATFORM_NAME}/$${PLATFORM_ARCH}/include
!contains(CONFIG, staticlib) {
QMAKE_LIBDIR += $$CONFIG_DIR $$P/ffmpeg/$${PLATFORM_NAME}/$${PLATFORM_ARCH}/lib/
g++: LIBS += -Wl,-Bstatic
!system_ffmpeg: QMAKE_LIBDIR += $$CONFIG_DIR $$P/ffmpeg/$${PLATFORM_NAME}/$${PLATFORM_ARCH}/lib/
contains(DEFINES, USE_FFMPEG): LIBS+= -lavformat -lavcodec -lavutil -lswresample -lswscale
g++: LIBS += -Wl,-Bdynamic
equals(PLATFORM_NAME, "linux"):arm|android: LIBS += -lEGL
}
b.sh
+7 -10
View File
@@ -37,18 +37,15 @@ do
CMAKE_ARGS="-DSIMULATOR=ON ${CMAKE_ARGS}"
;;
--release)
if [ "$CMAKE" == "1" ]; then
CMAKE_ARGS="-DCMAKE_BUILD_TYPE=Release ${CMAKE_ARGS}"
else
QMAKE_ARGS="CONFIG+=release ${QMAKE_ARGS}"
fi
CMAKE_ARGS="-DCMAKE_BUILD_TYPE=Release ${CMAKE_ARGS}"
QMAKE_ARGS="CONFIG+=release ${QMAKE_ARGS}"
;;
--debug)
if [ "$CMAKE" == "1" ]; then
CMAKE_ARGS="-DCMAKE_BUILD_TYPE=Debug ${CMAKE_ARGS}"
else
QMAKE_ARGS="CONFIG+=debug ${QMAKE_ARGS}"
fi
CMAKE_ARGS="-DCMAKE_BUILD_TYPE=Debug ${CMAKE_ARGS}"
QMAKE_ARGS="CONFIG+=debug ${QMAKE_ARGS}"
;;
--system-ffmpeg)
QMAKE_ARGS="CONFIG+=system_ffmpeg ${QMAKE_ARGS}"
;;
--headless) echo "Headless mode enabled"
CMAKE_ARGS="-DHEADLESS=ON ${CMAKE_ARGS}"