author | zecke <zecke> | 2004-07-18 19:32:20 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-07-18 19:32:20 (UTC) |
commit | 8795812a0d763742a5273f356c35313af0fed84d (patch) (unidiff) | |
tree | 34b7259e1595e53e1fa2069d7d79bbdef67293e8 /mkspecs/macx-pbuilder | |
parent | 8e8fcd65b8d8657650728bae604c5a34dc31338e (diff) | |
download | opie-8795812a0d763742a5273f356c35313af0fed84d.zip opie-8795812a0d763742a5273f356c35313af0fed84d.tar.gz opie-8795812a0d763742a5273f356c35313af0fed84d.tar.bz2 |
-CHECK if DIR exist added to qmake.conf's
-use arm-linux-g++ for linking now
hopefully not removed anything important
Added python tool to opiefy mkspecs
-rwxr-xr-x | mkspecs/macx-pbuilder/Info.plist.app | 4 | ||||
-rwxr-xr-x | mkspecs/macx-pbuilder/qmake.conf | 16 |
2 files changed, 12 insertions, 8 deletions
diff --git a/mkspecs/macx-pbuilder/Info.plist.app b/mkspecs/macx-pbuilder/Info.plist.app index 9d6c42a..4da07e9 100755 --- a/mkspecs/macx-pbuilder/Info.plist.app +++ b/mkspecs/macx-pbuilder/Info.plist.app | |||
@@ -3,13 +3,15 @@ | |||
3 | <plist version="0.9"> | 3 | <plist version="0.9"> |
4 | <dict> | 4 | <dict> |
5 | <key>CFBundleIconFile</key> | 5 | <key>CFBundleIconFile</key> |
6 | <string>application.icns</string> | 6 | <string>@ICON@</string> |
7 | <key>CFBundlePackageType</key> | 7 | <key>CFBundlePackageType</key> |
8 | <string>APPL</string> | 8 | <string>APPL</string> |
9 | <key>CFBundleGetInfoString</key> | 9 | <key>CFBundleGetInfoString</key> |
10 | <string>Created by Qt/QMake</string> | 10 | <string>Created by Qt/QMake</string> |
11 | <key>CFBundleSignature</key> | 11 | <key>CFBundleSignature</key> |
12 | <string>ttxt</string> | 12 | <string>ttxt</string> |
13 | <key>CFBundleExecutable</key> | ||
14 | <string>@EXECUTABLE@</string> | ||
13 | <key>NOTE</key> | 15 | <key>NOTE</key> |
14 | <string>Please, do NOT change this file -- It was generated by Qt/QMake.</string> | 16 | <string>Please, do NOT change this file -- It was generated by Qt/QMake.</string> |
15 | </dict> | 17 | </dict> |
diff --git a/mkspecs/macx-pbuilder/qmake.conf b/mkspecs/macx-pbuilder/qmake.conf index 6d765a8..da820ac 100755 --- a/mkspecs/macx-pbuilder/qmake.conf +++ b/mkspecs/macx-pbuilder/qmake.conf | |||
@@ -6,9 +6,9 @@ | |||
6 | 6 | ||
7 | MAKEFILE_GENERATOR= PROJECTBUILDER | 7 | MAKEFILE_GENERATOR= PROJECTBUILDER |
8 | TEMPLATE = app | 8 | TEMPLATE = app |
9 | CONFIG += qt warn_on release lib_version_first incremental resource_fork plugin_no_soname | 9 | CONFIG += qt warn_on release lib_version_first incremental plugin_no_soname link_prl |
10 | 10 | ||
11 | QMAKE_CC = cc | 11 | QMAKE_CC = |
12 | QMAKE_LEX = flex | 12 | QMAKE_LEX = flex |
13 | QMAKE_LEXFLAGS = | 13 | QMAKE_LEXFLAGS = |
14 | QMAKE_YACC = yacc | 14 | QMAKE_YACC = yacc |
@@ -18,13 +18,13 @@ QMAKE_CFLAGS = -pipe $(CFLAGS_EXTRA) | |||
18 | QMAKE_CFLAGS_DEPS= -M | 18 | QMAKE_CFLAGS_DEPS= -M |
19 | QMAKE_CFLAGS_WARN_ON= -Wall -W | 19 | QMAKE_CFLAGS_WARN_ON= -Wall -W |
20 | QMAKE_CFLAGS_WARN_OFF= | 20 | QMAKE_CFLAGS_WARN_OFF= |
21 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O3) | 21 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -Os) |
22 | QMAKE_CFLAGS_DEBUG= -g | 22 | QMAKE_CFLAGS_DEBUG= -g |
23 | QMAKE_CFLAGS_SHLIB= -fPIC | 23 | QMAKE_CFLAGS_SHLIB= -fPIC |
24 | QMAKE_EXTENSION_SHLIB= dylib | 24 | QMAKE_EXTENSION_SHLIB= dylib |
25 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses | 25 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses |
26 | 26 | ||
27 | QMAKE_CXX = c++ | 27 | QMAKE_CXX = |
28 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) | 28 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) |
29 | QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS | 29 | QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS |
30 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON | 30 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON |
@@ -47,11 +47,11 @@ QMAKE_LINK_SHLIB = c++ | |||
47 | QMAKE_LFLAGS = $(LFLAGS_EXTRA) | 47 | QMAKE_LFLAGS = $(LFLAGS_EXTRA) |
48 | QMAKE_LFLAGS_RELEASE= | 48 | QMAKE_LFLAGS_RELEASE= |
49 | QMAKE_LFLAGS_DEBUG= | 49 | QMAKE_LFLAGS_DEBUG= |
50 | QMAKE_LFLAGS_SHAPP= -prebind | 50 | QMAKE_LFLAGS_APP= -prebind |
51 | QMAKE_LFLAGS_SHLIB= -dynamiclib | 51 | QMAKE_LFLAGS_SHLIB= -dynamiclib |
52 | QMAKE_LFLAGS_INCREMENTAL = -undefined suppress -flat_namespace | 52 | QMAKE_LFLAGS_INCREMENTAL = -undefined suppress -flat_namespace |
53 | QMAKE_LFLAGS_PLUGIN= -bundle | 53 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB |
54 | QMAKE_LFLAGS_SONAME= -install_name$${LITERAL_WHITESPACE}@executable_path/../Frameworks/ | 54 | #QMAKE_LFLAGS_SONAME= -install_name$${LITERAL_WHITESPACE}@executable_path/../Frameworks/ |
55 | QMAKE_LFLAGS_THREAD= | 55 | QMAKE_LFLAGS_THREAD= |
56 | QMAKE_RPATH = | 56 | QMAKE_RPATH = |
57 | 57 | ||
@@ -77,3 +77,5 @@ QMAKE_COPY_DIR = $$QMAKE_COPY -r | |||
77 | QMAKE_MOVE = mv -f | 77 | QMAKE_MOVE = mv -f |
78 | QMAKE_DEL_FILE = rm -f | 78 | QMAKE_DEL_FILE = rm -f |
79 | QMAKE_DEL_DIR = rmdir | 79 | QMAKE_DEL_DIR = rmdir |
80 | QMAKE_CHK_DIR_EXISTS= test -d | ||
81 | QMAKE_MKDIR = mkdir -p | ||