author | kergoth <kergoth> | 2002-11-06 04:50:40 (UTC) |
---|---|---|
committer | kergoth <kergoth> | 2002-11-06 04:50:40 (UTC) |
commit | 21f27ec4a1f18321ac00d28d93cb1cb7dc957d1f (patch) (unidiff) | |
tree | bbe53dd1f3749541be4f1616f20d9a0d9ee6ea0b /configs | |
parent | ac1509552bf764ff136690e0e7014d37a59d073e (diff) | |
download | opie-21f27ec4a1f18321ac00d28d93cb1cb7dc957d1f.zip opie-21f27ec4a1f18321ac00d28d93cb1cb7dc957d1f.tar.gz opie-21f27ec4a1f18321ac00d28d93cb1cb7dc957d1f.tar.bz2 |
Changing sharp define. if someone doesnt like it, let me know :)
-rw-r--r-- | configs/linux-sharp-g++-shared | 2 | ||||
-rw-r--r-- | configs/linux-sharp-g++-shared-debug | 2 | ||||
-rw-r--r-- | configs/linux-sharp-g++-static | 2 | ||||
-rw-r--r-- | configs/linux-sharp-g++-static-debug | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/configs/linux-sharp-g++-shared b/configs/linux-sharp-g++-shared index 9c1dd03..862ee34 100644 --- a/configs/linux-sharp-g++-shared +++ b/configs/linux-sharp-g++-shared | |||
@@ -32,63 +32,63 @@ 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 = | 36 | SYSCONF_LFLAGS = |
37 | SYSCONF_LIBS = | 37 | SYSCONF_LIBS = |
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 |
76 | SYSCONF_LINK_TARGET_STATIC = lib$(TARGET).a | 76 | SYSCONF_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_EBX -DQT_QWS_CUSTOM -DQWS -fno-exceptions -fno-rtti -O2 -Wall -W | 80 | SYSCONF_CXXFLAGS= -pipe -DQT_QWS_EBX -DQT_QWS_SHARP -DQWS -fno-exceptions -fno-rtti -O2 -Wall -W |
81 | SYSCONF_CFLAGS = -pipe -O2 -Wall -W | 81 | SYSCONF_CFLAGS = -pipe -O2 -Wall -W |
82 | # Default link type (static linking is still be used where required) | 82 | # Default link type (static linking is still be used where required) |
83 | SYSCONF_LINK_LIB= $(SYSCONF_LINK_LIB_SHARED) | 83 | SYSCONF_LINK_LIB= $(SYSCONF_LINK_LIB_SHARED) |
84 | SYSCONF_LINK_TARGET= $(SYSCONF_LINK_TARGET_SHARED) | 84 | SYSCONF_LINK_TARGET= $(SYSCONF_LINK_TARGET_SHARED) |
85 | # Compiling library source | 85 | # Compiling library source |
86 | SYSCONF_CXXFLAGS_LIB= -fPIC | 86 | SYSCONF_CXXFLAGS_LIB= -fPIC |
87 | SYSCONF_CFLAGS_LIB= -fPIC | 87 | SYSCONF_CFLAGS_LIB= -fPIC |
88 | # Compiling shared-object source | 88 | # Compiling shared-object source |
89 | SYSCONF_CXXFLAGS_SHOBJ= -fPIC | 89 | SYSCONF_CXXFLAGS_SHOBJ= -fPIC |
90 | SYSCONF_CFLAGS_SHOBJ= -fPIC | 90 | SYSCONF_CFLAGS_SHOBJ= -fPIC |
91 | # Linking Qt | 91 | # Linking Qt |
92 | SYSCONF_LIBS_QTLIB= $(SYSCONF_LFLAGS_X11) $(QT_LIBS_MT) $(QT_LIBS_OPT) | 92 | SYSCONF_LIBS_QTLIB= $(SYSCONF_LFLAGS_X11) $(QT_LIBS_MT) $(QT_LIBS_OPT) |
93 | # Linking Qt applications | 93 | # Linking Qt applications |
94 | SYSCONF_LIBS_QTAPP= | 94 | SYSCONF_LIBS_QTAPP= |
diff --git a/configs/linux-sharp-g++-shared-debug b/configs/linux-sharp-g++-shared-debug index 810eef5..5e7819c 100644 --- a/configs/linux-sharp-g++-shared-debug +++ b/configs/linux-sharp-g++-shared-debug | |||
@@ -32,63 +32,63 @@ 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 = | 36 | SYSCONF_LFLAGS = |
37 | SYSCONF_LIBS = | 37 | SYSCONF_LIBS = |
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 |
76 | SYSCONF_LINK_TARGET_STATIC = lib$(TARGET).a | 76 | SYSCONF_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_EBX -DQT_QWS_CUSTOM -DQWS -fno-exceptions -fno-rtti -g -Wall -W | 80 | SYSCONF_CXXFLAGS= -pipe -DQT_QWS_EBX -DQT_QWS_SHARP -DQWS -fno-exceptions -fno-rtti -g -Wall -W |
81 | SYSCONF_CFLAGS = -pipe -g -Wall -W | 81 | SYSCONF_CFLAGS = -pipe -g -Wall -W |
82 | # Default link type (static linking is still be used where required) | 82 | # Default link type (static linking is still be used where required) |
83 | SYSCONF_LINK_LIB= $(SYSCONF_LINK_LIB_SHARED) | 83 | SYSCONF_LINK_LIB= $(SYSCONF_LINK_LIB_SHARED) |
84 | SYSCONF_LINK_TARGET= $(SYSCONF_LINK_TARGET_SHARED) | 84 | SYSCONF_LINK_TARGET= $(SYSCONF_LINK_TARGET_SHARED) |
85 | # Compiling library source | 85 | # Compiling library source |
86 | SYSCONF_CXXFLAGS_LIB= -fPIC | 86 | SYSCONF_CXXFLAGS_LIB= -fPIC |
87 | SYSCONF_CFLAGS_LIB= -fPIC | 87 | SYSCONF_CFLAGS_LIB= -fPIC |
88 | # Compiling shared-object source | 88 | # Compiling shared-object source |
89 | SYSCONF_CXXFLAGS_SHOBJ= -fPIC | 89 | SYSCONF_CXXFLAGS_SHOBJ= -fPIC |
90 | SYSCONF_CFLAGS_SHOBJ= -fPIC | 90 | SYSCONF_CFLAGS_SHOBJ= -fPIC |
91 | # Linking Qt | 91 | # Linking Qt |
92 | SYSCONF_LIBS_QTLIB= $(SYSCONF_LFLAGS_X11) $(QT_LIBS_MT) $(QT_LIBS_OPT) | 92 | SYSCONF_LIBS_QTLIB= $(SYSCONF_LFLAGS_X11) $(QT_LIBS_MT) $(QT_LIBS_OPT) |
93 | # Linking Qt applications | 93 | # Linking Qt applications |
94 | SYSCONF_LIBS_QTAPP= | 94 | SYSCONF_LIBS_QTAPP= |
diff --git a/configs/linux-sharp-g++-static b/configs/linux-sharp-g++-static index 15e4c7f..22d3d04 100644 --- a/configs/linux-sharp-g++-static +++ b/configs/linux-sharp-g++-static | |||
@@ -32,62 +32,62 @@ 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 = | 36 | SYSCONF_LFLAGS = |
37 | SYSCONF_LIBS = | 37 | SYSCONF_LIBS = |
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 |
76 | SYSCONF_LINK_TARGET_STATIC = lib$(TARGET).a | 76 | SYSCONF_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_EBX -DQT_QWS_CUSTOM -DQWS -fno-exceptions -fno-rtti -O2 -Wall -W | 80 | SYSCONF_CXXFLAGS= -pipe -DQT_QWS_EBX -DQT_QWS_SHARP -DQWS -fno-exceptions -fno-rtti -O2 -Wall -W |
81 | SYSCONF_CFLAGS = -pipe -O2 -Wall -W | 81 | SYSCONF_CFLAGS = -pipe -O2 -Wall -W |
82 | SYSCONF_LINK_LIB= $(SYSCONF_LINK_LIB_STATIC) | 82 | SYSCONF_LINK_LIB= $(SYSCONF_LINK_LIB_STATIC) |
83 | SYSCONF_LINK_TARGET= $(SYSCONF_LINK_TARGET_STATIC) | 83 | SYSCONF_LINK_TARGET= $(SYSCONF_LINK_TARGET_STATIC) |
84 | # Compiling library source | 84 | # Compiling library source |
85 | SYSCONF_CXXFLAGS_LIB= | 85 | SYSCONF_CXXFLAGS_LIB= |
86 | SYSCONF_CFLAGS_LIB= | 86 | SYSCONF_CFLAGS_LIB= |
87 | # Compiling shared-object source | 87 | # Compiling shared-object source |
88 | SYSCONF_CXXFLAGS_SHOBJ= -fPIC | 88 | SYSCONF_CXXFLAGS_SHOBJ= -fPIC |
89 | SYSCONF_CFLAGS_SHOBJ= -fPIC | 89 | SYSCONF_CFLAGS_SHOBJ= -fPIC |
90 | # Linking Qt | 90 | # Linking Qt |
91 | SYSCONF_LIBS_QTLIB= $(SYSCONF_CXXFLAGS_X11) $(QT_LIBS_MT) $(QT_LIBS_OPT) | 91 | SYSCONF_LIBS_QTLIB= $(SYSCONF_CXXFLAGS_X11) $(QT_LIBS_MT) $(QT_LIBS_OPT) |
92 | # Linking Qt applications | 92 | # Linking Qt applications |
93 | SYSCONF_LIBS_QTAPP= $(SYSCONF_LFLAGS_X11) $(SYSCONF_CXXFLAGS_X11) $(QT_LIBS_MT) $(QT_LIBS_OPT) $(SYSCONF_LIBS_X11) | 93 | SYSCONF_LIBS_QTAPP= $(SYSCONF_LFLAGS_X11) $(SYSCONF_CXXFLAGS_X11) $(QT_LIBS_MT) $(QT_LIBS_OPT) $(SYSCONF_LIBS_X11) |
diff --git a/configs/linux-sharp-g++-static-debug b/configs/linux-sharp-g++-static-debug index d7715ed..9c1afd3 100644 --- a/configs/linux-sharp-g++-static-debug +++ b/configs/linux-sharp-g++-static-debug | |||
@@ -32,62 +32,62 @@ 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 = | 36 | SYSCONF_LFLAGS = |
37 | SYSCONF_LIBS = | 37 | SYSCONF_LIBS = |
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 |
76 | SYSCONF_LINK_TARGET_STATIC = lib$(TARGET).a | 76 | SYSCONF_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_EBX -DQT_QWS_CUSTOM -DQWS -fno-exceptions -fno-rtti -g -Wall -W | 80 | SYSCONF_CXXFLAGS= -pipe -DQT_QWS_EBX -DQT_QWS_SHARP -DQWS -fno-exceptions -fno-rtti -g -Wall -W |
81 | SYSCONF_CFLAGS = -pipe -g -Wall -W | 81 | SYSCONF_CFLAGS = -pipe -g -Wall -W |
82 | SYSCONF_LINK_LIB= $(SYSCONF_LINK_LIB_STATIC) | 82 | SYSCONF_LINK_LIB= $(SYSCONF_LINK_LIB_STATIC) |
83 | SYSCONF_LINK_TARGET= $(SYSCONF_LINK_TARGET_STATIC) | 83 | SYSCONF_LINK_TARGET= $(SYSCONF_LINK_TARGET_STATIC) |
84 | # Compiling library source | 84 | # Compiling library source |
85 | SYSCONF_CXXFLAGS_LIB= | 85 | SYSCONF_CXXFLAGS_LIB= |
86 | SYSCONF_CFLAGS_LIB= | 86 | SYSCONF_CFLAGS_LIB= |
87 | # Compiling shared-object source | 87 | # Compiling shared-object source |
88 | SYSCONF_CXXFLAGS_SHOBJ= -fPIC | 88 | SYSCONF_CXXFLAGS_SHOBJ= -fPIC |
89 | SYSCONF_CFLAGS_SHOBJ= -fPIC | 89 | SYSCONF_CFLAGS_SHOBJ= -fPIC |
90 | # Linking Qt | 90 | # Linking Qt |
91 | SYSCONF_LIBS_QTLIB= $(SYSCONF_CXXFLAGS_X11) $(QT_LIBS_MT) $(QT_LIBS_OPT) | 91 | SYSCONF_LIBS_QTLIB= $(SYSCONF_CXXFLAGS_X11) $(QT_LIBS_MT) $(QT_LIBS_OPT) |
92 | # Linking Qt applications | 92 | # Linking Qt applications |
93 | SYSCONF_LIBS_QTAPP= $(SYSCONF_LFLAGS_X11) $(SYSCONF_CXXFLAGS_X11) $(QT_LIBS_MT) $(QT_LIBS_OPT) $(SYSCONF_LIBS_X11) | 93 | SYSCONF_LIBS_QTAPP= $(SYSCONF_LFLAGS_X11) $(SYSCONF_CXXFLAGS_X11) $(QT_LIBS_MT) $(QT_LIBS_OPT) $(SYSCONF_LIBS_X11) |