ramses got rid of libts for now

author: schurig <schurig> 2003-07-09 09:48:12 (UTC)
committer: schurig <schurig> 2003-07-09 09:48:12 (UTC)
commit: 04ee3c01c1d048f3f35077a17d1505781071f6db (patch) (unidiff)
tree: 7262553e138aa96afe53dca42d18a73f22b9bc00
parent: ac5c2cf6d83d22833d1311a8ff7d10a918876c2f (diff)
download: opie-04ee3c01c1d048f3f35077a17d1505781071f6db.zip
opie-04ee3c01c1d048f3f35077a17d1505781071f6db.tar.gz
opie-04ee3c01c1d048f3f35077a17d1505781071f6db.tar.bz2
1 files changed, 1 insertions, 1 deletions
diff --git a/mkspecs/qws/linux-ramses-g++/qmake.conf b/mkspecs/qws/linux-ramses-g++/qmake.conf
index 955b3ee..612c7a4 100644
--- a/mkspecs/qws/linux-ramses-g++/qmake.conf
+++ b/mkspecs/qws/linux-ramses-g++/qmake.conf
@@ -21,63 +21,63 @@ QMAKE_LEXFLAGS		=
        QMAKE_YACC      = yacc
        QMAKE_YACCFLAGS         = -d
        QMAKE_CFLAGS    = -I$$STAGING_INC -pipe $(CFLAGS_EXTRA)
        QMAKE_CFLAGS_WARN_ON= -Wall -W
        QMAKE_CFLAGS_WARN_OFF=
        QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2)
        QMAKE_CFLAGS_DEBUG= -g
        QMAKE_CFLAGS_SHLIB= -fPIC
        QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses
        QMAKE_CFLAGS_THREAD= -D_REENTRANT
        QMAKE_CXX       = ccache arm-linux-g++ -DQT_QWS_RAMSES -DQT_QWS_DEVFS -DQT_QWS_CUSTOM
        QMAKE_CXXFLAGS  = $$QMAKE_CFLAGS  -DQWS -fno-exceptions -fno-rtti $(CXXFLAGS_EXTRA)
        QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON
        QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF
        QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE
        QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG
        QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB
        QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC
        QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD
        QMAKE_INCDIR    =
        QMAKE_LIBDIR    =
        QMAKE_INCDIR_X11= 
        QMAKE_LIBDIR_X11= 
        QMAKE_INCDIR_QT         = $(QTDIR)/include
        QMAKE_LIBDIR_QT         = $(QTDIR)/lib
        QMAKE_INCDIR_OPENGL= /usr/X11R6/include
        QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib
        QMAKE_LINK      = arm-linux-gcc
        QMAKE_LINK_SHLIB= arm-linux-gcc
-        QMAKE_LFLAGS    = -L$$STAGING_LIB -Wl,-rpath,$$STAGING_LIB -Wl,-rpath-link,$$STAGING_LIB -lpng -ljpeg -lz -lts $(LFLAGS_EXTRA)
+        QMAKE_LFLAGS    = -L$$STAGING_LIB -Wl,-rpath,$$STAGING_LIB -Wl,-rpath-link,$$STAGING_LIB -lpng -ljpeg -lz $(LFLAGS_EXTRA)
        QMAKE_LFLAGS_RELEASE=
        QMAKE_LFLAGS_DEBUG=
 QMAKE_LFLAGS_SHLIB      = -shared
 QMAKE_LFLAGS_PLUGIN     = $$QMAKE_LFLAGS_SHLIB
 QMAKE_LFLAGS_SONAME     = -Wl,-soname,
 QMAKE_LFLAGS_THREAD     =
 QMAKE_RPATH             = -Wl,-rpath,
        QMAKE_LIBS      = $(LIBS_EXTRA)
 QMAKE_LIBS_DYNLOAD      = -ldl
        QMAKE_LIBS_X11  = 
        QMAKE_LIBS_X11SM= 
        QMAKE_LIBS_QT   = -lqte
 QMAKE_LIBS_QT_THREAD    = -lqte-mt
        QMAKE_LIBS_QT_OPENGL= -lqgl
 QMAKE_LIBS_THREAD       = -lpthread
        QMAKE_MOC       = $(QTDIR)/bin/moc
        QMAKE_UIC       = $(QTDIR)/bin/uic
        QMAKE_AR        = ar cqs
        QMAKE_RANLIB    =
        QMAKE_TAR       = tar -cf
        QMAKE_GZIP      = gzip -9f
        QMAKE_COPY      = cp -f
        QMAKE_MOVE      = mv -f
        QMAKE_DEL_FILE  = rm -f
        QMAKE_DEL_DIR   = rmdir
