[Kde-cygwin-cvs] CVS: qt-3/mkspecs/cygwin-g++ qmake.conf,1.1.1.14,1.1.1.15 qplatformdefs.h,1.1.1.9,1.1.1.10

[Christian E. <che...@us...>]

Update of /cvsroot/kde-cygwin/qt-3/mkspecs/cygwin-g++
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6831/mkspecs/cygwin-g++

Modified Files:
      Tag: QT_WIN32_3_3_BRANCH
	qmake.conf qplatformdefs.h 
Log Message:
reapply patches which were lost during my not so good update to 3.3.5

Index: qmake.conf
===================================================================
RCS file: /cvsroot/kde-cygwin/qt-3/mkspecs/cygwin-g++/qmake.conf,v
retrieving revision 1.1.1.14
retrieving revision 1.1.1.15
diff -u -r1.1.1.14 -r1.1.1.15
--- qmake.conf	22 Sep 2005 12:58:56 -0000	1.1.1.14
+++ qmake.conf	30 Sep 2005 16:58:30 -0000	1.1.1.15
@@ -16,12 +16,13 @@
 QMAKE_LEXFLAGS		= 
 QMAKE_YACC		= byacc
 QMAKE_YACCFLAGS		= -d
-QMAKE_CFLAGS		= -pipe
+QMAKE_CFLAGS		= -pipe -fdata-sections 
 QMAKE_CFLAGS_DEPS	= -M
 QMAKE_CFLAGS_WARN_ON	= -Wall -W
 QMAKE_CFLAGS_WARN_OFF	= -w
 QMAKE_CFLAGS_RELEASE	= -O2
-QMAKE_CFLAGS_DEBUG	= -g
+QMAKE_CFLAGS_DEBUG	= -g #-pg -DQT_NO_INLINE_GLOBALSTRUT
+#add -pg -DQT_NO_INLINE_GLOBALSTRUT to activate profiling, required because -pg disables inline code 
 QMAKE_CFLAGS_SHLIB	=
 QMAKE_CFLAGS_YACC	= -Wno-unused -Wno-parentheses
 QMAKE_CFLAGS_THREAD	= -D_REENTRANT
@@ -48,19 +49,20 @@
 
 QMAKE_LINK		= g++
 QMAKE_LINK_SHLIB	= g++
-QMAKE_LFLAGS		=
-QMAKE_LFLAGS_RELEASE	=
-QMAKE_LFLAGS_DEBUG	=
+QMAKE_LFLAGS		= -Wl,--enable-runtime-pseudo-reloc -Wl,--script,$(QTDIR)/mkspecs/cygwin-g++/i386pe.x-no-rdata
+QMAKE_LFLAGS_RELEASE	= -s
+QMAKE_LFLAGS_DEBUG	= $$QMAKE_CFLAGS_DEBUG	
 QMAKE_LFLAGS_SHLIB	= -shared
 QMAKE_LFLAGS_PLUGIN	= $$QMAKE_LFLAGS_SHLIB
-QMAKE_LFLAGS_SONAME	= -Wl,-soname,
+QMAKE_LFLAGS_SONAME	= 
 QMAKE_LFLAGS_THREAD	=
-QMAKE_RPATH		= -Wl,-rpath,
+QMAKE_RPATH		= 
+
 QMAKE_CYGWIN_SHLIB	= 1
 QMAKE_CYGWIN_EXE	= 1
  
 QMAKE_LIBS		=
-QMAKE_LIBS_DYNLOAD	= -ldl
+QMAKE_LIBS_DYNLOAD	= 
 QMAKE_LIBS_X11		= -lXext -lX11
 QMAKE_LIBS_X11SM	= -lSM -lICE
 QMAKE_LIBS_QT		= -lqt

Index: qplatformdefs.h
===================================================================
RCS file: /cvsroot/kde-cygwin/qt-3/mkspecs/cygwin-g++/qplatformdefs.h,v
retrieving revision 1.1.1.9
retrieving revision 1.1.1.10
diff -u -r1.1.1.9 -r1.1.1.10
--- qplatformdefs.h	22 Sep 2005 12:58:56 -0000	1.1.1.9
+++ qplatformdefs.h	30 Sep 2005 16:58:30 -0000	1.1.1.10
@@ -49,7 +49,7 @@
 #include <sys/socket.h>
 #include <sys/stat.h>
 #include <sys/wait.h>
-#include <windows.h>
+//#include <windows.h>
 
 // Resolver functions are not implemented in Cygwin, headers
 // <arpa/nameser.h> and <resolv.h> are missing: