Start of allowing for dynamic builds.

This commit is contained in:
Scott Duensing 2020-02-02 20:03:21 -06:00
parent f365a11b2f
commit 15bf492127
2 changed files with 80 additions and 30 deletions

View file

@ -27,11 +27,13 @@ if [[ -z $1 ]]; then
G_BITS=32 G_BITS=32
G_THIRDPARTY=$(pwd)/thirdparty G_THIRDPARTY=$(pwd)/thirdparty
G_DEST="$(pwd)/../thirdparty-build/${G_PLATFORM}/${G_BITS}" G_DEST="$(pwd)/../thirdparty-build/${G_PLATFORM}/${G_BITS}"
G_TYPE=static
else else
G_THIRDPARTY=$1 G_THIRDPARTY=$1
G_BITS=$3 G_BITS=$3
G_PLATFORM=$4 G_PLATFORM=$4
G_DEST=$2/$4/$3 G_DEST=$2/$4/$3
G_TYPE=static
fi fi
G_INSTALLED="${G_DEST}/installed" G_INSTALLED="${G_DEST}/installed"

View file

@ -27,35 +27,38 @@ CONFIG -= qt
# Target Settings # Target Settings
TARGET = singeEmu TARGET = singeEmu
CONFIG += platformLinux CONFIG += platformPi # linux, pi, or mingw
CONFIG += bits64 CONFIG += bits32 # bits32 or bits64
CONFIG += dynamic # dyanmic or static
# Keep binaries to themselves # Keep binaries to themselves
DESTDIR = $$OUT_PWD/build DESTDIR = $$OUT_PWD/build
# === Third Party Builds === # Some variables for later
bits64 { bits64 {
BITNESS="64" BITNESS="64"
} else { } else {
BITNESS="32" BITNESS="32"
} }
platformLinux { platformLinux:PLATFORM="linux"
PLATFORM="linux" platformMingw:PLATFORM="mingw"
} else { platformPi:PLATFORM="pi"
PLATFORM="mingw"
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 === # === ManyMouse ===
@ -76,8 +79,14 @@ MANYMOUSE_SOURCES = \
# === SINGE === # === SINGE ===
QMAKE_CFLAGS += \ QMAKE_CFLAGS += \
-isystem $$MANYMOUSE_INCLUDES \ -isystem $$MANYMOUSE_INCLUDES \
-isystem $$PWD/../thirdparty-build/$$PLATFORM/$$BITNESS/installed/include -isystem $$PWD/../thirdparty-build/$$PLATFORM/$$BITNESS/installed/include
dynamic {
platformPi {
QMAKE_CFLAGS += -I/usr/include/lua5.3
}
}
HEADERS += \ HEADERS += \
$$MANYMOUSE_HEADERS \ $$MANYMOUSE_HEADERS \
@ -102,15 +111,54 @@ SOURCES += \
main.c main.c
LIBS += \ LIBS += \
-L$$PWD/../thirdparty-build/$$PLATFORM/$$BITNESS/installed/lib \ -L$$PWD/../thirdparty-build/$$PLATFORM/$$BITNESS/installed/lib \
-l:everything.a \ -lpthread \
-lpthread \ -lXv \
-lXv \ -lX11 \
-lX11 \ -lXext \
-lXext \ -lm \
-lm \ -ldl \
-ldl \ -lrt
-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 += \ OTHER_FILES += \
preBuild.sh \ preBuild.sh \