author	schurig <schurig>	2003-07-09 09:48:12 (UTC)
committer	schurig <schurig>	2003-07-09 09:48:12 (UTC)
commit	04ee3c01c1d048f3f35077a17d1505781071f6db (patch) (unidiff)
tree	7262553e138aa96afe53dca42d18a73f22b9bc00
parent	ac5c2cf6d83d22833d1311a8ff7d10a918876c2f (diff)
download	opie-04ee3c01c1d048f3f35077a17d1505781071f6db.zip opie-04ee3c01c1d048f3f35077a17d1505781071f6db.tar.gz opie-04ee3c01c1d048f3f35077a17d1505781071f6db.tar.bz2

diff --git a/mkspecs/qws/linux-ramses-g++/qmake.conf b/mkspecs/qws/linux-ramses-g++/qmake.conf index 955b3ee..612c7a4 100644 --- a/mkspecs/qws/linux-ramses-g++/qmake.conf +++ b/mkspecs/qws/linux-ramses-g++/qmake.conf
@@ -21,63 +21,63 @@ QMAKE_LEXFLAGS =
21	QMAKE_YACC = yacc	21	QMAKE_YACC = yacc
22	QMAKE_YACCFLAGS = -d	22	QMAKE_YACCFLAGS = -d
23	QMAKE_CFLAGS = -I$$STAGING_INC -pipe $(CFLAGS_EXTRA)	23	QMAKE_CFLAGS = -I$$STAGING_INC -pipe $(CFLAGS_EXTRA)
24	QMAKE_CFLAGS_WARN_ON= -Wall -W	24	QMAKE_CFLAGS_WARN_ON= -Wall -W
25	QMAKE_CFLAGS_WARN_OFF=	25	QMAKE_CFLAGS_WARN_OFF=
26	QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2)	26	QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2)
27	QMAKE_CFLAGS_DEBUG= -g	27	QMAKE_CFLAGS_DEBUG= -g
28	QMAKE_CFLAGS_SHLIB= -fPIC	28	QMAKE_CFLAGS_SHLIB= -fPIC
29	QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses	29	QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses
30	QMAKE_CFLAGS_THREAD= -D_REENTRANT	30	QMAKE_CFLAGS_THREAD= -D_REENTRANT
31		31
32	QMAKE_CXX = ccache arm-linux-g++ -DQT_QWS_RAMSES -DQT_QWS_DEVFS -DQT_QWS_CUSTOM	32	QMAKE_CXX = ccache arm-linux-g++ -DQT_QWS_RAMSES -DQT_QWS_DEVFS -DQT_QWS_CUSTOM
33	QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -DQWS -fno-exceptions -fno-rtti $(CXXFLAGS_EXTRA)	33	QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -DQWS -fno-exceptions -fno-rtti $(CXXFLAGS_EXTRA)
34	QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON	34	QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON
35	QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF	35	QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF
36	QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE	36	QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE
37	QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG	37	QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG
38	QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB	38	QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB
39	QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC	39	QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC
40	QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD	40	QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD
41		41
42	QMAKE_INCDIR =	42	QMAKE_INCDIR =
43	QMAKE_LIBDIR =	43	QMAKE_LIBDIR =
44	QMAKE_INCDIR_X11=	44	QMAKE_INCDIR_X11=
45	QMAKE_LIBDIR_X11=	45	QMAKE_LIBDIR_X11=
46	QMAKE_INCDIR_QT = $(QTDIR)/include	46	QMAKE_INCDIR_QT = $(QTDIR)/include
47	QMAKE_LIBDIR_QT = $(QTDIR)/lib	47	QMAKE_LIBDIR_QT = $(QTDIR)/lib
48	QMAKE_INCDIR_OPENGL= /usr/X11R6/include	48	QMAKE_INCDIR_OPENGL= /usr/X11R6/include
49	QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib	49	QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib
50		50
51	QMAKE_LINK = arm-linux-gcc	51	QMAKE_LINK = arm-linux-gcc
52	QMAKE_LINK_SHLIB= arm-linux-gcc	52	QMAKE_LINK_SHLIB= arm-linux-gcc
53	QMAKE_LFLAGS = -L$$STAGING_LIB -Wl,-rpath,$$STAGING_LIB -Wl,-rpath-link,$$STAGING_LIB -lpng -ljpeg -lz -lts $(LFLAGS_EXTRA)	53	QMAKE_LFLAGS = -L$$STAGING_LIB -Wl,-rpath,$$STAGING_LIB -Wl,-rpath-link,$$STAGING_LIB -lpng -ljpeg -lz $(LFLAGS_EXTRA)
54	QMAKE_LFLAGS_RELEASE=	54	QMAKE_LFLAGS_RELEASE=
55	QMAKE_LFLAGS_DEBUG=	55	QMAKE_LFLAGS_DEBUG=
56	QMAKE_LFLAGS_SHLIB = -shared	56	QMAKE_LFLAGS_SHLIB = -shared
57	QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB	57	QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB
58	QMAKE_LFLAGS_SONAME = -Wl,-soname,	58	QMAKE_LFLAGS_SONAME = -Wl,-soname,
59	QMAKE_LFLAGS_THREAD =	59	QMAKE_LFLAGS_THREAD =
60	QMAKE_RPATH = -Wl,-rpath,	60	QMAKE_RPATH = -Wl,-rpath,
61		61
62	QMAKE_LIBS = $(LIBS_EXTRA)	62	QMAKE_LIBS = $(LIBS_EXTRA)
63	QMAKE_LIBS_DYNLOAD = -ldl	63	QMAKE_LIBS_DYNLOAD = -ldl
64	QMAKE_LIBS_X11 =	64	QMAKE_LIBS_X11 =
65	QMAKE_LIBS_X11SM=	65	QMAKE_LIBS_X11SM=
66	QMAKE_LIBS_QT = -lqte	66	QMAKE_LIBS_QT = -lqte
67	QMAKE_LIBS_QT_THREAD = -lqte-mt	67	QMAKE_LIBS_QT_THREAD = -lqte-mt
68	QMAKE_LIBS_QT_OPENGL= -lqgl	68	QMAKE_LIBS_QT_OPENGL= -lqgl
69	QMAKE_LIBS_THREAD = -lpthread	69	QMAKE_LIBS_THREAD = -lpthread
70		70
71	QMAKE_MOC = $(QTDIR)/bin/moc	71	QMAKE_MOC = $(QTDIR)/bin/moc
72	QMAKE_UIC = $(QTDIR)/bin/uic	72	QMAKE_UIC = $(QTDIR)/bin/uic
73		73
74	QMAKE_AR = ar cqs	74	QMAKE_AR = ar cqs
75	QMAKE_RANLIB =	75	QMAKE_RANLIB =
76		76
77	QMAKE_TAR = tar -cf	77	QMAKE_TAR = tar -cf
78	QMAKE_GZIP = gzip -9f	78	QMAKE_GZIP = gzip -9f
79		79
80	QMAKE_COPY = cp -f	80	QMAKE_COPY = cp -f
81	QMAKE_MOVE = mv -f	81	QMAKE_MOVE = mv -f
82	QMAKE_DEL_FILE = rm -f	82	QMAKE_DEL_FILE = rm -f
83	QMAKE_DEL_DIR = rmdir	83	QMAKE_DEL_DIR = rmdir