mirror of
https://github.com/urbit/shrub.git
synced 2024-12-23 10:52:12 +03:00
edd57d380d
- Fixes the IPC bug - Fixes the terminfo bug - Moves the OSX SDK out of our nixcrpkgs fork. - Vendor nixcrpkgs instead of having it be a submodule.
17 lines
752 B
Diff
17 lines
752 B
Diff
diff -ur qtbase-opensource-src-5.9.6-orig/mkspecs/win32-g++/qmake.conf qtbase-opensource-src-5.9.6/mkspecs/win32-g++/qmake.conf
|
|
--- qtbase-opensource-src-5.9.6-orig/mkspecs/win32-g++/qmake.conf 2018-06-19 12:41:49.061465695 -0700
|
|
+++ qtbase-opensource-src-5.9.6/mkspecs/win32-g++/qmake.conf 2018-06-19 12:42:15.406453120 -0700
|
|
@@ -54,10 +54,8 @@
|
|
QMAKE_LFLAGS_WINDOWS = -Wl,-subsystem,windows
|
|
QMAKE_LFLAGS_DLL = -shared
|
|
QMAKE_LFLAGS_GCSECTIONS = -Wl,--gc-sections
|
|
-equals(QMAKE_HOST.os, Windows) {
|
|
- QMAKE_LINK_OBJECT_MAX = 10
|
|
- QMAKE_LINK_OBJECT_SCRIPT = object_script
|
|
-}
|
|
+QMAKE_LINK_OBJECT_MAX = 10
|
|
+QMAKE_LINK_OBJECT_SCRIPT = object_script
|
|
QMAKE_EXT_OBJ = .o
|
|
QMAKE_EXT_RES = _res.o
|
|
QMAKE_PREFIX_SHLIB =
|