Changeset 16
- Timestamp:
- May 29, 2009, 11:16:45 AM (16 years ago)
- Location:
- trunk
- Files:
-
- 3 edited
-
mkspecs/os2-g++/qmake.conf (modified) (1 diff)
-
mkspecs/os2-g++/qplatformdefs.h (modified) (3 diffs)
-
qmake/Makefile.os2-g++ (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/mkspecs/os2-g++/qmake.conf
r2 r16 1 1 # 2 # qmake configuration for win32-g++2 # qmake configuration for os2-g++ 3 3 # 4 # Written for MinGW4 # Written for Innotek GCC/kLib and IBM ILINK 5 5 # 6 6 7 MAKEFILE_GENERATOR = MINGW 8 TEMPLATE = app 9 CONFIG += qt warn_on release link_prl copy_dir_files debug_and_release debug_and_release_target precompile_header 10 QT += core gui 11 DEFINES += UNICODE QT_LARGEFILE_SUPPORT 12 QMAKE_COMPILER_DEFINES += __GNUC__ WIN32 7 MAKEFILE_GENERATOR = GNUMAKE 8 TEMPLATE = app 9 CONFIG += qt warn_on release link_prl copy_dir_files debug_and_release debug_and_release_target 10 QT += core gui 11 # @todo 12 #DEFINES += QT_LARGEFILE_SUPPORT 13 #QMAKE_COMPILER_DEFINES += __GNUC__ OS2 13 14 14 QMAKE_EXT_OBJ = .o 15 QMAKE_EXT_RES = _res.o 15 QMAKE_EXT_OBJ = .obj 16 QMAKE_EXT_RES = _res.obj 16 17 17 QMAKE_CC 18 QMAKE_LEX 19 QMAKE_LEXFLAGS 20 QMAKE_YACC 21 QMAKE_YACCFLAGS 22 QMAKE_CFLAGS =23 QMAKE_CFLAGS_DEPS 24 QMAKE_CFLAGS_WARN_ON 25 QMAKE_CFLAGS_WARN_OFF 26 QMAKE_CFLAGS_RELEASE =-O227 QMAKE_CFLAGS_DEBUG 28 QMAKE_CFLAGS_YACC 18 QMAKE_CC = gcc 19 QMAKE_LEX = flex 20 QMAKE_LEXFLAGS = 21 QMAKE_YACC = byacc 22 QMAKE_YACCFLAGS = -d 23 QMAKE_CFLAGS = -Zomf 24 QMAKE_CFLAGS_DEPS = -M 25 QMAKE_CFLAGS_WARN_ON = -Wall 26 QMAKE_CFLAGS_WARN_OFF = -w 27 QMAKE_CFLAGS_RELEASE = -s -O2 28 QMAKE_CFLAGS_DEBUG = -g 29 QMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses 29 30 30 QMAKE_CXX 31 QMAKE_CXXFLAGS 32 QMAKE_CXXFLAGS_DEPS 33 QMAKE_CXXFLAGS_WARN_ON 34 QMAKE_CXXFLAGS_WARN_OFF 35 QMAKE_CXXFLAGS_RELEASE 36 QMAKE_CXXFLAGS_DEBUG 37 QMAKE_CXXFLAGS_YACC 38 QMAKE_CXXFLAGS_THREAD 39 QMAKE_CXXFLAGS_RTTI_ON 40 QMAKE_CXXFLAGS_RTTI_OFF 41 QMAKE_CXXFLAGS_EXCEPTIONS_ON = -fexceptions -mthreads31 QMAKE_CXX = g++ 32 QMAKE_CXXFLAGS = $$QMAKE_CFLAGS 33 QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS 34 QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON 35 QMAKE_CXXFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF 36 QMAKE_CXXFLAGS_RELEASE = $$QMAKE_CFLAGS_RELEASE 37 QMAKE_CXXFLAGS_DEBUG = $$QMAKE_CFLAGS_DEBUG 38 QMAKE_CXXFLAGS_YACC = $$QMAKE_CFLAGS_YACC 39 QMAKE_CXXFLAGS_THREAD = $$QMAKE_CFLAGS_THREAD 40 QMAKE_CXXFLAGS_RTTI_ON = -frtti 41 QMAKE_CXXFLAGS_RTTI_OFF = -fno-rtti 42 QMAKE_CXXFLAGS_EXCEPTIONS_ON = -fexceptions 42 43 QMAKE_CXXFLAGS_EXCEPTIONS_OFF = -fno-exceptions 43 44 44 QMAKE_INCDIR 45 QMAKE_INCDIR_QT 46 QMAKE_LIBDIR_QT 45 QMAKE_INCDIR = 46 QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS] 47 QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS] 47 48 48 QMAKE_RUN_CC 49 QMAKE_RUN_CC_IMP 50 QMAKE_RUN_CXX 51 QMAKE_RUN_CXX_IMP 49 QMAKE_RUN_CC = $(CC) -c $(CFLAGS) $(INCPATH) -o $obj $src 50 QMAKE_RUN_CC_IMP = $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $< 51 QMAKE_RUN_CXX = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $obj $src 52 QMAKE_RUN_CXX_IMP = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 52 53 53 QMAKE_LINK 54 QMAKE_LINK_C 55 QMAKE_LFLAGS = -enable-stdcall-fixup -Wl,-enable-auto-import -Wl,-enable-runtime-pseudo-reloc56 QMAKE_LFLAGS_EXCEPTIONS_ON = -mthreads -Wl54 QMAKE_LINK = g++ 55 QMAKE_LINK_C = gcc 56 QMAKE_LFLAGS = -Zomf -Zstack 0x2000 -Zmap 57 QMAKE_LFLAGS_EXCEPTIONS_ON = 57 58 QMAKE_LFLAGS_EXCEPTIONS_OFF = 58 QMAKE_LFLAGS_RELEASE = -Wl,-s 59 QMAKE_LFLAGS_DEBUG = 60 QMAKE_LFLAGS_CONSOLE = -Wl,-subsystem,console 61 QMAKE_LFLAGS_WINDOWS = -Wl,-subsystem,windows 62 QMAKE_LFLAGS_DLL = -shared 63 QMAKE_LINK_OBJECT_MAX = 10 64 QMAKE_LINK_OBJECT_SCRIPT= object_script 59 QMAKE_LFLAGS_RELEASE = -s -Zlinker /EXEPACK:2 60 QMAKE_LFLAGS_DEBUG = 61 QMAKE_LFLAGS_CONSOLE = -Zlinker /PM:VIO 62 QMAKE_LFLAGS_WINDOWS = -Zlinker /PM:PM -Zno-fork 63 QMAKE_LFLAGS_DLL = -Zdll 64 # @todo 65 #QMAKE_LINK_OBJECT_MAX = 10 66 #QMAKE_LINK_OBJECT_SCRIPT= object_script 65 67 66 68 67 QMAKE_LIBS 68 QMAKE_LIBS_CORE = -l kernel32 -luser32 -lshell32 -luuid -lole32 -ladvapi32 -lws2_3269 QMAKE_LIBS_GUI = -lgdi32 -lcomdlg32 -loleaut32 -limm32 -lwinmm -lwinspool -lws2_32 -lole32 -luuid -luser32 -ladvapi3270 QMAKE_LIBS_NETWORK = -lws2_3271 QMAKE_LIBS_OPENGL = -lopengl32 -lglu32 -lgdi32 -luser3272 QMAKE_LIBS_COMPAT = -ladvapi32 -lshell32 -lcomdlg32 -luser32 -lgdi32 -lws2_3273 QMAKE_LIBS_QT_ENTRY = -lmingw32 -lqtmain69 QMAKE_LIBS = 70 QMAKE_LIBS_CORE = -lregistry.dll -lsocket 71 QMAKE_LIBS_GUI = 72 QMAKE_LIBS_NETWORK = 73 QMAKE_LIBS_OPENGL = 74 QMAKE_LIBS_COMPAT = 75 QMAKE_LIBS_QT_ENTRY = 74 76 75 77 !isEmpty(QMAKE_SH) { 76 78 MINGW_IN_SHELL = 1 77 QMAKE_DIR_SEP= /78 QMAKE_COPY= cp79 QMAKE_COPY_DIR= xcopy /s /q /y /i80 QMAKE_MOVE= mv81 QMAKE_DEL_FILE= rm82 QMAKE_MKDIR= mkdir83 QMAKE_DEL_DIR= rmdir84 QMAKE_CHK_DIR_EXISTS = test -d79 QMAKE_DIR_SEP = / 80 QMAKE_COPY = cp 81 QMAKE_COPY_DIR = xcopy /s /q /y /i 82 QMAKE_MOVE = mv 83 QMAKE_DEL_FILE = rm 84 QMAKE_MKDIR = mkdir 85 QMAKE_DEL_DIR = rmdir 86 QMAKE_CHK_DIR_EXISTS = test -d 85 87 } else { 86 QMAKE_COPY= copy /y87 QMAKE_COPY_DIR= xcopy /s /q /y /i88 QMAKE_MOVE= move89 QMAKE_DEL_FILE= del90 QMAKE_MKDIR= mkdir91 QMAKE_DEL_DIR= rmdir92 QMAKE_CHK_DIR_EXISTS 88 QMAKE_COPY = copy /y 89 QMAKE_COPY_DIR = xcopy /s /q /y /i 90 QMAKE_MOVE = move 91 QMAKE_DEL_FILE = del 92 QMAKE_MKDIR = mkdir 93 QMAKE_DEL_DIR = rmdir 94 QMAKE_CHK_DIR_EXISTS = if not exist 93 95 } 94 96 95 QMAKE_MOC 96 QMAKE_UIC 97 QMAKE_IDC 97 QMAKE_MOC = $$[QT_INSTALL_BINS]$${DIR_SEPARATOR}moc.exe 98 QMAKE_UIC = $$[QT_INSTALL_BINS]$${DIR_SEPARATOR}uic.exe 99 QMAKE_IDC = $$[QT_INSTALL_BINS]$${DIR_SEPARATOR}idc.exe 98 100 99 QMAKE_IDL = midl100 QMAKE_LIB = ar -ru101 QMAKE_RC = windres102 QMAKE_ZIP 101 QMAKE_IDL = 102 QMAKE_LIB = emxomfar r 103 QMAKE_RC = rc 104 QMAKE_ZIP = zip -r -9 103 105 104 QMAKE_STRIP 105 QMAKE_STRIPFLAGS_LIB 106 QMAKE_STRIP = strip 107 QMAKE_STRIPFLAGS_LIB += --strip-unneeded 106 108 load(qt_config) -
trunk/mkspecs/os2-g++/qplatformdefs.h
r2 r16 43 43 #define QPLATFORMDEFS_H 44 44 45 #ifdef UNICODE46 #ifndef _UNICODE47 #define _UNICODE48 #endif49 #endif50 51 45 // Get Qt defines/settings 52 46 53 47 #include "qglobal.h" 54 48 55 #include <tchar.h>56 49 #include <io.h> 57 #include <direct.h>58 50 #include <stdio.h> 59 51 #include <fcntl.h> … … 61 53 #include <sys/stat.h> 62 54 #include <stdlib.h> 63 #include <windows.h>64 #include <limits.h>65 66 #if !defined(_WIN32_WINNT) || (_WIN32_WINNT-0 < 0x0500)67 typedef enum {68 NameUnknown = 0,69 NameFullyQualifiedDN = 1,70 NameSamCompatible = 2,71 NameDisplay = 3,72 NameUniqueId = 6,73 NameCanonical = 7,74 NameUserPrincipal = 8,75 NameCanonicalEx = 9,76 NameServicePrincipal = 10,77 NameDnsDomain = 1278 } EXTENDED_NAME_FORMAT, *PEXTENDED_NAME_FORMAT;79 #endif80 55 81 56 #define Q_FS_FAT 57 // @todo 58 //#ifdef QT_LARGEFILE_SUPPORT 59 //#define QT_STATBUF struct _stati64 // non-ANSI defs 60 //#define QT_STATBUF4TSTAT struct _stati64 // non-ANSI defs 61 //#define QT_STAT ::_stati64 62 //#define QT_FSTAT ::_fstati64 63 //#else 64 #define QT_STATBUF struct stat 65 #define QT_STATBUF4TSTAT struct stat 66 #define QT_STAT ::stat 67 #define QT_FSTAT ::fstat 68 //#endif 69 #define QT_STAT_REG S_IFREG 70 #define QT_STAT_DIR S_IFDIR 71 #define QT_STAT_MASK S_IFMT 72 #if defined(_S_IFLNK) 73 # define QT_STAT_LNK S_IFLNK 74 #endif 75 #define QT_FILENO fileno 76 #define QT_OPEN ::open 77 #define QT_CLOSE ::close 82 78 #ifdef QT_LARGEFILE_SUPPORT 83 #define QT_STATBUF struct _stati64 // non-ANSI defs 84 #define QT_STATBUF4TSTAT struct _stati64 // non-ANSI defs 85 #define QT_STAT ::_stati64 86 #define QT_FSTAT ::_fstati64 79 #define QT_LSEEK ::lseeki64 80 #define QT_TSTAT ::stati64 87 81 #else 88 #define QT_STATBUF struct _stat // non-ANSI defs 89 #define QT_STATBUF4TSTAT struct _stat // non-ANSI defs 90 #define QT_STAT ::_stat 91 #define QT_FSTAT ::_fstat 82 #define QT_LSEEK ::lseek 83 #define QT_TSTAT ::stat 92 84 #endif 93 #define QT_STAT_REG _S_IFREG 94 #define QT_STAT_DIR _S_IFDIR 95 #define QT_STAT_MASK _S_IFMT 96 #if defined(_S_IFLNK) 97 # define QT_STAT_LNK _S_IFLNK 98 #endif 99 #define QT_FILENO _fileno 100 #define QT_OPEN ::_open 101 #define QT_CLOSE ::_close 102 #ifdef QT_LARGEFILE_SUPPORT 103 #define QT_LSEEK ::_lseeki64 104 #ifndef UNICODE 105 #define QT_TSTAT ::_stati64 106 #else 107 #define QT_TSTAT ::_wstati64 108 #endif 109 #else 110 #define QT_LSEEK ::_lseek 111 #ifndef UNICODE 112 #define QT_TSTAT ::_stat 113 #else 114 #define QT_TSTAT ::_wstat 115 #endif 116 #endif 117 #define QT_READ ::_read 118 #define QT_WRITE ::_write 119 #define QT_ACCESS ::_access 120 #define QT_GETCWD ::_getcwd 121 #define QT_CHDIR ::_chdir 122 #define QT_MKDIR ::_mkdir 123 #define QT_RMDIR ::_rmdir 85 #define QT_READ ::read 86 #define QT_WRITE ::write 87 #define QT_ACCESS ::access 88 #define QT_GETCWD ::_getcwd2 // returns the drive letter with path 89 #define QT_CHDIR ::_chdir2 // change the current drive if present 90 #define QT_MKDIR(name) ::mkdir(name,0) 91 #define QT_RMDIR ::rmdir 124 92 #define QT_OPEN_LARGEFILE 0 125 #define QT_OPEN_RDONLY _O_RDONLY126 #define QT_OPEN_WRONLY _O_WRONLY127 #define QT_OPEN_RDWR _O_RDWR128 #define QT_OPEN_CREAT _O_CREAT129 #define QT_OPEN_TRUNC _O_TRUNC130 #define QT_OPEN_APPEND _O_APPEND93 #define QT_OPEN_RDONLY O_RDONLY 94 #define QT_OPEN_WRONLY O_WRONLY 95 #define QT_OPEN_RDWR O_RDWR 96 #define QT_OPEN_CREAT O_CREAT 97 #define QT_OPEN_TRUNC O_TRUNC 98 #define QT_OPEN_APPEND O_APPEND 131 99 #if defined(O_TEXT) 132 # define QT_OPEN_TEXT _O_TEXT133 # define QT_OPEN_BINARY _O_BINARY100 # define QT_OPEN_TEXT O_TEXT 101 # define QT_OPEN_BINARY O_BINARY 134 102 #endif 135 103 … … 153 121 #define QT_SIGNAL_ARGS int 154 122 155 #define QT_VSNPRINTF ::_vsnprintf 156 #define QT_SNPRINTF ::_snprintf 157 158 # define F_OK 0 159 # define X_OK 1 160 # define W_OK 2 161 # define R_OK 4 123 #define QT_VSNPRINTF ::vsnprintf 124 #define QT_SNPRINTF ::snprintf 162 125 163 126 -
trunk/qmake/Makefile.os2-g++
r15 r16 295 295 $(CXX) $(CXXFLAGS) generators/win32/msvc_objectmodel.cpp 296 296 297 gnumake.obj bj: $(SOURCE_PATH)/qmake/generators/os2/gnumake.cpp297 gnumake.obj: $(SOURCE_PATH)/qmake/generators/os2/gnumake.cpp 298 298 $(CXX) $(CXXFLAGS) generators/os2/gnumake.cpp 299 299
Note:
See TracChangeset
for help on using the changeset viewer.
