author | zecke <zecke> | 2004-07-18 19:32:20 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-07-18 19:32:20 (UTC) |
commit | 8795812a0d763742a5273f356c35313af0fed84d (patch) (unidiff) | |
tree | 34b7259e1595e53e1fa2069d7d79bbdef67293e8 /mkspecs/win32-msvc.net | |
parent | 8e8fcd65b8d8657650728bae604c5a34dc31338e (diff) | |
download | opie-8795812a0d763742a5273f356c35313af0fed84d.zip opie-8795812a0d763742a5273f356c35313af0fed84d.tar.gz opie-8795812a0d763742a5273f356c35313af0fed84d.tar.bz2 |
-CHECK if DIR exist added to qmake.conf's
-use arm-linux-g++ for linking now
hopefully not removed anything important
Added python tool to opiefy mkspecs
-rw-r--r-- | mkspecs/win32-msvc.net/qmake.conf | 55 | ||||
-rw-r--r-- | mkspecs/win32-msvc.net/qplatformdefs.h | 4 |
2 files changed, 31 insertions, 28 deletions
diff --git a/mkspecs/win32-msvc.net/qmake.conf b/mkspecs/win32-msvc.net/qmake.conf index 92f7cc6..de8460d 100644 --- a/mkspecs/win32-msvc.net/qmake.conf +++ b/mkspecs/win32-msvc.net/qmake.conf | |||
@@ -2,11 +2,13 @@ | |||
2 | # $Id$ | 2 | # $Id$ |
3 | # | 3 | # |
4 | # qmake configuration for Win32/Microsoft C++.NET | 4 | # qmake configuration for win32-msvc.net |
5 | # | ||
6 | # Written for Microsoft C++.NET. | ||
5 | # | 7 | # |
6 | 8 | ||
7 | MAKEFILE_GENERATOR= MSVC.NET | 9 | MAKEFILE_GENERATOR= MSVC.NET |
8 | TEMPLATE = app | 10 | TEMPLATE = app |
9 | CONFIG += qt warn_on release incremental | 11 | CONFIG += qt warn_on release incremental flat link_prl precompile_header |
10 | DEFINES += UNICODE WIN32 NDEBUG | 12 | DEFINES += UNICODE WIN32 |
11 | 13 | ||
12 | exists( $(QTDIR)\.qtwinconfig ) { | 14 | exists( $(QTDIR)\.qtwinconfig ) { |
@@ -23,26 +25,20 @@ QMAKE_CFLAGS_WARN_ON = -W3 | |||
23 | QMAKE_CFLAGS_WARN_OFF= -W0 | 25 | QMAKE_CFLAGS_WARN_OFF= -W0 |
24 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O1) | 26 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O1) |
25 | QMAKE_CFLAGS_DEBUG= -Z7 | 27 | QMAKE_CFLAGS_DEBUG= -Zi -Gm |
26 | QMAKE_CFLAGS_MT = -MD | 28 | QMAKE_CFLAGS_MT = -MD |
27 | QMAKE_CFLAGS_MT_DBG= -MD | 29 | QMAKE_CFLAGS_MT_DBG= -MDd |
28 | QMAKE_CFLAGS_MT_DLL= -MD | 30 | QMAKE_CFLAGS_MT_DLL= -MD |
29 | QMAKE_CFLAGS_MT_DLLDBG= -MD | 31 | QMAKE_CFLAGS_MT_DLLDBG= -MDd |
30 | QMAKE_CFLAGS_ST = -ML | ||
31 | QMAKE_CFLAGS_ST_DBG= -MLd | ||
32 | QMAKE_CFLAGS_YACC= | 32 | QMAKE_CFLAGS_YACC= |
33 | 33 | QMAKE_CFLAGS_STL_ON= -GX | |
34 | contains(CONFIG,stl){ | 34 | QMAKE_CFLAGS_STL_OFF= |
35 | QMAKE_CFLAGS+= -GX $(CFLAGS_EXTRA) | 35 | QMAKE_CFLAGS_RTTI_ON= -GR |
36 | } | 36 | QMAKE_CFLAGS_RTTI_OFF= |
37 | contains(CONFIG,exceptions){ | 37 | QMAKE_CFLAGS_EXCEPTIONS_ON = -GX |
38 | QMAKE_CFLAGS += -GX | 38 | QMAKE_CFLAGS_EXCEPTIONS_OFF = |
39 | } | ||
40 | contains(CONFIG,rtti){ | ||
41 | QMAKE_CFLAGS+= -GR $(CFLAGS_EXTRA) | ||
42 | } | ||
43 | 39 | ||
44 | QMAKE_CXX = $$QMAKE_CC | 40 | QMAKE_CXX = $$QMAKE_CC |
45 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) | 41 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) |
46 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON | 42 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON -w34100 -w34189 |
47 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF | 43 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF |
48 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE | 44 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE |
@@ -52,8 +48,11 @@ QMAKE_CXXFLAGS_MT_DBG = $$QMAKE_CFLAGS_MT_DBG | |||
52 | QMAKE_CXXFLAGS_MT_DLL= $$QMAKE_CFLAGS_MT_DLL | 48 | QMAKE_CXXFLAGS_MT_DLL= $$QMAKE_CFLAGS_MT_DLL |
53 | QMAKE_CXXFLAGS_MT_DLLDBG= $$QMAKE_CFLAGS_MT_DLLDBG | 49 | QMAKE_CXXFLAGS_MT_DLLDBG= $$QMAKE_CFLAGS_MT_DLLDBG |
54 | QMAKE_CXXFLAGS_ST= $$QMAKE_CFLAGS_ST | ||
55 | QMAKE_CXXFLAGS_ST_DBG= $$QMAKE_CFLAGS_ST_DBG | ||
56 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC | 50 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC |
57 | QMAKE_CXXFLAGS_STL= $$QMAKE_CFLAGS_STL | 51 | QMAKE_CXXFLAGS_STL_ON= $$QMAKE_CFLAGS_STL_ON |
52 | QMAKE_CXXFLAGS_STL_OFF= $$QMAKE_CFLAGS_STL_OFF | ||
53 | QMAKE_CXXFLAGS_RTTI_ON= $$QMAKE_CFLAGS_RTTI_ON | ||
54 | QMAKE_CXXFLAGS_RTTI_OFF= $$QMAKE_CFLAGS_RTTI_OFF | ||
55 | QMAKE_CXXFLAGS_EXCEPTIONS_ON = $$QMAKE_CFLAGS_EXCEPTIONS_ON | ||
56 | QMAKE_CXXFLAGS_EXCEPTIONS_OFF = $$QMAKE_CFLAGS_EXCEPTIONS_OFF | ||
58 | 57 | ||
59 | QMAKE_INCDIR = | 58 | QMAKE_INCDIR = |
@@ -63,6 +62,8 @@ QMAKE_LIBDIR_QT = $(QTDIR)\lib | |||
63 | QMAKE_RUN_CC = $(CC) -c $(CFLAGS) $(INCPATH) -Fo$obj $src | 62 | QMAKE_RUN_CC = $(CC) -c $(CFLAGS) $(INCPATH) -Fo$obj $src |
64 | QMAKE_RUN_CC_IMP= $(CC) -c $(CFLAGS) $(INCPATH) -Fo$@ $< | 63 | QMAKE_RUN_CC_IMP= $(CC) -c $(CFLAGS) $(INCPATH) -Fo$@ $< |
64 | QMAKE_RUN_CC_IMP_BATCH= $(CC) -c $(CFLAGS) $(INCPATH) -Fo$@ @<< | ||
65 | QMAKE_RUN_CXX = $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$obj $src | 65 | QMAKE_RUN_CXX = $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$obj $src |
66 | QMAKE_RUN_CXX_IMP= $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ $< | 66 | QMAKE_RUN_CXX_IMP= $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ $< |
67 | QMAKE_RUN_CXX_IMP_BATCH= $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ @<< | ||
67 | 68 | ||
68 | QMAKE_LINK = link | 69 | QMAKE_LINK = link |
@@ -78,10 +79,10 @@ QMAKE_LFLAGS_QT_DLL = /BASE:0x39D00000 | |||
78 | QMAKE_LIBS = $(LIBS_EXTRA) | 79 | QMAKE_LIBS = $(LIBS_EXTRA) |
79 | QMAKE_LIBS_CONSOLE= | 80 | QMAKE_LIBS_CONSOLE= |
80 | QMAKE_LIBS_WINDOWS= kernel32.lib user32.lib gdi32.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib imm32.lib winmm.lib wsock32.lib winspool.lib | 81 | QMAKE_LIBS_WINDOWS= kernel32.lib user32.lib gdi32.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib imm32.lib winmm.lib wsock32.lib winspool.lib delayimp.lib |
81 | QMAKE_LIBS_QT = qt.lib | 82 | QMAKE_LIBS_QT = qt.lib |
82 | QMAKE_LIBS_QT_THREAD= qt-mt.lib | 83 | QMAKE_LIBS_QT_THREAD= qt-mt.lib |
83 | QMAKE_LIBS_QT_ENTRY= qtmain.lib | 84 | QMAKE_LIBS_QT_ENTRY= qtmain.lib |
84 | 85 | ||
85 | QMAKE_LIBS_OPENGL= opengl32.lib glu32.lib delayimp.lib | 86 | QMAKE_LIBS_OPENGL= opengl32.lib glu32.lib |
86 | QMAKE_LFLAGS_OPENGL= /DELAYLOAD:opengl32.dll | 87 | QMAKE_LFLAGS_OPENGL= /DELAYLOAD:opengl32.dll |
87 | 88 | ||
@@ -99,6 +100,8 @@ QMAKE_COPY = copy | |||
99 | QMAKE_MOVE = move | 100 | QMAKE_MOVE = move |
100 | QMAKE_DEL_FILE = del | 101 | QMAKE_DEL_FILE = del |
101 | QMAKE_DEL_DIR = deltree | 102 | QMAKE_DEL_DIR = rmdir |
103 | QMAKE_CHK_DIR_EXISTS= if not exist | ||
104 | QMAKE_MKDIR = mkdir | ||
102 | 105 | ||
103 | VCPROJ_EXTENSION= .vcproj | 106 | VCPROJ_EXTENSION= .vcproj |
104 | VCSOLUTION_EXTENSION= .vcs | 107 | VCSOLUTION_EXTENSION= .sln |
diff --git a/mkspecs/win32-msvc.net/qplatformdefs.h b/mkspecs/win32-msvc.net/qplatformdefs.h index 76ed8af..d828db8 100644 --- a/mkspecs/win32-msvc.net/qplatformdefs.h +++ b/mkspecs/win32-msvc.net/qplatformdefs.h | |||
@@ -27,5 +27,5 @@ | |||
27 | 27 | ||
28 | #define Q_FS_FAT | 28 | #define Q_FS_FAT |
29 | #ifdef QT_LARGE_FILE_SUPPORT | 29 | #ifdef QT_LARGEFILE_SUPPORT |
30 | #define QT_STATBUF struct _stati64 // non-ANSI defs | 30 | #define QT_STATBUF struct _stati64 // non-ANSI defs |
31 | #define QT_STATBUF4TSTAT struct _stati64 // non-ANSI defs | 31 | #define QT_STATBUF4TSTAT struct _stati64 // non-ANSI defs |
@@ -47,5 +47,5 @@ | |||
47 | #define QT_OPEN ::_open | 47 | #define QT_OPEN ::_open |
48 | #define QT_CLOSE ::_close | 48 | #define QT_CLOSE ::_close |
49 | #ifdef QT_LARGE_FILE_SUPPORT | 49 | #ifdef QT_LARGEFILE_SUPPORT |
50 | #define QT_LSEEK ::_lseeki64 | 50 | #define QT_LSEEK ::_lseeki64 |
51 | #define QT_TSTAT ::_tstati64 | 51 | #define QT_TSTAT ::_tstati64 |