author | eilers <eilers> | 2003-12-09 17:00:13 (UTC) |
---|---|---|
committer | eilers <eilers> | 2003-12-09 17:00:13 (UTC) |
commit | 80c495fe34b1528345458ec312de30b7b92139bd (patch) (unidiff) | |
tree | 79f45383663f73c4141a1aaec833ccc7fbe3522f /development | |
parent | 1999708f1480dbdd19e73671fbd9e422883839b6 (diff) | |
download | opie-80c495fe34b1528345458ec312de30b7b92139bd.zip opie-80c495fe34b1528345458ec312de30b7b92139bd.tar.gz opie-80c495fe34b1528345458ec312de30b7b92139bd.tar.bz2 |
File added which is missed in the patch.. See README_MACOSX for details...
-rw-r--r-- | development/macosx/README_MACOSX | 5 | ||||
-rw-r--r-- | development/macosx/darwin-g++-shared | 94 |
2 files changed, 98 insertions, 1 deletions
diff --git a/development/macosx/README_MACOSX b/development/macosx/README_MACOSX index 864f486..877e2f8 100644 --- a/development/macosx/README_MACOSX +++ b/development/macosx/README_MACOSX | |||
@@ -39,7 +39,10 @@ Before compiling for MacOS-X, you need the following: | |||
39 | 39 | ||
40 | The Patch for QT/E for Opie, including all other opie-patches is available in the | 40 | The Patch for QT/E for Opie, including all other opie-patches is available in the |
41 | qt-directory ($OPIEDIR/qt) and is called "qte237-all-macosx.patch". | 41 | qt-directory ($OPIEDIR/qt) and is called "qte237-all-macosx.patch". |
42 | The Patch for QT-2.3.2 is provided in this directory.. | 42 | |
43 | The Patch for QT-2.3.2 is provided in this directory and is called "qt232-X11.patch". | ||
44 | ATTENTION: The patch does not contain the darwin config file. Please copy the file | ||
45 | "darwin-g++-shared" into the directory "configs" within the qt-2.3.2 directory !! | ||
43 | 46 | ||
44 | If your buildsystem is working correctly, you should be able to build | 47 | If your buildsystem is working correctly, you should be able to build |
45 | opie. | 48 | opie. |
diff --git a/development/macosx/darwin-g++-shared b/development/macosx/darwin-g++-shared new file mode 100644 index 0000000..18d3b15 --- a/dev/null +++ b/development/macosx/darwin-g++-shared | |||
@@ -0,0 +1,94 @@ | |||
1 | # Compiling | ||
2 | INTERFACE_DECL_PATH = . | ||
3 | SYSCONF_CXX = g++ | ||
4 | SYSCONF_CC = gcc | ||
5 | DASHCROSS = | ||
6 | |||
7 | # Compiling with support libraries | ||
8 | SYSCONF_CXXFLAGS_X11= -I/usr/X11R6/include -I/usr/X11R6/include/freetype2 | ||
9 | SYSCONF_CXXFLAGS_QT= -I$(QTDIR)/include | ||
10 | SYSCONF_CXXFLAGS_OPENGL= -I/usr/X11R6/include | ||
11 | |||
12 | # Compiling YACC output | ||
13 | SYSCONF_CXXFLAGS_YACC = -Wno-unused -Wno-parentheses | ||
14 | |||
15 | # Linking with support libraries | ||
16 | SYSCONF_RPATH_X11= -L/usr/X11R6/lib | ||
17 | SYSCONF_RPATH_QT= -L$(QTDIR)/lib | ||
18 | SYSCONF_RPATH_OPENGL= -L/usr/X11R6/lib | ||
19 | |||
20 | # Linking with support libraries | ||
21 | # X11 | ||
22 | SYSCONF_LFLAGS_X11= -L/usr/X11R6/lib | ||
23 | SYSCONF_LIBS_X11= -lXext -lX11 -lm | ||
24 | # Qt, Qt+OpenGL | ||
25 | SYSCONF_LFLAGS_QT= -L$(QTDIR)/lib | ||
26 | SYSCONF_LIBS_QT = -lqt$(QT_THREAD_SUFFIX) | ||
27 | SYSCONF_LIBS_QT_OPENGL= | ||
28 | # OpenGL | ||
29 | SYSCONF_LFLAGS_OPENGL= -L/usr/X11R6/lib | ||
30 | SYSCONF_LIBS_OPENGL= -lGLU -lGL -lXmu | ||
31 | # Yacc | ||
32 | SYSCONF_LIBS_YACC= | ||
33 | |||
34 | # Linking applications | ||
35 | SYSCONF_LINK = g++ | ||
36 | SYSCONF_LFLAGS = | ||
37 | SYSCONF_LIBS = | ||
38 | |||
39 | # Link flags for shared objects | ||
40 | SYSCONF_LFLAGS_SHOBJ= -dynamiclib | ||
41 | |||
42 | # Flags for threading | ||
43 | SYSCONF_CFLAGS_THREAD= -pthread -D_THREAD_SAFE | ||
44 | SYSCONF_CXXFLAGS_THREAD= -pthread -D_THREAD_SAFE | ||
45 | SYSCONF_LFLAGS_THREAD= -pthread | ||
46 | SYSCONF_LIBS_THREAD= | ||
47 | |||
48 | # Meta-object compiler | ||
49 | SYSCONF_MOC = $(QTDIR)/bin/moc | ||
50 | |||
51 | # UI compiler | ||
52 | SYSCONF_UIC = $(QTDIR)/bin/uic | ||
53 | |||
54 | # Linking shared libraries | ||
55 | # - Build the $(TARGET) library, eg. lib$(TARGET).so.2.2.2 | ||
56 | # - Place target in $(DESTDIR) - which has a trailing / | ||
57 | # - Usually needs to incorporate $(VER_MAJ), $(VER_MIN) and $(VER_PATCH) | ||
58 | # | ||
59 | SYSCONF_LINK_SHLIB= g++ | ||
60 | SYSCONF_LINK_TARGET_SHARED= lib$(TARGET).dylib.$(VER_MAJ).$(VER_MIN).$(VER_PATCH) | ||
61 | SYSCONF_LINK_LIB_SHARED= $(SYSCONF_LINK_SHLIB) -dynamiclib \ | ||
62 | $(LFLAGS) -o $(SYSCONF_LINK_TARGET_SHARED) \ | ||
63 | $(OBJECTS) $(OBJMOC) $(LIBS) && \ | ||
64 | mv $(SYSCONF_LINK_TARGET_SHARED) $(DESTDIR); \ | ||
65 | cd $(DESTDIR) && \ | ||
66 | 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; \ | ||
68 | 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) | ||
70 | |||
71 | # Linking static libraries | ||
72 | # - Build the $(TARGET) library, eg. lib$(TARGET).a | ||
73 | # - Place target in $(DESTDIR) - which has a trailing / | ||
74 | # | ||
75 | SYSCONF_AR = ar cqs | ||
76 | SYSCONF_LINK_TARGET_STATIC = lib$(TARGET).a | ||
77 | SYSCONF_LINK_LIB_STATIC= rm -f $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) ; \ | ||
78 | $(SYSCONF_AR) $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) $(OBJECTS) $(OBJMOC) | ||
79 | # Compiling application source | ||
80 | SYSCONF_CXXFLAGS= -pipe -fno-exceptions -O2 -Wall -W | ||
81 | SYSCONF_CFLAGS = -pipe -fno-exceptions -O2 -Wall -W | ||
82 | # Default link type (static linking is still be used where required) | ||
83 | SYSCONF_LINK_LIB= $(SYSCONF_LINK_LIB_SHARED) | ||
84 | SYSCONF_LINK_TARGET= $(SYSCONF_LINK_TARGET_SHARED) | ||
85 | # Compiling library source | ||
86 | SYSCONF_CXXFLAGS_LIB= -fPIC | ||
87 | SYSCONF_CFLAGS_LIB= -fPIC | ||
88 | # Compiling shared-object source | ||
89 | SYSCONF_CXXFLAGS_SHOBJ= -fPIC | ||
90 | SYSCONF_CFLAGS_SHOBJ= -fPIC | ||
91 | # Linking Qt | ||
92 | SYSCONF_LIBS_QTLIB= $(SYSCONF_LFLAGS_X11) $(QT_LIBS_MT) $(QT_LIBS_OPT) | ||
93 | # Linking Qt applications | ||
94 | SYSCONF_LIBS_QTAPP= | ||