| author | zecke <zecke> | 2004-07-18 19:32:20 (UTC) |
|---|---|---|
| committer | zecke <zecke> | 2004-07-18 19:32:20 (UTC) |
| commit | 8795812a0d763742a5273f356c35313af0fed84d (patch) (side-by-side diff) | |
| tree | 34b7259e1595e53e1fa2069d7d79bbdef67293e8 /mkspecs/win32-icc | |
| 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-icc/qmake.conf | 45 | ||||
| -rw-r--r-- | mkspecs/win32-icc/qplatformdefs.h | 6 |
2 files changed, 30 insertions, 21 deletions
diff --git a/mkspecs/win32-icc/qmake.conf b/mkspecs/win32-icc/qmake.conf index f7b43b9..088c7f5 100644 --- a/mkspecs/win32-icc/qmake.conf +++ b/mkspecs/win32-icc/qmake.conf @@ -1,12 +1,14 @@ # # $Id$ # -# qmake configuration for Win32/Intel C++ +# qmake configuration for win32-icc +# +# Written for Intel C++ 5.0.1, 6.0.1, and 7.0 for Windows. # MAKEFILE_GENERATOR = MSVC TEMPLATE = app -CONFIG += qt warn_on release incremental +CONFIG += qt warn_on release incremental link_prl DEFINES += UNICODE exists( $(QTDIR)\.qtwinconfig ) { @@ -21,23 +23,19 @@ QMAKE_YACCFLAGS = -d QMAKE_CFLAGS = -nologo -Zm200 $(CFLAGS_EXTRA) QMAKE_CFLAGS_WARN_ON = -W3 QMAKE_CFLAGS_WARN_OFF = -W0 -QMAKE_CFLAGS_RELEASE = $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -Od -Ob1s) -QMAKE_CFLAGS_DEBUG = -Zi +QMAKE_CFLAGS_RELEASE = $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), ) +QMAKE_CFLAGS_DEBUG = -Zi -Od QMAKE_CFLAGS_MT = -MD QMAKE_CFLAGS_MT_DBG = -MDd QMAKE_CFLAGS_MT_DLL = -MD QMAKE_CFLAGS_MT_DLLDBG = -MDd QMAKE_CFLAGS_YACC = - -contains(CONFIG,stl){ - QMAKE_CFLAGS += -GX $(CFLAGS_EXTRA) -} -contains(CONFIG,exceptions){ - QMAKE_CFLAGS += -GX -} -contains(CONFIG,rtti){ - QMAKE_CFLAGS += -GR $(CFLAGS_EXTRA) -} +QMAKE_CFLAGS_STL_ON = -GX +QMAKE_CFLAGS_STL_OFF = +QMAKE_CFLAGS_RTTI_ON = -GR +QMAKE_CFLAGS_RTTI_OFF = +QMAKE_CFLAGS_EXCEPTIONS_ON = -GX +QMAKE_CFLAGS_EXCEPTIONS_OFF = QMAKE_CXX = $$QMAKE_CC QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) @@ -50,7 +48,12 @@ QMAKE_CXXFLAGS_MT_DBG = $$QMAKE_CFLAGS_MT_DBG QMAKE_CXXFLAGS_MT_DLL = $$QMAKE_CFLAGS_MT_DLL QMAKE_CXXFLAGS_MT_DLLDBG= $$QMAKE_CFLAGS_MT_DLLDBG QMAKE_CXXFLAGS_YACC = $$QMAKE_CFLAGS_YACC -QMAKE_CXXFLAGS_STL = $$QMAKE_CFLAGS_STL +QMAKE_CXXFLAGS_STL_ON = $$QMAKE_CFLAGS_STL_ON +QMAKE_CXXFLAGS_STL_OFF = $$QMAKE_CFLAGS_STL_OFF +QMAKE_CXXFLAGS_RTTI_ON = $$QMAKE_CFLAGS_RTTI_ON +QMAKE_CXXFLAGS_RTTI_OFF = $$QMAKE_CFLAGS_RTTI_OFF +QMAKE_CXXFLAGS_EXCEPTIONS_ON = $$QMAKE_CFLAGS_EXCEPTIONS_ON +QMAKE_CXXFLAGS_EXCEPTIONS_OFF = $$QMAKE_CFLAGS_EXCEPTIONS_OFF QMAKE_INCDIR = QMAKE_INCDIR_QT = $(QTDIR)\include @@ -58,8 +61,10 @@ QMAKE_LIBDIR_QT = $(QTDIR)\lib QMAKE_RUN_CC = $(CC) -c $(CFLAGS) $(INCPATH) -Fo$obj $src QMAKE_RUN_CC_IMP = $(CC) -c $(CFLAGS) $(INCPATH) -Fo$@ $< +QMAKE_RUN_CC_IMP_BATCH = $(CC) -c $(CFLAGS) $(INCPATH) -Fo$@ @<< QMAKE_RUN_CXX = $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$obj $src QMAKE_RUN_CXX_IMP = $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ $< +QMAKE_RUN_CXX_IMP_BATCH = $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ @<< QMAKE_LINK = link QMAKE_LFLAGS = /NOLOGO $(LFLAGS_EXTRA) @@ -74,9 +79,9 @@ QMAKE_LFLAGS_QT_DLL = /BASE:0x39D00000 QMAKE_LIBS = $(LIBS_EXTRA) QMAKE_LIBS_CONSOLE = 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 -QMAKE_LIBS_QT = $(QTDIR)\lib\qt.lib -QMAKE_LIBS_QT_THREAD = $(QTDIR)\lib\qt-mt.lib -QMAKE_LIBS_QT_ENTRY = $(QTDIR)\lib\qtmain.lib +QMAKE_LIBS_QT = qt.lib +QMAKE_LIBS_QT_THREAD = qt-mt.lib +QMAKE_LIBS_QT_ENTRY = qtmain.lib QMAKE_LIBS_OPENGL = opengl32.lib glu32.lib delayimp.lib QMAKE_LFLAGS_OPENGL = /DELAYLOAD:opengl32.dll @@ -94,6 +99,8 @@ QMAKE_ZIP = zip -r -9 QMAKE_COPY = copy QMAKE_MOVE = move QMAKE_DEL_FILE = del -QMAKE_DEL_DIR = deltree +QMAKE_DEL_DIR = rmdir +QMAKE_CHK_DIR_EXISTS = if not exist +QMAKE_MKDIR = mkdir DSP_EXTENSION = .dsp diff --git a/mkspecs/win32-icc/qplatformdefs.h b/mkspecs/win32-icc/qplatformdefs.h index 1d72e8a..d828db8 100644 --- a/mkspecs/win32-icc/qplatformdefs.h +++ b/mkspecs/win32-icc/qplatformdefs.h @@ -26,7 +26,7 @@ #include <windows.h> #define Q_FS_FAT -#ifdef QT_LARGE_FILE_SUPPORT +#ifdef QT_LARGEFILE_SUPPORT #define QT_STATBUF struct _stati64 // non-ANSI defs #define QT_STATBUF4TSTAT struct _stati64 // non-ANSI defs #define QT_STAT ::_stati64 @@ -46,7 +46,7 @@ #define QT_FILENO _fileno #define QT_OPEN ::_open #define QT_CLOSE ::_close -#ifdef QT_LARGE_FILE_SUPPORT +#ifdef QT_LARGEFILE_SUPPORT #define QT_LSEEK ::_lseeki64 #define QT_TSTAT ::_tstati64 #else @@ -81,5 +81,7 @@ # define W_OK 2 # define R_OK 4 +typedef int mode_t; + #endif // QPLATFORMDEFS_H |