Skip to content

Commit 8bcbb43

Browse files
committed
mingw-cross-env.pri: remove unnecessary options
- qmake/pkg-config can handle all the config - *.dlls are installed in `bin` but gcc links with `*.dll.a` in `lib` - `-fpermissive` is not required
1 parent 5406e45 commit 8bcbb43

File tree

1 file changed

+1
-31
lines changed

1 file changed

+1
-31
lines changed

mingw-cross-env.pri

+1-31
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,8 @@
11
# cross compilation unix->win32
22
# To use static linking, pass CONFIG+=mingw-cross-env to qmake
33
# To use shared linking, pass CONFIG+=mingw-cross-env-shared to qmake
4-
CONFIG(mingw-cross-env) {
5-
LIBS += mingw-cross-env/lib/libglew32s.a
6-
LIBS += mingw-cross-env/lib/libglut.a
7-
LIBS += mingw-cross-env/lib/libopengl32.a
8-
LIBS += mingw-cross-env/lib/libGLEW.a
9-
# exists( mingw-cross-env/lib/libglaux.a ) {
10-
# LIBS += mingw-cross-env/lib/libglaux.a
11-
# }
12-
LIBS += mingw-cross-env/lib/libglu32.a
13-
LIBS += mingw-cross-env/lib/libopencsg.a
14-
LIBS += mingw-cross-env/lib/libmpfr.a
15-
LIBS += mingw-cross-env/lib/libgmp.a
16-
LIBS += mingw-cross-env/lib/libCGAL.a
17-
LIBS += mingw-cross-env/lib/libfontconfig.a
18-
LIBS += mingw-cross-env/lib/libfreetype.a
19-
LIBS += mingw-cross-env/lib/libharfbuzz.a
20-
LIBS += mingw-cross-env/lib/libbz2.a
21-
LIBS += mingw-cross-env/lib/libexpat.a
22-
LIBS += mingw-cross-env/lib/libintl.a
23-
LIBS += mingw-cross-env/lib/libiconv.a
24-
}
25-
26-
CONFIG(mingw-cross-env-shared) {
27-
# on MXE, the shared library .dll files are under 'bin' not 'lib'.
28-
QMAKE_LFLAGS += -L./mingw-cross-env/bin
29-
LIBS += -lglew32 -lglut -lopengl32 -lGLEW -lglu32
30-
LIBS += -lopencsg -lmpfr -lgmp -lCGAL
31-
LIBS += -lfontconfig -lfreetype -lharfbuzz -lbz2 -lexpat -lintl -liconv
32-
}
334

34-
CONFIG(mingw-cross-env)|CONFIG(mingw-cross-env-shared) {
35-
QMAKE_CXXFLAGS += -fpermissive
5+
mingw-cross-env* {
366
QMAKE_DEL_FILE = rm -f
377
QMAKE_CXXFLAGS_WARN_ON += -Wno-unused-local-typedefs #eigen3
388
}

0 commit comments

Comments
 (0)