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
@@ -34,20 +34,22 @@ Before compiling for MacOS-X, you need the following:
34 1. X11-Server+X11SDK (Provided by Apple) 34 1. X11-Server+X11SDK (Provided by Apple)
35 2. QT-2.3.2 for X11 (Provided by Trolltech) 35 2. QT-2.3.2 for X11 (Provided by Trolltech)
36 3. QT/E-2.3.7 (Provided by Trolltech) 36 3. QT/E-2.3.7 (Provided by Trolltech)
37 4. Patches for QT-2.3.2 for MacOSX (take the one in this directory !) 37 4. Patches for QT-2.3.2 for MacOSX (take the one in this directory !)
38 5. Patches for QT/E-2.3.7 for MacOSX (take the one, provided in $OPIEDIR/qt) 38 5. Patches for QT/E-2.3.7 for MacOSX (take the one, provided in $OPIEDIR/qt)
39 39
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
48opie. 50opie.
49 51
50HOWTO COMPILE: 52HOWTO COMPILE:
51------------- 53-------------
52 54
53Compile QT-2.3.2: 55Compile QT-2.3.2:
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
@@ -1,35 +1,39 @@
1# Compiling 1# Compiling
2 INTERFACE_DECL_PATH = . 2 INTERFACE_DECL_PATH = .
3 SYSCONF_CXX = g++ 3 SYSCONF_CXX = g++
4 SYSCONF_CC = gcc 4 SYSCONF_CC = gcc
5 DASHCROSS = 5 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
12# Compiling YACC output 13# Compiling YACC output
13SYSCONF_CXXFLAGS_YACC = -Wno-unused -Wno-parentheses 14SYSCONF_CXXFLAGS_YACC = -Wno-unused -Wno-parentheses
14 15
15# Linking with support libraries 16# Linking with support libraries
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
30 SYSCONF_LIBS_OPENGL= -lGLU -lGL -lXmu 34 SYSCONF_LIBS_OPENGL= -lGLU -lGL -lXmu
31# Yacc 35# Yacc
32 SYSCONF_LIBS_YACC= 36 SYSCONF_LIBS_YACC=
33 37
34# Linking applications 38# Linking applications
35 SYSCONF_LINK = g++ 39 SYSCONF_LINK = g++
@@ -53,17 +57,17 @@ SYSCONF_UIC = $(QTDIR)/bin/uic
53 57
54# Linking shared libraries 58# Linking shared libraries
55# - Build the $(TARGET) library, eg. lib$(TARGET).so.2.2.2 59# - Build the $(TARGET) library, eg. lib$(TARGET).so.2.2.2
56# - Place target in $(DESTDIR) - which has a trailing / 60# - Place target in $(DESTDIR) - which has a trailing /
57# - Usually needs to incorporate $(VER_MAJ), $(VER_MIN) and $(VER_PATCH) 61# - Usually needs to incorporate $(VER_MAJ), $(VER_MIN) and $(VER_PATCH)
58# 62#
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) && \
64 mv $(SYSCONF_LINK_TARGET_SHARED) $(DESTDIR); \ 68 mv $(SYSCONF_LINK_TARGET_SHARED) $(DESTDIR); \
65 cd $(DESTDIR) && \ 69 cd $(DESTDIR) && \
66 rm -f lib$(TARGET).dylib lib$(TARGET).dylib.$(VER_MAJ) lib$(TARGET).dylib.$(VER_MAJ).$(VER_MIN); \ 70 rm -f lib$(TARGET).dylib lib$(TARGET).dylib.$(VER_MAJ) lib$(TARGET).dylib.$(VER_MAJ).$(VER_MIN); \
67 ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).dylib; \ 71 ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).dylib; \
68 ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).dylib.$(VER_MAJ); \ 72 ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).dylib.$(VER_MAJ); \
69 ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).dylib.$(VER_MAJ).$(VER_MIN) 73 ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).dylib.$(VER_MAJ).$(VER_MIN)
@@ -72,17 +76,17 @@ SYSCONF_LINK_LIB_SHARED = $(SYSCONF_LINK_SHLIB) -dynamiclib \
72# - Build the $(TARGET) library, eg. lib$(TARGET).a 76# - Build the $(TARGET) library, eg. lib$(TARGET).a
73# - Place target in $(DESTDIR) - which has a trailing / 77# - Place target in $(DESTDIR) - which has a trailing /
74# 78#
75 SYSCONF_AR = ar cqs 79 SYSCONF_AR = ar cqs
76SYSCONF_LINK_TARGET_STATIC = lib$(TARGET).a 80SYSCONF_LINK_TARGET_STATIC = lib$(TARGET).a
77 SYSCONF_LINK_LIB_STATIC= rm -f $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) ; \ 81 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)
83 SYSCONF_LINK_LIB= $(SYSCONF_LINK_LIB_SHARED) 87 SYSCONF_LINK_LIB= $(SYSCONF_LINK_LIB_SHARED)
84 SYSCONF_LINK_TARGET= $(SYSCONF_LINK_TARGET_SHARED) 88 SYSCONF_LINK_TARGET= $(SYSCONF_LINK_TARGET_SHARED)
85# Compiling library source 89# Compiling library source
86 SYSCONF_CXXFLAGS_LIB= -fPIC 90 SYSCONF_CXXFLAGS_LIB= -fPIC
87 SYSCONF_CFLAGS_LIB= -fPIC 91 SYSCONF_CFLAGS_LIB= -fPIC
88# Compiling shared-object source 92# Compiling shared-object source