1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
|
--- gui/qt/CEmu.pro.orig 2024-09-05 20:35:24 UTC
+++ gui/qt/CEmu.pro
@@ -9,7 +9,7 @@ if (lessThan(QT_MAJOR_VERSION, 6)) {
# CEmu version and info
CEMU_RELEASE = true
-CEMU_GIT_SHA = $$system(git describe --abbrev=7 --always)
+CEMU_GIT_SHA = a0a9d35 # XXX: don't forget to change for the next version!
isEmpty(CEMU_VERSION) {
CEMU_VERSION = v2.0dev
CEMU_RELEASE = false
@@ -31,7 +31,7 @@ CI = $$(CI)
DISTFILES += ../../.astylerc
# Linux desktop files
-if (linux) {
+if (unix) {
isEmpty(PREFIX) {
PREFIX = /usr
}
@@ -93,11 +93,12 @@ if (!win32-msvc*) {
QMAKE_CFLAGS += -std=gnu11 -Werror=implicit-function-declaration -Werror=missing-prototypes
# -flto might cause an internal compiler error on GCC in some circumstances (with -g3?)... Comment it if needed.
- CONFIG(release, debug|release): GLOBAL_FLAGS += -O3 -flto
+ #CONFIG(release, debug|release): GLOBAL_FLAGS += -O3 -flto
if (contains(DEFINES, LIB_ARCHIVE_SUPPORT)) {
CONFIG += link_pkgconfig
- PKGCONFIG += zlib libarchive
+ PKGCONFIG += zlib
+ LIBS += -larchive
}
# You should run ./capture/get_libpng-apng.sh first!
isEmpty(USE_LIBPNG) {
@@ -172,7 +173,7 @@ if (!win32-msvc*) {
}
}
-if (macx|linux) {
+if (macx|unix) {
# Be more secure by default...
GLOBAL_FLAGS += -fPIE -Wstack-protector -fstack-protector-strong --param=ssp-buffer-size=1
# Use ASAN on debug builds. Watch out about ODR crashes when built with -flto. detect_odr_violation=0 as an env var may help.
@@ -180,7 +181,7 @@ if (macx|linux) {
}
macx: QMAKE_LFLAGS += -Wl,-dead_strip
-linux: QMAKE_LFLAGS += -Wl,-z,relro -Wl,-z,now -Wl,-z,noexecstack -Wl,--gc-sections -pie
+unix: QMAKE_LFLAGS += -Wl,-z,relro -Wl,-z,now -Wl,-z,noexecstack -Wl,--gc-sections -pie
QMAKE_CFLAGS += $$GLOBAL_FLAGS
QMAKE_CXXFLAGS += $$GLOBAL_FLAGS
@@ -279,7 +280,7 @@ SOURCES += \
tablewidget.cpp \
basicdebugger.cpp
-linux|macx: SOURCES += ../../core/os/os-linux.c
+unix|macx: SOURCES += ../../core/os/os-linux.c
win32: SOURCES += ../../core/os/os-win32.c win32-console.cpp
win32: LIBS += -lpsapi
|
