summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--configs/linux-ipaq-g++-optimized-shared2
1 files changed, 1 insertions, 1 deletions
diff --git a/configs/linux-ipaq-g++-optimized-shared b/configs/linux-ipaq-g++-optimized-shared
index dbeacfd..6be6f1f 100644
--- a/configs/linux-ipaq-g++-optimized-shared
+++ b/configs/linux-ipaq-g++-optimized-shared
@@ -32,64 +32,64 @@ SYSCONF_LIBS_OPENGL =
32 SYSCONF_LIBS_YACC= 32 SYSCONF_LIBS_YACC=
33 33
34# Linking applications 34# Linking applications
35 SYSCONF_LINK = arm-linux-gcc 35 SYSCONF_LINK = arm-linux-gcc
36 SYSCONF_LFLAGS = -L/usr/local/arm/2.95.3/lib 36 SYSCONF_LFLAGS = -L/usr/local/arm/2.95.3/lib
37 SYSCONF_LIBS = -ljpeg 37 SYSCONF_LIBS = -ljpeg
38 38
39# Link flags for shared objects 39# Link flags for shared objects
40 SYSCONF_LFLAGS_SHOBJ= -shared 40 SYSCONF_LFLAGS_SHOBJ= -shared
41 41
42# Flags for threading 42# Flags for threading
43 SYSCONF_CFLAGS_THREAD= -D_REENTRANT 43 SYSCONF_CFLAGS_THREAD= -D_REENTRANT
44 SYSCONF_CXXFLAGS_THREAD= -D_REENTRANT 44 SYSCONF_CXXFLAGS_THREAD= -D_REENTRANT
45 SYSCONF_LFLAGS_THREAD= 45 SYSCONF_LFLAGS_THREAD=
46 SYSCONF_LIBS_THREAD= -lpthread 46 SYSCONF_LIBS_THREAD= -lpthread
47 47
48# Meta-object compiler 48# Meta-object compiler
49 SYSCONF_MOC = $(QTDIR)/bin/moc 49 SYSCONF_MOC = $(QTDIR)/bin/moc
50 50
51# UI compiler 51# UI compiler
52 SYSCONF_UIC = $(QTDIR)/bin/uic 52 SYSCONF_UIC = $(QTDIR)/bin/uic
53 53
54# Linking shared libraries 54# Linking shared libraries
55# - Build the $(TARGET) library, eg. lib$(TARGET).so.2.2.2 55# - Build the $(TARGET) library, eg. lib$(TARGET).so.2.2.2
56# - Place target in $(DESTDIR) - which has a trailing / 56# - Place target in $(DESTDIR) - which has a trailing /
57# - Usually needs to incorporate $(VER_MAJ), $(VER_MIN) and $(VER_PATCH) 57# - Usually needs to incorporate $(VER_MAJ), $(VER_MIN) and $(VER_PATCH)
58# 58#
59 SYSCONF_LINK_SHLIB= arm-linux-gcc 59 SYSCONF_LINK_SHLIB= arm-linux-gcc
60 SYSCONF_LINK_TARGET_SHARED= lib$(TARGET).so.$(VER_MAJ).$(VER_MIN).$(VER_PATCH) 60 SYSCONF_LINK_TARGET_SHARED= lib$(TARGET).so.$(VER_MAJ).$(VER_MIN).$(VER_PATCH)
61 SYSCONF_LINK_LIB_SHARED= $(SYSCONF_LINK_SHLIB) -shared -Wl,-soname,lib$(TARGET).so.$(VER_MAJ) \ 61 SYSCONF_LINK_LIB_SHARED= $(SYSCONF_LINK_SHLIB) -shared -Wl,-soname,lib$(TARGET).so.$(VER_MAJ) \
62 $(LFLAGS) -o $(SYSCONF_LINK_TARGET_SHARED) \ 62 $(LFLAGS) -o $(SYSCONF_LINK_TARGET_SHARED) \
63 $(OBJECTS) $(OBJMOC) $(LIBS) && \ 63 $(OBJECTS) $(OBJMOC) $(LIBS) && \
64 mv $(SYSCONF_LINK_TARGET_SHARED) $(DESTDIR); \ 64 mv $(SYSCONF_LINK_TARGET_SHARED) $(DESTDIR); \
65 cd $(DESTDIR) && \ 65 cd $(DESTDIR) && \
66 rm -f lib$(TARGET).so lib$(TARGET).so.$(VER_MAJ) lib$(TARGET).so.$(VER_MAJ).$(VER_MIN); \ 66 rm -f lib$(TARGET).so lib$(TARGET).so.$(VER_MAJ) lib$(TARGET).so.$(VER_MAJ).$(VER_MIN); \
67 ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so; \ 67 ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so; \
68 ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so.$(VER_MAJ); \ 68 ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so.$(VER_MAJ); \
69 ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so.$(VER_MAJ).$(VER_MIN) 69 ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so.$(VER_MAJ).$(VER_MIN)
70 70
71# Linking static libraries 71# Linking static libraries
72# - Build the $(TARGET) library, eg. lib$(TARGET).a 72# - Build the $(TARGET) library, eg. lib$(TARGET).a
73# - Place target in $(DESTDIR) - which has a trailing / 73# - Place target in $(DESTDIR) - which has a trailing /
74# 74#
75 SYSCONF_AR = arm-linux-ar cqs 75 SYSCONF_AR = arm-linux-ar cqs
76SYSCONF_LINK_TARGET_STATIC = lib$(TARGET).a 76SYSCONF_LINK_TARGET_STATIC = lib$(TARGET).a
77 SYSCONF_LINK_LIB_STATIC= rm -f $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) ; \ 77 SYSCONF_LINK_LIB_STATIC= rm -f $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) ; \
78 $(SYSCONF_AR) $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) $(OBJECTS) $(OBJMOC) 78 $(SYSCONF_AR) $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) $(OBJECTS) $(OBJMOC)
79# Compiling application source 79# Compiling application source
80 SYSCONF_CXXFLAGS= -pipe -DQT_QWS_IPAQ -DQWS -fno-exceptions -fno-rtti -Wall -W -march=armv4 -mtune=strongarm1100 -mapcs-32 -fexpensive-optimizations -fomit-frame-pointer -O3 80 SYSCONF_CXXFLAGS= -pipe -DQT_QWS_IPAQ -DQWS -fno-exceptions -fno-rtti -Wall -W -march=armv4 -mtune=strongarm1100 -mapcs-32 -fexpensive-optimizations -fomit-frame-pointer -O2
81 SYSCONF_CFLAGS = -pipe -Wall -W -march=armv4 -mtune=strongarm1100 -mapcs-32 -fexpensive-optimizations -fomit-frame-pointer -O3 81 SYSCONF_CFLAGS = -pipe -Wall -W -march=armv4 -mtune=strongarm1100 -mapcs-32 -fexpensive-optimizations -fomit-frame-pointer -O3
82 82
83# Default link type (static linking is still be used where required) 83# Default link type (static linking is still be used where required)
84 SYSCONF_LINK_LIB= $(SYSCONF_LINK_LIB_SHARED) 84 SYSCONF_LINK_LIB= $(SYSCONF_LINK_LIB_SHARED)
85 SYSCONF_LINK_TARGET= $(SYSCONF_LINK_TARGET_SHARED) 85 SYSCONF_LINK_TARGET= $(SYSCONF_LINK_TARGET_SHARED)
86# Compiling library source 86# Compiling library source
87 SYSCONF_CXXFLAGS_LIB= -fPIC 87 SYSCONF_CXXFLAGS_LIB= -fPIC
88 SYSCONF_CFLAGS_LIB= -fPIC 88 SYSCONF_CFLAGS_LIB= -fPIC
89# Compiling shared-object source 89# Compiling shared-object source
90 SYSCONF_CXXFLAGS_SHOBJ= -fPIC 90 SYSCONF_CXXFLAGS_SHOBJ= -fPIC
91 SYSCONF_CFLAGS_SHOBJ= -fPIC 91 SYSCONF_CFLAGS_SHOBJ= -fPIC
92# Linking Qt 92# Linking Qt
93 SYSCONF_LIBS_QTLIB= $(SYSCONF_LFLAGS_X11) $(QT_LIBS_MT) $(QT_LIBS_OPT) 93 SYSCONF_LIBS_QTLIB= $(SYSCONF_LFLAGS_X11) $(QT_LIBS_MT) $(QT_LIBS_OPT)
94# Linking Qt applications 94# Linking Qt applications
95 SYSCONF_LIBS_QTAPP= 95 SYSCONF_LIBS_QTAPP=