Adding needed SDL libraries.

This commit is contained in:
Scott Duensing 2019-11-19 21:59:26 -06:00
parent a3c83bb0c6
commit 24a6543232
31456 changed files with 3103451 additions and 2 deletions

6
.gitignore vendored
View file

@ -7,3 +7,9 @@
*.avi
*.vob
build-*/
notes.txt
singe/thirdparty/SDL2/autom4te.cache/
singe/thirdparty/SDL2/test/autom4te.cache/
singe/thirdparty/SDL2_image/autom4te.cache/
singe/thirdparty/SDL2_mixer/autom4te.cache/
thirdparty-build/

View file

@ -19,13 +19,87 @@
# 3. This notice may not be removed or altered from any source distribution.
#
# We're just a boring old C app
TEMPLATE = app
CONFIG += console
CONFIG -= \
app_bundle
qt
# Keep binaries to themselves
DESTDIR = $$OUT_PWD/build
# Macro to copy files to target
defineTest(copyToDestDir) {
files = $$1
for(FILE, files) {
DDIR = $$DESTDIR
win32:FILE ~= s,/,\\,g
win32:DDIR ~= s,/,\\,g
QMAKE_POST_LINK += $$QMAKE_COPY $$quote($$FILE) $$quote($$DDIR) $$escape_expand(\\n\\t)
}
export(QMAKE_POST_LINK)
}
# Macro to copy files to subdirectory of target
defineTest(copyToDestDirSub) {
files = $$1
sub = $$2
mkpath($$DESTDIR/$$sub)
for(FILE, files) {
DDIR = $$DESTDIR/$$sub
win32:FILE ~= s,/,\\,g
win32:DDIR ~= s,/,\\,g
QMAKE_POST_LINK += $$QMAKE_COPY $$quote($$FILE) $$quote($$DDIR) $$escape_expand(\\n\\t)
}
export(QMAKE_POST_LINK)
}
# Make Visual C shut up about stupidness
win32 {
DEFINES *= \
_CRT_SECURE_NO_WARNINGS \
_CRT_NONSTDC_NO_DEPRECATE
MSVC_VER = $$(VisualStudioVersion)
if(equals(MSVC_VER, 14.0)|greaterThan(MSVC_VER, 14.0)) {
message("Timespec is defined")
DEFINES *= HAVE_STRUCT_TIMESPEC
}
}
# Determine Bitness - This is just broken
win32 {
contains(QMAKE_HOST.arch, x86_64) {
CONFIG *= bits64
} else {
CONFIG *= bits32
}
} else {
*-64 | *_64 {
CONFIG *= bits64
} else {
CONFIG *= bits32
}
}
BITNESS="64"
bits32:BITNESS="32"
# HACK HACK HACK due to above
BITNESS="64"
CONFIG -= bits32
CONFIG += bits64
# === Third Party Builds ===
BUILDTHIRDARGS = \"$$PWD/thirdparty\" \"$$OUT_PWD/../thirdparty-build\" $$BITNESS
win32 {
BUILDTHIRD.commands = cmd.exe /c $$PWD\\thirdparty\\build.bat $$BUILDTHIRDARGS
} else {
BUILDTHIRD.commands = bash $$PWD/thirdparty/build.sh $$BUILDTHIRDARGS
}
BUILDTHIRD.target = this
PRE_TARGETDEPS += this
QMAKE_EXTRA_TARGETS += BUILDTHIRD
# === FFMS2 ===
FFMS_DEFINES =
@ -156,7 +230,15 @@ SOURCES += \
$$LUA_SOURCES
LIBS += \
-lSDL2 \
-L$$PWD/../thirdparty-build/$$BITNESS/installed/lib \
-l:libSDL2.a \
-l:libSDL2_image.a \
-l:libSDL2_mixer.a \
-ldl \
$$FFMS_LIBS \
$$LUA_LIBS
OTHER_FILES += \
thirdparty/build.sh \
thirdparty/build.bat

BIN
singe/thirdparty/SDL2/.hg/00changelog.i vendored Normal file

Binary file not shown.

1
singe/thirdparty/SDL2/.hg/branch vendored Normal file
View file

@ -0,0 +1 @@
default

View file

@ -0,0 +1,20 @@
688fd43988a59d53c95a381da733d9d75c7ab196 13260
d4d66a1891fc9799f3452fdbe858f93195d15135 o SDL-1.2
2e253188dcd2148f595b30a52abdf53e56e3aa39 c SDL-1.2-olpc
06be4b33029d9e4012380084dd37dc1730062921 c SDL-1.3
f8db1cd5494eb2b34b8f9f46717318ba71e5e197 c SDL-ryan-batching-renderer
2bf2dee62ea78891c2d412d7bbabfd6c37782216 c SDL-ryan-multiple-audio-device
43b742ab3deb3724784e2346a8619357f1a9a4ef c apk
f2d8e0b59ccac6688e7a5c89399f7c842507968e c default
9b97d5eabe551ae3d9afd73669ea5c812d4d4ad3 c default
688fd43988a59d53c95a381da733d9d75c7ab196 o default
b95bb58b703af987349d3603a7d008e11a061d7a c experimental
14a08e45a4d36b93c8db8f850f483316c2f3ae25 c gsoc2008_audio_resampling
119b676a2600d56045c30dd8123e66ad102649f9 c gsoc2008_force_feedback
6f025b97c55c675b335c708414de782ee7347fec c gsoc2008_iphone
c62835c40174a087d0082bf6e52103d6d6f02c27 c gsoc2008_manymouse
e2188009f029855da921a041bbcf95303ca509cc c gsoc2008_nds
21196203ffa418741817dbea53ad8913edd68784 c gsoc2009_IME
ab53c78e0f3bb72ddeacb70e2183153e18bbb8c0 c gsoc2009_ps3
c5616d36b2ac4723906170b4608a0ad49f1f98d9 c gsoc2009_unit_tests
618662dc9e82a2127db37539fe7c1bb90efebd45 c iOS-improvements

0
singe/thirdparty/SDL2/.hg/cache/checkisexec vendored Executable file
View file

View file

@ -0,0 +1 @@
checklink-target

View file

File diff suppressed because one or more lines are too long

BIN
singe/thirdparty/SDL2/.hg/dirstate vendored Normal file

Binary file not shown.

14
singe/thirdparty/SDL2/.hg/hgrc vendored Normal file
View file

@ -0,0 +1,14 @@
# example repository config (see 'hg help config' for more info)
[paths]
default = http://hg.libsdl.org/SDL
# path aliases to other clones of this repo in URLs or filesystem paths
# (see 'hg help config.paths' for more info)
#
# default:pushurl = ssh://jdoe@example.net/hg/jdoes-fork
# my-fork = ssh://jdoe@example.net/hg/jdoes-fork
# my-clone = /home/jdoe/jdoes-clone
[ui]
# name and email (local to this repository, optional), e.g.
# username = Jane Doe <jdoe@example.com>

5
singe/thirdparty/SDL2/.hg/requires vendored Normal file
View file

@ -0,0 +1,5 @@
dotencode
fncache
generaldelta
revlogv1
store

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Some files were not shown because too many files have changed in this diff Show more