From 15bf4921276ebd68a92ae2682c850e9ad3b124c1 Mon Sep 17 00:00:00 2001 From: Scott Duensing Date: Sun, 2 Feb 2020 20:03:21 -0600 Subject: [PATCH] Start of allowing for dynamic builds. --- singe/preBuild.sh | 2 + singe/singe.pro | 108 +++++++++++++++++++++++++++++++++------------- 2 files changed, 80 insertions(+), 30 deletions(-) diff --git a/singe/preBuild.sh b/singe/preBuild.sh index b70a8df7f..f4f27b9d9 100755 --- a/singe/preBuild.sh +++ b/singe/preBuild.sh @@ -27,11 +27,13 @@ if [[ -z $1 ]]; then G_BITS=32 G_THIRDPARTY=$(pwd)/thirdparty G_DEST="$(pwd)/../thirdparty-build/${G_PLATFORM}/${G_BITS}" + G_TYPE=static else G_THIRDPARTY=$1 G_BITS=$3 G_PLATFORM=$4 G_DEST=$2/$4/$3 + G_TYPE=static fi G_INSTALLED="${G_DEST}/installed" diff --git a/singe/singe.pro b/singe/singe.pro index 3c7ab5315..ad2fcae09 100644 --- a/singe/singe.pro +++ b/singe/singe.pro @@ -27,35 +27,38 @@ CONFIG -= qt # Target Settings TARGET = singeEmu -CONFIG += platformLinux -CONFIG += bits64 +CONFIG += platformPi # linux, pi, or mingw +CONFIG += bits32 # bits32 or bits64 +CONFIG += dynamic # dyanmic or static # Keep binaries to themselves DESTDIR = $$OUT_PWD/build -# === Third Party Builds === +# Some variables for later bits64 { - BITNESS="64" + BITNESS="64" } else { - BITNESS="32" + BITNESS="32" } -platformLinux { - PLATFORM="linux" -} else { - PLATFORM="mingw" +platformLinux:PLATFORM="linux" +platformMingw:PLATFORM="mingw" +platformPi:PLATFORM="pi" + +static { + # === Third Party Builds === + BUILDTHIRDARGS = \"$$PWD/thirdparty\" \"$$OUT_PWD/../thirdparty-build\" $$BITNESS $$PLATFORM + win32 { + # Placeholder - doesn't work + BUILDTHIRD.commands = cmd.exe /c $$PWD\\preBuild.bat $$BUILDTHIRDARGS + } else { + BUILDTHIRD.commands = bash $$PWD/preBuild.sh $$BUILDTHIRDARGS + } + BUILDTHIRD.target = this + PRE_TARGETDEPS += this + QMAKE_EXTRA_TARGETS += BUILDTHIRD } -BUILDTHIRDARGS = \"$$PWD/thirdparty\" \"$$OUT_PWD/../thirdparty-build\" $$BITNESS $$PLATFORM -win32 { - # Placeholder - doesn't work - BUILDTHIRD.commands = cmd.exe /c $$PWD\\preBuild.bat $$BUILDTHIRDARGS -} else { - BUILDTHIRD.commands = bash $$PWD/preBuild.sh $$BUILDTHIRDARGS -} -BUILDTHIRD.target = this -PRE_TARGETDEPS += this -QMAKE_EXTRA_TARGETS += BUILDTHIRD # === ManyMouse === @@ -76,8 +79,14 @@ MANYMOUSE_SOURCES = \ # === SINGE === QMAKE_CFLAGS += \ - -isystem $$MANYMOUSE_INCLUDES \ - -isystem $$PWD/../thirdparty-build/$$PLATFORM/$$BITNESS/installed/include + -isystem $$MANYMOUSE_INCLUDES \ + -isystem $$PWD/../thirdparty-build/$$PLATFORM/$$BITNESS/installed/include + +dynamic { + platformPi { + QMAKE_CFLAGS += -I/usr/include/lua5.3 + } +} HEADERS += \ $$MANYMOUSE_HEADERS \ @@ -102,15 +111,54 @@ SOURCES += \ main.c LIBS += \ - -L$$PWD/../thirdparty-build/$$PLATFORM/$$BITNESS/installed/lib \ - -l:everything.a \ - -lpthread \ - -lXv \ - -lX11 \ - -lXext \ - -lm \ - -ldl \ - -lrt + -L$$PWD/../thirdparty-build/$$PLATFORM/$$BITNESS/installed/lib \ + -lpthread \ + -lXv \ + -lX11 \ + -lXext \ + -lm \ + -ldl \ + -lrt + +static { + LIBS += \ + -l:everything.a +} + +dynamic { + LIBS += \ + -lffms2 \ + -lavformat \ + -lavcodec \ + -lswscale \ + -lavutil \ + -lswresample \ + -lSDL2 \ + -lSDL2_image \ + -lSDL2_mixer \ + -lSDL2_ttf \ + -llua5.3 \ + -lz + + platformPi { + LIBS += \ + -L/opt/vc/lib \ + -lbcm_host \ + -lasound \ + -lXi \ + -lsndio \ + -lXcursor \ + -lXinerama \ + -lXrandr \ + -lXss \ + -lXxf86vm \ + -lmmal_core \ + -lmmal_util \ + -lmmal_vc_client \ + -lvdpau \ + -latomic + } +} OTHER_FILES += \ preBuild.sh \