summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--development/macosx/README_MACOSX6
-rw-r--r--development/macosx/config-files/qt-2.3.2/darwin-g++-shared (copied from development/macosx/darwin-g++-shared)0
-rw-r--r--development/macosx/config-files/qte-2.3.7/darwin-generic-g++-shared (renamed from development/macosx/darwin-g++-shared)16
3 files changed, 14 insertions, 8 deletions
diff --git a/development/macosx/README_MACOSX b/development/macosx/README_MACOSX
index 877e2f8..bc21548 100644
--- a/development/macosx/README_MACOSX
+++ b/development/macosx/README_MACOSX
@@ -40,8 +40,10 @@ Before compiling for MacOS-X, you need the following:
40The Patch for QT/E for Opie, including all other opie-patches is available in the 40The Patch for QT/E for Opie, including all other opie-patches is available in the
41qt-directory ($OPIEDIR/qt) and is called "qte237-all-macosx.patch". 41qt-directory ($OPIEDIR/qt) and is called "qte237-all-macosx.patch".
42To be able to compile, you have to copy the file from the directory "./config-files/qte-2.3.7"
43into the directory "configs" within the base directory of qt/e.
42 44
43The Patch for QT-2.3.2 is provided in this directory and is called "qt232-X11.patch". 45The Patch for QT-2.3.2 is provided in this directory and is called "qt232-X11.patch".
44ATTENTION: The patch does not contain the darwin config file. Please copy the file 46Please copy the file "darwin-g++-shared" from the directory "./config-files/qt-2.3.2" into the directory "configs"
45"darwin-g++-shared" into the directory "configs" within the qt-2.3.2 directory !! 47within the qt-2.3.2 directory !!
46 48
47If your buildsystem is working correctly, you should be able to build 49If your buildsystem is working correctly, you should be able to build
diff --git a/development/macosx/darwin-g++-shared b/development/macosx/config-files/qt-2.3.2/darwin-g++-shared
index 18d3b15..18d3b15 100644
--- a/development/macosx/darwin-g++-shared
+++ b/development/macosx/config-files/qt-2.3.2/darwin-g++-shared
diff --git a/development/macosx/darwin-g++-shared b/development/macosx/config-files/qte-2.3.7/darwin-generic-g++-shared
index 18d3b15..ebeabfc 100644
--- a/development/macosx/darwin-g++-shared
+++ b/development/macosx/config-files/qte-2.3.7/darwin-generic-g++-shared
@@ -6,6 +6,7 @@ DASHCROSS =
6 6
7# Compiling with support libraries 7# Compiling with support libraries
8 SYSCONF_CXXFLAGS_X11= -I/usr/X11R6/include -I/usr/X11R6/include/freetype2 8 SYSCONF_CXXFLAGS_X11= -I/usr/X11R6/include
9 SYSCONF_CXXFLAGS_QT= -I$(QTDIR)/include 9 SYSCONF_CXXFLAGS_QT= -I$(QTDIR)/include
10 SYSCONF_CXXFLAGS_QTOPIA= -I$(QPEDIR)/include
10 SYSCONF_CXXFLAGS_OPENGL= -I/usr/X11R6/include 11 SYSCONF_CXXFLAGS_OPENGL= -I/usr/X11R6/include
11 12
@@ -16,14 +17,17 @@ SYSCONF_CXXFLAGS_YACC = -Wno-unused -Wno-parentheses
16 SYSCONF_RPATH_X11= -L/usr/X11R6/lib 17 SYSCONF_RPATH_X11= -L/usr/X11R6/lib
17 SYSCONF_RPATH_QT= -L$(QTDIR)/lib 18 SYSCONF_RPATH_QT= -L$(QTDIR)/lib
19 SYSCONF_RPATH_QTOPIA= -L$(QPEDIR)/lib
18 SYSCONF_RPATH_OPENGL= -L/usr/X11R6/lib 20 SYSCONF_RPATH_OPENGL= -L/usr/X11R6/lib
19 21
20# Linking with support libraries 22# Linking with support libraries
21# X11 23# X11
22 SYSCONF_LFLAGS_X11= -L/usr/X11R6/lib 24 SYSCONF_LFLAGS_X11= -L/usr/X11R6/lib
23 SYSCONF_LIBS_X11= -lXext -lX11 -lm 25 SYSCONF_LIBS_X11=
24# Qt, Qt+OpenGL 26# Qt, Qt+OpenGL
25 SYSCONF_LFLAGS_QT= -L$(QTDIR)/lib 27 SYSCONF_LFLAGS_QT= -L$(QTDIR)/lib
26 SYSCONF_LIBS_QT = -lqt$(QT_THREAD_SUFFIX) 28 SYSCONF_LFLAGS_QTOPIA= -L$(QPEDIR)/lib
29 SYSCONF_LIBS_QT = -lqte$(QT_THREAD_SUFFIX)
27 SYSCONF_LIBS_QT_OPENGL= 30 SYSCONF_LIBS_QT_OPENGL=
31 SYSCONF_LIBS_QTOPIA= -lqtopia
28# OpenGL 32# OpenGL
29 SYSCONF_LFLAGS_OPENGL= -L/usr/X11R6/lib 33 SYSCONF_LFLAGS_OPENGL= -L/usr/X11R6/lib
@@ -59,5 +63,5 @@ SYSCONF_UIC = $(QTDIR)/bin/uic
59 SYSCONF_LINK_SHLIB= g++ 63 SYSCONF_LINK_SHLIB= g++
60 SYSCONF_LINK_TARGET_SHARED= lib$(TARGET).dylib.$(VER_MAJ).$(VER_MIN).$(VER_PATCH) 64 SYSCONF_LINK_TARGET_SHARED= lib$(TARGET).dylib.$(VER_MAJ).$(VER_MIN).$(VER_PATCH)
61 SYSCONF_LINK_LIB_SHARED= $(SYSCONF_LINK_SHLIB) -dynamiclib \ 65 SYSCONF_LINK_LIB_SHARED= $(SYSCONF_LINK_SHLIB) -dynamiclib \
62 $(LFLAGS) -o $(SYSCONF_LINK_TARGET_SHARED) \ 66 $(LFLAGS) -o $(SYSCONF_LINK_TARGET_SHARED) \
63 $(OBJECTS) $(OBJMOC) $(LIBS) && \ 67 $(OBJECTS) $(OBJMOC) $(LIBS) && \
@@ -78,5 +82,5 @@ SYSCONF_LINK_LIB_STATIC = rm -f $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) ; \
78 $(SYSCONF_AR) $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) $(OBJECTS) $(OBJMOC) 82 $(SYSCONF_AR) $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) $(OBJECTS) $(OBJMOC)
79# Compiling application source 83# Compiling application source
80 SYSCONF_CXXFLAGS= -pipe -fno-exceptions -O2 -Wall -W 84 SYSCONF_CXXFLAGS= -pipe -fno-exceptions -DQWS -fno-rtti -fno-exceptions -DQT_NO_QWS_LINUXFB -DQT_NO_QWS_TRANSFORMED -O0 -Wall -W -DNO_DEBUG
81 SYSCONF_CFLAGS = -pipe -fno-exceptions -O2 -Wall -W 85 SYSCONF_CFLAGS = -pipe -fno-exceptions -O2 -Wall -W
82# Default link type (static linking is still be used where required) 86# Default link type (static linking is still be used where required)