Browse Source

Sync win32-cross-g++ mkspecs with Qt 4.3's win32-g++ (fixes qmake-qt4 trying to link with a .res file).

git-svn-id: file:///var/svn/tigccpp/trunk@1113 9552661e-59e3-4036-b4f2-dbe53926924f
kevinkofler 17 years ago
parent
commit
70652b20ea

+ 11 - 8
ktigcc/mingw/mkspecs/win32-cross-g++/qmake.conf

@@ -12,6 +12,7 @@ DEFINES			+= UNICODE QT_LARGEFILE_SUPPORT
 QMAKE_COMPILER_DEFINES  += __GNUC__ WIN32
 
 QMAKE_EXT_OBJ           = .o
+QMAKE_EXT_RES           = _res.o
 
 QMAKE_CC		= i386-mingw32-gcc
 QMAKE_LEX		= flex
@@ -20,12 +21,11 @@ QMAKE_YACC		= byacc
 QMAKE_YACCFLAGS		= -d
 QMAKE_CFLAGS		=
 QMAKE_CFLAGS_DEPS	= -M
-QMAKE_CFLAGS_WARN_ON	= -Wall -W
+QMAKE_CFLAGS_WARN_ON	= -Wall
 QMAKE_CFLAGS_WARN_OFF	= -w
 QMAKE_CFLAGS_RELEASE	= -O2
 QMAKE_CFLAGS_DEBUG	= -g
 QMAKE_CFLAGS_YACC	= -Wno-unused -Wno-parentheses
-QMAKE_CFLAGS_THREAD	= -mthreads
 
 QMAKE_CXX		= i386-mingw32-g++
 QMAKE_CXXFLAGS		= $$QMAKE_CFLAGS
@@ -38,7 +38,7 @@ QMAKE_CXXFLAGS_YACC	= $$QMAKE_CFLAGS_YACC
 QMAKE_CXXFLAGS_THREAD	= $$QMAKE_CFLAGS_THREAD
 QMAKE_CXXFLAGS_RTTI_ON	= -frtti
 QMAKE_CXXFLAGS_RTTI_OFF	= -fno-rtti
-QMAKE_CXXFLAGS_EXCEPTIONS_ON = -fexceptions
+QMAKE_CXXFLAGS_EXCEPTIONS_ON = -fexceptions -mthreads
 QMAKE_CXXFLAGS_EXCEPTIONS_OFF = -fno-exceptions
 
 QMAKE_INCDIR		=
@@ -51,7 +51,9 @@ QMAKE_RUN_CXX		= $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $obj $src
 QMAKE_RUN_CXX_IMP	= $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
 
 QMAKE_LINK		= i386-mingw32-g++
-QMAKE_LFLAGS		= -mthreads -Wl,-enable-stdcall-fixup -Wl,-enable-auto-import -Wl,-enable-runtime-pseudo-reloc
+QMAKE_LFLAGS		= -enable-stdcall-fixup -Wl,-enable-auto-import -Wl,-enable-runtime-pseudo-reloc
+QMAKE_LFLAGS_EXCEPTIONS_ON = -mthreads -Wl
+QMAKE_LFLAGS_EXCEPTIONS_OFF =
 QMAKE_LFLAGS_RELEASE	= -Wl,-s
 QMAKE_LFLAGS_DEBUG	=
 QMAKE_LFLAGS_CONSOLE	= -Wl,-subsystem,console
@@ -61,20 +63,21 @@ QMAKE_LFLAGS_DLL        = -shared
 
 QMAKE_LIBS		=
 QMAKE_LIBS_CORE         = -lkernel32 -luser32 -lshell32 -luuid -lole32 -ladvapi32 -lws2_32
-QMAKE_LIBS_GUI          = -lgdi32 -lcomdlg32 -loleaut32 -limm32 -lwinmm -lwinspool -lws2_32 -lole32 -luuid -luser32
+QMAKE_LIBS_GUI          = -lgdi32 -lcomdlg32 -loleaut32 -limm32 -lwinmm -lwinspool -lws2_32 -lole32 -luuid -luser32 -ladvapi32
 QMAKE_LIBS_NETWORK      = -lws2_32
 QMAKE_LIBS_OPENGL       = -lopengl32 -lglu32 -lgdi32 -luser32
 QMAKE_LIBS_COMPAT       = -ladvapi32 -lshell32 -lcomdlg32 -luser32 -lgdi32 -lws2_32
 QMAKE_LIBS_QT_ENTRY     = -lmingw32 -lqtmain
 
+MINGW_IN_SHELL		= 1
 QMAKE_DIR_SEP		= /
 QMAKE_COPY		= cp -f
-QMAKE_COPY_FILE         = $(COPY)
-QMAKE_COPY_DIR          = $(COPY) -r
+QMAKE_COPY_FILE		= $(COPY)
+QMAKE_COPY_DIR		= $(COPY) -r
 QMAKE_MOVE		= mv -f
 QMAKE_DEL_FILE		= rm -f
 QMAKE_DEL_DIR		= rmdir
-QMAKE_STRIP             =
+QMAKE_STRIP		=
 QMAKE_CHK_DIR_EXISTS	= test -d
 QMAKE_MKDIR		= mkdir -p
 

+ 33 - 0
ktigcc/mingw/mkspecs/win32-cross-g++/qplatformdefs.h

@@ -1,3 +1,26 @@
+/****************************************************************************
+**
+** Copyright (C) 1992-2007 Trolltech ASA. All rights reserved.
+**
+** This file is part of the qmake spec of the Qt Toolkit.
+**
+** This file may be used under the terms of the GNU General Public
+** License version 2.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of
+** this file.  Please review the following information to ensure GNU
+** General Public Licensing requirements will be met:
+** http://www.trolltech.com/products/qt/opensource.html
+**
+** If you are unsure which license is appropriate for your use, please
+** review the following information:
+** http://www.trolltech.com/products/qt/licensing.html or contact the
+** sales department at sales@trolltech.com.
+**
+** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+**
+****************************************************************************/
+
 #ifndef QPLATFORMDEFS_H
 #define QPLATFORMDEFS_H
 
@@ -80,6 +103,7 @@ typedef enum {
 #define QT_CHDIR		::_chdir
 #define QT_MKDIR		::_mkdir
 #define QT_RMDIR		::_rmdir
+#define QT_OPEN_LARGEFILE       0
 #define QT_OPEN_RDONLY		_O_RDONLY
 #define QT_OPEN_WRONLY		_O_WRONLY
 #define QT_OPEN_RDWR		_O_RDWR
@@ -92,12 +116,21 @@ typedef enum {
 #endif
 
 #define QT_FOPEN                ::fopen
+#ifdef QT_LARGEFILE_SUPPORT
+#define QT_FSEEK                ::fseeko64
+#define QT_FTELL                ::ftello64
+#else
 #define QT_FSEEK                ::fseek
 #define QT_FTELL                ::ftell
+#endif
 #define QT_FGETPOS              ::fgetpos
 #define QT_FSETPOS              ::fsetpos
 #define QT_FPOS_T               fpos_t
+#ifdef QT_LARGEFILE_SUPPORT
+#define QT_OFF_T                off64_t
+#else
 #define QT_OFF_T                long
+#endif
 
 #define QT_SIGNAL_ARGS		int