author | eilers <eilers> | 2004-07-29 09:48:37 (UTC) |
---|---|---|
committer | eilers <eilers> | 2004-07-29 09:48:37 (UTC) |
commit | 08d7594f45f24112f76192ddbcd8ed3f0a651186 (patch) (unidiff) | |
tree | 970bad5afebdafc03bfdaa2f390c97d535504992 | |
parent | 19eab093c4d63ae275d215f400b1d262390daa16 (diff) | |
download | opie-08d7594f45f24112f76192ddbcd8ed3f0a651186.zip opie-08d7594f45f24112f76192ddbcd8ed3f0a651186.tar.gz opie-08d7594f45f24112f76192ddbcd8ed3f0a651186.tar.bz2 |
All my changes was lost. Revert to 1.5 ..
-rw-r--r-- | mkspecs/qws/macx-generic-g++/qmake.conf | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/mkspecs/qws/macx-generic-g++/qmake.conf b/mkspecs/qws/macx-generic-g++/qmake.conf index 99acca7..7bc67c7 100644 --- a/mkspecs/qws/macx-generic-g++/qmake.conf +++ b/mkspecs/qws/macx-generic-g++/qmake.conf | |||
@@ -7,5 +7,5 @@ | |||
7 | MAKEFILE_GENERATOR= UNIX | 7 | MAKEFILE_GENERATOR= UNIX |
8 | TEMPLATE = app | 8 | TEMPLATE = app |
9 | CONFIG += qt link_prl | 9 | CONFIG += qt warn_on release |
10 | QMAKE_EXTENSION_SHLIB= dylib | 10 | QMAKE_EXTENSION_SHLIB= dylib |
11 | 11 | ||
@@ -25,6 +25,5 @@ QMAKE_CFLAGS_THREAD = -D_REENTRANT | |||
25 | 25 | ||
26 | QMAKE_CXX = $(TB)c++ | 26 | QMAKE_CXX = $(TB)c++ |
27 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -DQT_NO_QWS_TRANSFORMED -fno-exceptions -fno-rtti $(CXXFLAGS_EXTRA) | 27 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -DQT_NO_QWS_TRANSFORMED -DQWS -fno-exceptions -fno-rtti $(CXXFLAGS_EXTRA) -DQ_OS_MACX -DQT_NO_SOUND -DOPIE_NO_OVERRIDE_QT -DOPIE_NO_BACKTRACE |
28 | DEFINES += QWS | ||
29 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON | 28 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON |
30 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF | 29 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF |
@@ -43,6 +42,4 @@ QMAKE_LIBDIR_QT = $(QTDIR)/lib | |||
43 | QMAKE_INCDIR_OPENGL= /usr/X11R6/include | 42 | QMAKE_INCDIR_OPENGL= /usr/X11R6/include |
44 | QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib | 43 | QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib |
45 | QMAKE_INCDIR_QTOPIA= $(QPEDIR)/include | ||
46 | QMAKE_LIBDIR_QTOPIA= $(QPEDIR)/lib | ||
47 | 44 | ||
48 | QMAKE_LINK = $$QMAKE_CXX | 45 | QMAKE_LINK = $$QMAKE_CXX |
@@ -62,7 +59,7 @@ QMAKE_LIBS_X11 = | |||
62 | QMAKE_LIBS_X11SM= | 59 | QMAKE_LIBS_X11SM= |
63 | QMAKE_LIBS_QT = -lqte | 60 | QMAKE_LIBS_QT = -lqte |
61 | #QMAKE_LIBS_QT = libqte.dylib | ||
64 | QMAKE_LIBS_QT_THREAD= -lqte-mt | 62 | QMAKE_LIBS_QT_THREAD= -lqte-mt |
65 | QMAKE_LIBS_QT_OPENGL= -lqgl | 63 | QMAKE_LIBS_QT_OPENGL= -lqgl |
66 | QMAKE_LIBS_QTOPIA= -lqtopia -lqpe | ||
67 | QMAKE_LIBS_THREAD= | 64 | QMAKE_LIBS_THREAD= |
68 | 65 | ||
@@ -80,4 +77,5 @@ QMAKE_MOVE = mv -f | |||
80 | QMAKE_DEL_FILE = rm -f | 77 | QMAKE_DEL_FILE = rm -f |
81 | QMAKE_DEL_DIR = rmdir | 78 | QMAKE_DEL_DIR = rmdir |
82 | QMAKE_CHK_DIR_EXISTS= test -d | 79 | |
83 | QMAKE_MKDIR = mkdir -p | 80 | |
81 | |||