| author | eilers <eilers> | 2004-07-29 09:48:37 (UTC) |
|---|---|---|
| committer | eilers <eilers> | 2004-07-29 09:48:37 (UTC) |
| commit | 08d7594f45f24112f76192ddbcd8ed3f0a651186 (patch) (side-by-side diff) | |
| tree | 970bad5afebdafc03bfdaa2f390c97d535504992 /mkspecs/qws | |
| 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 @@ -6,7 +6,7 @@ MAKEFILE_GENERATOR = UNIX TEMPLATE = app -CONFIG += qt link_prl +CONFIG += qt warn_on release QMAKE_EXTENSION_SHLIB = dylib QMAKE_CC = $(TB)cc @@ -24,8 +24,7 @@ QMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses QMAKE_CFLAGS_THREAD = -D_REENTRANT QMAKE_CXX = $(TB)c++ -QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -DQT_NO_QWS_TRANSFORMED -fno-exceptions -fno-rtti $(CXXFLAGS_EXTRA) -DEFINES += QWS +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 QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON QMAKE_CXXFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF QMAKE_CXXFLAGS_RELEASE = $$QMAKE_CFLAGS_RELEASE @@ -42,8 +41,6 @@ QMAKE_INCDIR_QT = $(QTDIR)/include QMAKE_LIBDIR_QT = $(QTDIR)/lib QMAKE_INCDIR_OPENGL = /usr/X11R6/include QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib -QMAKE_INCDIR_QTOPIA = $(QPEDIR)/include -QMAKE_LIBDIR_QTOPIA = $(QPEDIR)/lib QMAKE_LINK = $$QMAKE_CXX QMAKE_LINK_SHLIB = $$QMAKE_CXX @@ -61,9 +58,9 @@ QMAKE_LIBS = $(LIBS_EXTRA) QMAKE_LIBS_X11 = QMAKE_LIBS_X11SM = QMAKE_LIBS_QT = -lqte +#QMAKE_LIBS_QT = libqte.dylib QMAKE_LIBS_QT_THREAD = -lqte-mt QMAKE_LIBS_QT_OPENGL = -lqgl -QMAKE_LIBS_QTOPIA = -lqtopia -lqpe QMAKE_LIBS_THREAD = QMAKE_MOC = $(QTDIR)/bin/moc @@ -79,5 +76,6 @@ QMAKE_COPY = cp -f QMAKE_MOVE = mv -f QMAKE_DEL_FILE = rm -f QMAKE_DEL_DIR = rmdir -QMAKE_CHK_DIR_EXISTS = test -d -QMAKE_MKDIR = mkdir -p + + + |