summaryrefslogtreecommitdiffstats
path: root/tmake/lib/win32-msvc
diff options
context:
space:
mode:
Diffstat (limited to 'tmake/lib/win32-msvc')
-rwxr-xr-xtmake/lib/win32-msvc/generic.t16
-rwxr-xr-xtmake/lib/win32-msvc/tmake.conf5
-rwxr-xr-xtmake/lib/win32-msvc/vcapp.t44
-rwxr-xr-xtmake/lib/win32-msvc/vclib.t2
4 files changed, 47 insertions, 20 deletions
diff --git a/tmake/lib/win32-msvc/generic.t b/tmake/lib/win32-msvc/generic.t
index e57180d..388db4b 100755
--- a/tmake/lib/win32-msvc/generic.t
+++ b/tmake/lib/win32-msvc/generic.t
@@ -38,8 +38,11 @@
Project('CONFIG += windows' );
}
if ( Config("qt") ) {
- $moc_aware = 1;
+ Project('CONFIG *= moc');
AddIncludePath(Project("TMAKE_INCDIR_QT"));
+ if ( Config("release") ) {
+ Project('DEFINES += NO_DEBUG');
+ }
if ( Config("opengl") ) {
Project('TMAKE_LIBS *= $$TMAKE_LIBS_QT_OPENGL');
}
@@ -47,6 +50,7 @@
if ( Project("TMAKE_QT_DLL") ) {
Project('DEFINES -= QT_DLL');
Project('DEFINES *= QT_MAKEDLL');
+ Project('TMAKE_LFLAGS += $$TMAKE_LFLAGS_QT_DLL');
}
} else {
if ( Project("TMAKE_QT_DLL") ) {
@@ -56,7 +60,9 @@
if ( Project("TMAKE_QT_DLL") ) {
my $qtver =FindHighestLibVersion($ENV{"QTDIR"} . "/lib", "qt");
Project("TMAKE_LIBS /= s/qt.lib/qt${qtver}.lib/");
- Project('TMAKE_LIBS *= $$TMAKE_LIBS_QT_DLL');
+ if ( !Config("dll") ) {
+ Project('TMAKE_LIBS *= $$TMAKE_LIBS_QT_DLL');
+ }
}
}
}
@@ -94,6 +100,9 @@
Project('TMAKE_LFLAGS *= $$TMAKE_LFLAGS_CONSOLE_ANY');
Project('TMAKE_LIBS *= $$TMAKE_LIBS_CONSOLE');
}
+ if ( Config("moc") ) {
+ $moc_aware = 1;
+ }
Project('TMAKE_LIBS += $$LIBS');
Project('TMAKE_FILETAGS = HEADERS SOURCES DEF_FILE RC_FILE TARGET TMAKE_LIBS DESTDIR DLLDESTDIR $$FILETAGS');
foreach ( split(/\s/,Project("TMAKE_FILETAGS")) ) {
@@ -115,7 +124,6 @@
Project('TMAKE_LIBS *= $$RES_FILE');
}
StdInit();
- $project{"DESTDIR"} = FixPath($project{"DESTDIR"});
if ( Project("VERSION") ) {
$project{"VER_MAJ"} = $project{"VERSION"};
$project{"VER_MAJ"} =~ s/\.\d+$//;
@@ -137,7 +145,7 @@ CC = #$ Expand("TMAKE_CC");
CXX = #$ Expand("TMAKE_CXX");
CFLAGS = #$ Expand("TMAKE_CFLAGS"); ExpandGlue("DEFINES","-D"," -D","");
CXXFLAGS= #$ Expand("TMAKE_CXXFLAGS"); ExpandGlue("DEFINES","-D"," -D","");
-INCPATH = #$ ExpandGlue("INCPATH",'-I"','" -I"','"');
+INCPATH = #$ ExpandPath("INCPATH",'-I',' -I','');
#$ !Project("TMAKE_APP_OR_DLL") && DisableOutput();
LINK = #$ Expand("TMAKE_LINK");
LFLAGS = #$ Expand("TMAKE_LFLAGS");
diff --git a/tmake/lib/win32-msvc/tmake.conf b/tmake/lib/win32-msvc/tmake.conf
index cb64ac9..0f92f29 100755
--- a/tmake/lib/win32-msvc/tmake.conf
+++ b/tmake/lib/win32-msvc/tmake.conf
@@ -11,7 +11,7 @@ TMAKE_CC = cl
TMAKE_CFLAGS = -nologo
TMAKE_CFLAGS_WARN_ON = -W3
TMAKE_CFLAGS_WARN_OFF = -W0
-TMAKE_CFLAGS_RELEASE = -O2
+TMAKE_CFLAGS_RELEASE = -O1
TMAKE_CFLAGS_DEBUG = -Zi
TMAKE_CFLAGS_MT = -MT
TMAKE_CFLAGS_MT_DBG = -MTd
@@ -47,10 +47,11 @@ TMAKE_LFLAGS_CONSOLE = /SUBSYSTEM:console
TMAKE_LFLAGS_WINDOWS = /SUBSYSTEM:windows
TMAKE_LFLAGS_CONSOLE_DLL= /SUBSYSTEM:console /DLL
TMAKE_LFLAGS_WINDOWS_DLL= /SUBSYSTEM:windows /DLL
+TMAKE_LFLAGS_QT_DLL = /BASE:0x39D00000
TMAKE_LIBS =
TMAKE_LIBS_CONSOLE =
-TMAKE_LIBS_WINDOWS = user32.lib gdi32.lib comdlg32.lib ole32.lib uuid.lib wsock32.lib
+TMAKE_LIBS_WINDOWS = user32.lib gdi32.lib comdlg32.lib imm32.lib ole32.lib uuid.lib wsock32.lib
TMAKE_LIBS_QT = $(QTDIR)\lib\qt.lib
TMAKE_LIBS_QT_DLL = $(QTDIR)\lib\qtmain.lib
TMAKE_LIBS_QT_OPENGL = $(QTDIR)\lib\qgl.lib
diff --git a/tmake/lib/win32-msvc/vcapp.t b/tmake/lib/win32-msvc/vcapp.t
index 02e15e4..ac7ae23 100755
--- a/tmake/lib/win32-msvc/vcapp.t
+++ b/tmake/lib/win32-msvc/vcapp.t
@@ -2,6 +2,16 @@
#! This TMAKE template - Microsoft Visual C++ 5.0 applications
#!
#${
+ if ( Config("qt") ) {
+ if ( !(Project("DEFINES") =~ /QT_NODLL/) &&
+ ((Project("DEFINES") =~ /QT_(?:MAKE)?DLL/) ||
+ ($ENV{"QT_DLL"} && !$ENV{"QT_NODLL"})) ) {
+ Project('TMAKE_QT_DLL = 1');
+ if ( (Project("TARGET") eq "qt") && Project("TMAKE_LIB_FLAG") ) {
+ Project('CONFIG += dll');
+ }
+ }
+ }
if ( Config("qt") || Config("opengl") ) {
Project('CONFIG += windows');
}
@@ -11,25 +21,22 @@
if ( Config("opengl") ) {
Project('TMAKE_LIBS *= $$TMAKE_LIBS_QT_OPENGL');
}
+ if ( Project("TMAKE_QT_DLL") ) {
+ Project('DEFINES *= QT_DLL');
+ }
Project('TMAKE_LIBS *= $$TMAKE_LIBS_QT');
+ if ( Project("TMAKE_QT_DLL") ) {
+ my $qtver =FindHighestLibVersion($ENV{"QTDIR"} . "/lib", "qt");
+ Project("TMAKE_LIBS /= s/qt.lib/qt${qtver}.lib/");
+ Project('TMAKE_LIBS *= $$TMAKE_LIBS_QT_DLL');
+ }
}
if ( Config("opengl") ) {
Project('TMAKE_LIBS *= $$TMAKE_LIBS_OPENGL');
}
Project('TMAKE_LIBS += $$LIBS');
- if ( Config("windows") ) {
- $project{"VC_PROJ_TYPE"} = 'Win32 (x86) Application';
- $project{"VC_PROJ_CODE"} = '0x0101';
- $vc_base_libs = 'kernel32.lib user32.lib gdi32.lib winspool.lib ' .
- 'comdlg32.lib advapi32.lib shell32.lib ole32.lib ' .
- 'oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ';
- $vc_libs = $vc_base_libs . 'wsock32.lib ';
- $vc_link_release = '/nologo /subsystem:windows /machine:I386';
- $vc_link_debug = '/nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept';
- $vc_cpp_def_release = '/D "NDEBUG" /D "WIN32" /D "_WINDOWS" ';
- $vc_cpp_def_debug = '/D "_DEBUG" /D "WIN32" /D "_WINDOWS" ';
- } else {
+ if ( Config("console") ) {
$project{"VC_PROJ_TYPE"} = 'Win32 (x86) Console Application';
$project{"VC_PROJ_CODE"} = '0x0103';
$vc_base_libs = 'kernel32.lib user32.lib gdi32.lib winspool.lib ' .
@@ -40,6 +47,17 @@
$vc_link_debug = '/nologo /subsystem:console /debug /machine:I386 /pdbtype:sept';
$vc_cpp_def_release = '/D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" ';
$vc_cpp_def_debug = '/D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" ';
+ } else {
+ $project{"VC_PROJ_TYPE"} = 'Win32 (x86) Application';
+ $project{"VC_PROJ_CODE"} = '0x0101';
+ $vc_base_libs = 'kernel32.lib user32.lib gdi32.lib winspool.lib ' .
+ 'comdlg32.lib advapi32.lib shell32.lib ole32.lib ' .
+ 'oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ';
+ $vc_libs = $vc_base_libs . 'wsock32.lib ';
+ $vc_link_release = '/nologo /subsystem:windows /machine:I386';
+ $vc_link_debug = '/nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept';
+ $vc_cpp_def_release = '/D "NDEBUG" /D "WIN32" /D "_WINDOWS" ';
+ $vc_cpp_def_debug = '/D "_DEBUG" /D "WIN32" /D "_WINDOWS" ';
}
$project{"VC_BASE_LINK_RELEASE"} = $vc_base_libs . $vc_link_release;
$project{"VC_BASE_LINK_DEBUG"} = $vc_base_libs . $vc_link_debug;
@@ -52,7 +70,7 @@
$vc_cpp_opt_common = '/YX /FD /c';
$project{"VC_BASE_CPP_RELEASE"} = $vc_cpp_opt_release . $vc_cpp_def_release . $vc_cpp_opt_common;
$project{"VC_BASE_CPP_DEBUG"} = $vc_cpp_opt_debug . $vc_cpp_def_debug . $vc_cpp_opt_common;
- ExpandGlue("INCPATH",'/I "','" /I "','"');
+ ExpandPath("INCPATH",'/I ',' /I ','');
if ( $text ne "" ) { $vc_inc = $text . " "; $text = ""; } else { $vc_inc = ""; }
ExpandGlue("DEFINES",'/D "','" /D "','"');
if ( $text ne "" ) { $vc_def = $text . " "; $text = ""; } else { $vc_def = ""; }
diff --git a/tmake/lib/win32-msvc/vclib.t b/tmake/lib/win32-msvc/vclib.t
index e56409e..11cd1d7 100755
--- a/tmake/lib/win32-msvc/vclib.t
+++ b/tmake/lib/win32-msvc/vclib.t
@@ -20,7 +20,7 @@
$vc_cpp_opt_common = '/YX /FD /c';
$project{"VC_BASE_CPP_RELEASE"} = $vc_cpp_opt_release . $vc_cpp_def_release . $vc_cpp_opt_common;
$project{"VC_BASE_CPP_DEBUG"} = $vc_cpp_opt_debug . $vc_cpp_def_debug . $vc_cpp_opt_common;
- ExpandGlue("INCPATH",'/I "','" /I "','"');
+ ExpandPath("INCPATH",'/I ',' /I ','');
if ( $text ne "" ) { $vc_inc = $text . " "; $text = ""; } else { $vc_inc = ""; }
ExpandGlue("DEFINES",'/D "','" /D "','"');
if ( $text ne "" ) { $vc_def = $text . " "; $text = ""; } else { $vc_def = ""; }
generated by cgit v0.12 at 2024-07-17 01:40:55 (GMT)