diff options
author | Dimitri van Heesch <dimitri@stack.nl> | 1999-12-15 19:34:06 (GMT) |
---|---|---|
committer | Dimitri van Heesch <dimitri@stack.nl> | 1999-12-15 19:34:06 (GMT) |
commit | ee8333a5d2ecf84deeb5d05ed8b23c212729cdac (patch) | |
tree | 43e0b215b5d3d2b436509cbb1cd22102aef61b1d /tmake/lib/win32-borland/generic.t | |
parent | 6aa7383e23c850af36c25b87e5737a2e2f635083 (diff) | |
download | Doxygen-ee8333a5d2ecf84deeb5d05ed8b23c212729cdac.zip Doxygen-ee8333a5d2ecf84deeb5d05ed8b23c212729cdac.tar.gz Doxygen-ee8333a5d2ecf84deeb5d05ed8b23c212729cdac.tar.bz2 |
mods for doxygen-0.49-990829
Diffstat (limited to 'tmake/lib/win32-borland/generic.t')
-rwxr-xr-x | tmake/lib/win32-borland/generic.t | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/tmake/lib/win32-borland/generic.t b/tmake/lib/win32-borland/generic.t index 88190d8..0cf8711 100755 --- a/tmake/lib/win32-borland/generic.t +++ b/tmake/lib/win32-borland/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+$//; @@ -141,7 +149,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"); |