updated templates for creation of VC++ 6.0 project files for wxBase/wxMSW/wxUniv static and DLL builds

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11752 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2001-09-30 22:22:58 +00:00
parent 56029a746e
commit 0797afee60
12 changed files with 438 additions and 5449 deletions

View File

@@ -49,6 +49,7 @@
# NotX Not required for the Motif port # NotX Not required for the Motif port
# NotOS2 Not required for the os2Pm port # NotOS2 Not required for the os2Pm port
# LowLevel Low level GUI toolkit file, used by wxUniversal as well # LowLevel Low level GUI toolkit file, used by wxUniversal as well
# Theme implements a wxUniv theme
############################################################################### ###############################################################################
# File name Type Flags # File name Type Flags
@@ -228,34 +229,34 @@ zstream.cpp Common Base
gsocket.c MSW Socket,Base gsocket.c MSW Socket,Base
gsockmsw.c MSW Socket,Base gsockmsw.c MSW Socket,Base
accel.cpp MSW accel.cpp MSW
app.cpp MSW app.cpp MSW LowLevel
automtn.cpp MSW OLE automtn.cpp MSW OLE
bitmap.cpp MSW bitmap.cpp MSW LowLevel
bmpbuttn.cpp MSW bmpbuttn.cpp MSW
brush.cpp MSW brush.cpp MSW LowLevel
button.cpp MSW button.cpp MSW
caret.cpp MSW caret.cpp MSW LowLevel
checkbox.cpp MSW checkbox.cpp MSW
checklst.cpp MSW checklst.cpp MSW
choice.cpp MSW choice.cpp MSW
clipbrd.cpp MSW clipbrd.cpp MSW LowLevel
colordlg.cpp MSW colordlg.cpp MSW
colour.cpp MSW colour.cpp MSW LowLevel
combobox.cpp MSW combobox.cpp MSW
control.cpp MSW control.cpp MSW
curico.cpp MSW curico.cpp MSW
cursor.cpp MSW cursor.cpp MSW LowLevel
data.cpp MSW data.cpp MSW LowLevel
dataobj.cpp MSW OLE dataobj.cpp MSW OLE
dc.cpp MSW dc.cpp MSW LowLevel
dcclient.cpp MSW dcclient.cpp MSW LowLevel
dcmemory.cpp MSW dcmemory.cpp MSW LowLevel
dcprint.cpp MSW dcprint.cpp MSW LowLevel
dcscreen.cpp MSW dcscreen.cpp MSW LowLevel
dde.cpp MSW Base dde.cpp MSW Base
dialog.cpp MSW dialog.cpp MSW
dialup.cpp MSW dialup.cpp MSW
dib.cpp MSW dib.cpp MSW LowLevel
dibutils.cpp MSW dibutils.cpp MSW
dir.cpp MSW Base dir.cpp MSW Base
dirdlg.cpp MSW Win32Only dirdlg.cpp MSW Win32Only
@@ -267,25 +268,25 @@ helpbest.cpp MSW Win32Only
evtloop.cpp MSW LowLevel evtloop.cpp MSW LowLevel
fdrepdlg.cpp MSW Win32Only fdrepdlg.cpp MSW Win32Only
filedlg.cpp MSW filedlg.cpp MSW
font.cpp MSW font.cpp MSW LowLevel
fontdlg.cpp MSW fontdlg.cpp MSW
fontenum.cpp MSW fontenum.cpp MSW LowLevel
fontutil.cpp MSW fontutil.cpp MSW LowLevel
frame.cpp MSW frame.cpp MSW
gauge95.cpp MSW Win32Only gauge95.cpp MSW Win32Only
gaugemsw.cpp MSW NotWin32 gaugemsw.cpp MSW NotWin32
gdiimage.cpp MSW gdiimage.cpp MSW LowLevel
gdiobj.cpp MSW gdiobj.cpp MSW LowLevel
glcanvas.cpp MSW glcanvas.cpp MSW
helpchm.cpp MSW Win32Only helpchm.cpp MSW Win32Only
helpwin.cpp MSW helpwin.cpp MSW
icon.cpp MSW icon.cpp MSW LowLevel
imaglist.cpp MSW Win32Only,LowLevel imaglist.cpp MSW Win32Only,LowLevel
iniconf.cpp MSW NotWin32 iniconf.cpp MSW NotWin32
joystick.cpp MSW joystick.cpp MSW
listbox.cpp MSW listbox.cpp MSW
listctrl.cpp MSW Win32Only listctrl.cpp MSW Win32Only
main.cpp MSW Base main.cpp MSW LowLevel,Base
mdi.cpp MSW mdi.cpp MSW
menu.cpp MSW menu.cpp MSW
menuitem.cpp MSW menuitem.cpp MSW
@@ -297,18 +298,18 @@ nativdlg.cpp MSW
notebook.cpp MSW Win32Only notebook.cpp MSW Win32Only
oleutils.cpp MSW OLE oleutils.cpp MSW OLE
ownerdrw.cpp MSW ownerdrw.cpp MSW
palette.cpp MSW palette.cpp MSW LowLevel
pen.cpp MSW pen.cpp MSW LowLevel
penwin.cpp MSW penwin.cpp MSW
printdlg.cpp MSW printdlg.cpp MSW
printwin.cpp MSW printwin.cpp MSW
radiobox.cpp MSW radiobox.cpp MSW
radiobut.cpp MSW radiobut.cpp MSW
regconf.cpp MSW Win32Only,Base regconf.cpp MSW Win32Only,Base
region.cpp MSW region.cpp MSW LowLevel
registry.cpp MSW Win32Only,Base registry.cpp MSW Win32Only,Base
scrolbar.cpp MSW scrolbar.cpp MSW
settings.cpp MSW settings.cpp MSW LowLevel
slider95.cpp MSW Win32Only slider95.cpp MSW Win32Only
slidrmsw.cpp MSW NotWin32 slidrmsw.cpp MSW NotWin32
snglinst.cpp MSW Base snglinst.cpp MSW Base
@@ -326,7 +327,7 @@ tbarmsw.cpp MSW NotWin32
textctrl.cpp MSW textctrl.cpp MSW
tglbtn.cpp MSW tglbtn.cpp MSW
thread.cpp MSW Win32Only,Base thread.cpp MSW Win32Only,Base
timer.cpp MSW timer.cpp MSW LowLevel
tooltip.cpp MSW Win32Only tooltip.cpp MSW Win32Only
toplevel.cpp MSW LowLevel toplevel.cpp MSW LowLevel
treectrl.cpp MSW Win32Only treectrl.cpp MSW Win32Only
@@ -334,7 +335,7 @@ utils.cpp MSW Base
utilsexc.cpp MSW Base utilsexc.cpp MSW Base
uuid.cpp MSW OLE uuid.cpp MSW OLE
wave.cpp MSW wave.cpp MSW
window.cpp MSW window.cpp MSW LowLevel
dialup.cpp Unix dialup.cpp Unix
dir.cpp Unix Base dir.cpp Unix Base
@@ -352,6 +353,7 @@ button.cpp Univ
checkbox.cpp Univ checkbox.cpp Univ
checklst.cpp Univ checklst.cpp Univ
colschem.cpp Univ colschem.cpp Univ
combobox.cpp Univ
control.cpp Univ control.cpp Univ
dialog.cpp Univ dialog.cpp Univ
framuniv.cpp Univ framuniv.cpp Univ
@@ -376,9 +378,9 @@ statline.cpp Univ
stattext.cpp Univ stattext.cpp Univ
textctrl.cpp Univ textctrl.cpp Univ
theme.cpp Univ theme.cpp Univ
gtk.cpp Univ gtk.cpp Univ Theme
winuniv.cpp Univ winuniv.cpp Univ
win32.cpp Univ win32.cpp Univ Theme
gsockgtk.c GTK LowLevel gsockgtk.c GTK LowLevel
win_gtk.c GTK LowLevel win_gtk.c GTK LowLevel

View File

@@ -1,17 +1,24 @@
#!############################################################################# #!#############################################################################
#! File: vc6lib.t #! File: vc6app.t
#! Purpose: tmake template file from which the VC++ 6.0 project file for #! Purpose: tmake template file from which the VC++ 6.0 project file for
#! building static wxWindows library wxvc.dsp is generated by running #! building wxWindows applications are generated by running
#! tmake -t vc6lib wxwin.pro -o wxvc.dsp #! tmake -t vc6lib wxwin.pro -o wxvc.dsp
#! you may append CONFIG+= to the end of the line, i.e.
#! tmake -t vc6lib wxwin.pro -o wxvc.dsp CONFIG+=unicode
#! tmake -t vc6lib wxwin.pro -o wxvc.dsp CONFIG+=dll
#! Author: Vadim Zeitlin #! Author: Vadim Zeitlin
#! Created: 29.09.01 #! Created: 29.09.01
#! Version: $Id$ #! Version: $Id$
#!############################################################################# #!#############################################################################
#${ #${
#! what kind of app are we building - this is used as prefix for the build
#! output dir
$KIND="";
if ( Config("wx") ) { if ( Config("wx") ) {
Project('CONFIG += windows'); Project('CONFIG += windows');
} }
if ( Config("wxbase") ) { if ( Config("wxbase") || Config("wxuniv") ) {
Project('CONFIG += wx'); Project('CONFIG += wx');
} }
if ( Config("wx") ) { if ( Config("wx") ) {
@@ -46,23 +53,37 @@
$UNICODE_FLAGS=" "; $UNICODE_FLAGS=" ";
} }
if ( Config("dll") ) { if ( Config("wx") ) {
$DLL="Dll"; if ( Config("wxbase") ) {
$DLL_OR_LIB=(Config("wxbase") ? "wxbase" : "wxmsw") . "232"; $KIND="Base";
$DLL_FLAGS="/D WXUSINGDLL "; $DLL_OR_LIB="wxbase";
$EXTRA_LIBS=""; }
elsif ( Config("wxuniv") ) {
$KIND="Univ";
$DLL_OR_LIB="wxuniv";
}
else {
$DLL_OR_LIB="wxmsw"
}
$project{"TARGET"} .= "Dll"; if ( Config("dll") ) {
$project{"MAKEFILE"} .= "Dll"; $DLL="Dll";
}
else { $DLL_OR_LIB .= "232";
$DLL=""; $DLL_FLAGS="/D WXUSINGDLL ";
$DLL_OR_LIB=Config("wxbase") ? "wxbase" : "wxmsw"; $EXTRA_LIBS="";
$DLL_FLAGS=" ";
#! actually this should depend on the contents of setup.h! $project{"TARGET"} .= "Dll";
$EXTRA_LIBS="zlib regex"; $project{"MAKEFILE"} .= "Dll";
if ( !Config("wxbase") ) { }
$EXTRA_LIBS.=" png jpeg tiff"; else {
$DLL="";
$DLL_FLAGS=" ";
#! actually this should depend on the contents of setup.h!
$EXTRA_LIBS="zlib regex";
if ( !Config("wxbase") ) {
$EXTRA_LIBS.=" png jpeg tiff";
}
} }
} }
@@ -107,6 +128,10 @@
$vc_base_libs .= 'wsock32.lib '; $vc_base_libs .= 'wsock32.lib ';
$vc_link_release = "$WXDIR\\lib\\$DLL_OR_LIB$UNICODE_SUFFIX.lib "; $vc_link_release = "$WXDIR\\lib\\$DLL_OR_LIB$UNICODE_SUFFIX.lib ";
$vc_link_debug = "$WXDIR\\lib\\$DLL_OR_LIB$UNICODE_SUFFIX$DEBUG_SUFFIX.lib "; $vc_link_debug = "$WXDIR\\lib\\$DLL_OR_LIB$UNICODE_SUFFIX$DEBUG_SUFFIX.lib ";
foreach ( split(/ /, $EXTRA_LIBS) ) {
$vc_link_release .= "$WXDIR\\lib\\$_.lib ";
$vc_link_debug .= "$WXDIR\\lib\\$_" . "d.lib ";
}
} }
$vc_link_release .= '/nologo /subsystem:console /machine:I386'; $vc_link_release .= '/nologo /subsystem:console /machine:I386';
$vc_link_debug .= '/nologo /subsystem:console /debug /machine:I386 /pdbtype:sept'; $vc_link_debug .= '/nologo /subsystem:console /debug /machine:I386 /pdbtype:sept';
@@ -135,7 +160,7 @@
$vc_cpp_opt_common1 = '/nologo /W4 '; $vc_cpp_opt_common1 = '/nologo /W4 ';
$vc_cpp_opt_release = $vc_cpp_opt_common1 . '/O1 '; $vc_cpp_opt_release = $vc_cpp_opt_common1 . '/O2 ';
$vc_cpp_opt_debug = $vc_cpp_opt_common1 . '/Zi /Od '; $vc_cpp_opt_debug = $vc_cpp_opt_common1 . '/Zi /Od ';
$vc_cpp_opt_common = '/YX /FD /c'; $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_RELEASE"} = $vc_cpp_opt_release . $vc_cpp_def_release . $vc_cpp_opt_common;
@@ -146,19 +171,36 @@
if ( $text ne "" ) { $vc_def = $text . " "; $text = ""; } else { $vc_def = ""; } if ( $text ne "" ) { $vc_def = $text . " "; $text = ""; } else { $vc_def = ""; }
if ( Config("wx") ) { if ( Config("wx") ) {
#! define wxWindows compilation flags #! define wxWindows compilation flags
$vc_def .= '/D _WIN32 /D WINVER=0x400 /D _MT '; $vc_def .= '/D WIN32 /D WINVER=0x400 /D _MT ';
if ( Config("wxbase") ) { if ( Config("wxbase") ) {
$vc_def .= '/D wxUSE_GUI=0 '; $vc_def .= '/D wxUSE_GUI=0 ';
$vc_inc_debug .= "/I$WXDIR\\lib\\based ";
$vc_inc_release .= "/I$WXDIR\\lib\\base ";
} }
else { else {
$vc_def .= '/D wxUSE_GUI=1 '; $vc_def .= '/D wxUSE_GUI=1 ';
if ( Config("wxuniv") ) {
$vc_def .= '/D "__WXUNIVERSAL__" ';
$vc_inc_debug .= "/I$WXDIR\\lib\\univd ";
$vc_inc_release .= "/I$WXDIR\\lib\\univ ";
}
else {
$vc_inc_debug .= "/I$WXDIR\\lib\\mswd ";
$vc_inc_release .= "/I$WXDIR\\lib\\msw ";
}
} }
} }
else {
$vc_inc_debug =
$vc_inc_release = "";
}
$project{"VC_CPP_INCLUDE"} = $vc_inc; $project{"VC_CPP_INCLUDE"} = $vc_inc;
$project{"VC_CPP_RELEASE"} = $vc_cpp_opt_release . $vc_inc . $vc_cpp_def_release . $vc_def . $vc_cpp_opt_common; $project{"VC_CPP_RELEASE"} = $vc_cpp_opt_release . $vc_inc . $vc_inc_release . $vc_cpp_def_release . $vc_def . $vc_cpp_opt_common;
$project{"VC_CPP_DEBUG"} = $vc_cpp_opt_debug . $vc_inc . $vc_cpp_def_debug . $vc_def . $vc_cpp_opt_common; $project{"VC_CPP_DEBUG"} = $vc_cpp_opt_debug . $vc_inc . $vc_inc_debug . $vc_cpp_def_debug . $vc_def . $vc_cpp_opt_common;
if ( Project('RES_FILE') ) { if ( Project('RES_FILE') ) {
tmake_error(".res files are not supported, use .rc."); tmake_error(".res files are not supported, use .rc.");
@@ -183,12 +225,6 @@
@files = split(/\s+/,$project{"RC_FILE"}); @files = split(/\s+/,$project{"RC_FILE"});
foreach ( @files ) { $all_files{$_} = "r" }; foreach ( @files ) { $all_files{$_} = "r" };
if ( $moc_aware ) {
@files = split(/\s+/,$project{"_HDRMOC"});
foreach ( @files ) { $all_files{$_} = "m"; }
@files = split(/\s+/,$project{"_SRCMOC"});
foreach ( @files ) { $all_files{$_} = "i"; }
}
%file_names = (); %file_names = ();
foreach $f ( %all_files ) { foreach $f ( %all_files ) {
$n = $f; $n = $f;
@@ -233,13 +269,13 @@ RSC=rc.exe
# PROP BASE Use_MFC 0 # PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0 # PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "Release#$ $text = "$UNICODE$DLL" . '"' # PROP BASE Output_Dir #$ $text = "\"${KIND}Release$UNICODE$DLL\""
# PROP BASE Intermediate_Dir "Release#$ $text = "$UNICODE$DLL" . '"' # PROP BASE Intermediate_Dir #$ $text = "\"${KIND}Release$UNICODE$DLL\""
# PROP BASE Target_Dir "" # PROP BASE Target_Dir ""
# PROP Use_MFC 0 # PROP Use_MFC 0
# PROP Use_Debug_Libraries 0 # PROP Use_Debug_Libraries 0
# PROP Output_Dir "Release#$ $text = "$UNICODE$DLL" . '"' # PROP Output_Dir #$ $text = "\"${KIND}Release$UNICODE$DLL\""
# PROP Intermediate_Dir "Release#$ $text = "$UNICODE$DLL" . '"' # PROP Intermediate_Dir #$ $text = "${KIND}Release$UNICODE$DLL\""
#$ Config("windows") && ($text='# PROP Ignore_Export_Lib 0'); #$ Config("windows") && ($text='# PROP Ignore_Export_Lib 0');
# PROP Target_Dir "" # PROP Target_Dir ""
# ADD BASE CPP #$ Expand("VC_BASE_CPP_RELEASE"); # ADD BASE CPP #$ Expand("VC_BASE_CPP_RELEASE");
@@ -261,13 +297,13 @@ LINK32=link.exe
# PROP BASE Use_MFC 0 # PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1 # PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "Debug#$ $text = "$UNICODE$DLL" . '"' # PROP BASE Output_Dir #$ $text = "\"${KIND}Debug$UNICODE$DLL\""
# PROP BASE Intermediate_Dir "Debug#$ $text = "$UNICODE$DLL" . '"' # PROP BASE Intermediate_Dir #$ $text = "\"${KIND}Debug$UNICODE$DLL\""
# PROP BASE Target_Dir "" # PROP BASE Target_Dir ""
# PROP Use_MFC 0 # PROP Use_MFC 0
# PROP Use_Debug_Libraries 1 # PROP Use_Debug_Libraries 1
# PROP Output_Dir "Debug#$ $text = "$UNICODE$DLL" . '"' # PROP Output_Dir #$ $text = "\"${KIND}Debug$UNICODE$DLL\""
# PROP Intermediate_Dir "Debug#$ $text = "$UNICODE$DLL" . '"' # PROP Intermediate_Dir #$ $text = "\"${KIND}Debug$UNICODE$DLL\""
#$ Config("windows") && ($text='# PROP Ignore_Export_Lib 0'); #$ Config("windows") && ($text='# PROP Ignore_Export_Lib 0');
# PROP Target_Dir "" # PROP Target_Dir ""
# ADD BASE CPP #$ Expand("VC_BASE_CPP_DEBUG"); # ADD BASE CPP #$ Expand("VC_BASE_CPP_DEBUG");

View File

@@ -30,6 +30,19 @@
my $tag = $file =~ /\.c$/ ? "WXCSRCS" : "WXCOMMONSRCS"; my $tag = $file =~ /\.c$/ ? "WXCSRCS" : "WXCOMMONSRCS";
$project{$tag} .= $file . " " $project{$tag} .= $file . " "
} }
foreach $file (sort keys %wxWXINCLUDE) {
next if $wxWXINCLUDE{$file} !~ /\bB\b/;
next if $file =~ /setup.h/;
next if $file =~ /[^.]*.cpp$/;
$project{"WXHEADERS"} .= $file . " "
}
foreach $file (sort keys %wxMSWINCLUDE) {
next if $wxMSWINCLUDE{$file} !~ /\bB\b/;
next if $file =~ /setup0?.h/;
$project{"WXMSWHEADERS"} .= $file . " "
}
#$} #$}
# Microsoft Developer Studio Project File - Name="wxBase" - Package Owner=<4> # Microsoft Developer Studio Project File - Name="wxBase" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00 # Microsoft Developer Studio Generated Build File, Format Version 6.00
@@ -65,16 +78,16 @@ RSC=rc.exe
# PROP BASE Use_MFC 0 # PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0 # PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "lib" # PROP BASE Output_Dir "..\lib"
# PROP BASE Intermediate_Dir "src/msw/BaseRelease" # PROP BASE Intermediate_Dir "..\BaseRelease"
# PROP BASE Target_Dir "" # PROP BASE Target_Dir ""
# PROP Use_MFC 0 # PROP Use_MFC 0
# PROP Use_Debug_Libraries 0 # PROP Use_Debug_Libraries 0
# PROP Output_Dir "lib" # PROP Output_Dir "..\lib"
# PROP Intermediate_Dir "src/msw/BaseRelease" # PROP Intermediate_Dir "..\BaseRelease"
# PROP Target_Dir "" # PROP Target_Dir ""
# ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MT" /YX /FD /c # ADD BASE CPP /nologo /MD /W4 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MT" /YX /FD /c
# ADD CPP /nologo /MD /W4 /Zi /O2 /I "$(WXWIN)\include" /I "$(WXWIN)\src\regex" /I "$(WXWIN)\src\zlib" /D "NDEBUG" /D wxUSE_GUI=0 /D WIN95=1 /D "__WIN95__" /D "WIN32" /D "_WIN32" /D WINVER=0x400 /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN32__" /D "_MT" /Yu"wx/wxprec.h" /FD /c # ADD CPP /nologo /MD /W4 /O2 /I "../lib/base" /I "../include" /I "./regex" /I "./zlib" /D "NDEBUG" /D wxUSE_GUI=0 /D "WIN32" /D WINVER=0x400 /D "_MT" /Yu"wx/wxprec.h" /FD /c
# ADD BASE RSC /l 0x409 # ADD BASE RSC /l 0x409
# ADD RSC /l 0x409 # ADD RSC /l 0x409
BSC32=bscmake.exe BSC32=bscmake.exe
@@ -82,30 +95,30 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo # ADD BSC32 /nologo
LIB32=link.exe -lib LIB32=link.exe -lib
# ADD BASE LIB32 /nologo # ADD BASE LIB32 /nologo
# ADD LIB32 /nologo /out:"lib\wxBase.lib" # ADD LIB32 /nologo /out:"..\lib\wxbase.lib"
!ELSEIF "$(CFG)" == "wxBase - Win32 Debug" !ELSEIF "$(CFG)" == "wxBase - Win32 Debug"
# PROP BASE Use_MFC 0 # PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1 # PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "lib" # PROP BASE Output_Dir "..\lib"
# PROP BASE Intermediate_Dir "src/msw/BaseDebug" # PROP BASE Intermediate_Dir "..\BaseDebug"
# PROP BASE Target_Dir "" # PROP BASE Target_Dir ""
# PROP Use_MFC 0 # PROP Use_MFC 0
# PROP Use_Debug_Libraries 1 # PROP Use_Debug_Libraries 1
# PROP Output_Dir "lib" # PROP Output_Dir "..\lib"
# PROP Intermediate_Dir "src/msw/BaseDebug" # PROP Intermediate_Dir "..\BaseDebug"
# PROP Target_Dir "" # PROP Target_Dir ""
# ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MT" /YX /FD /c # ADD BASE CPP /nologo /MDd /W4 /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MT" /YX /FD /c
# ADD CPP /nologo /MDd /W4 /Zi /Od /I "$(WXWIN)\include" /I "$(WXWIN)\src\regex" /I "$(WXWIN)\src\zlib" /D "_DEBUG" /D DEBUG=1 /D WXDEBUG=1 /D "__WXDEBUG__" /D wxUSE_GUI=0 /D "__WIN95__" /D "WIN32" /D "_WIN32" /D WINVER=0x400 /D "__WINDOWS__" /D "__WIN32__" /D "__WXMSW__" /D "_MT" /Fr /Yu"wx/wxprec.h" /FD /c # ADD CPP /nologo /MDd /W4 /Zi /Od /I "../lib/based" /I "../include" /I "./regex" /I "./zlib" /D "_DEBUG" /D wxUSE_GUI=0 /D "WIN32" /D "__WXDEBUG__" /D WINVER=0x400 /D "_MT" /Yu"wx/wxprec.h" /FD /c
# ADD BASE RSC /l 0x409 # ADD BASE RSC /l 0x409
# ADD RSC /l 0x409 # ADD RSC /l 0x409
BSC32=bscmake.exe BSC32=bscmake.exe
# ADD BASE BSC32 /nologo # ADD BASE BSC32 /nologo
# ADD BSC32 /nologo /o"lib/wxBase.bsc" # ADD BSC32 /nologo /o"../lib/wxbase.bsc"
LIB32=link.exe -lib LIB32=link.exe -lib
# ADD BASE LIB32 /nologo # ADD BASE LIB32 /nologo
# ADD LIB32 /nologo /out:"lib\wxBased.lib" # ADD LIB32 /nologo /out:"..\lib\wxbased.lib"
!ENDIF !ENDIF
@@ -114,16 +127,68 @@ LIB32=link.exe -lib
# Name "wxBase - Win32 Release" # Name "wxBase - Win32 Release"
# Name "wxBase - Win32 Debug" # Name "wxBase - Win32 Debug"
# Begin Group "Common Files"
# PROP Default_Filter ""
#$ ExpandGlue("WXCOMMONSRCS", "# Begin Source File\n\nSOURCE=.\\common\\", "\n# End Source File\n# Begin Source File\n\nSOURCE=.\\common\\", "\n# End Source File\n");
#$ ExpandGlue("WXCSRCS", "# Begin Source File\n\nSOURCE=.\\common\\", "\n# SUBTRACT CPP /YX /Yc /Yu\n# End Source File\n# Begin Source File\n\nSOURCE=.\\common\\", "\n# SUBTRACT CPP /YX /Yc /Yu\n# End Source File\n");
# End Group
# Begin Group "MSW Files"
# PROP Default_Filter "" # PROP Default_Filter ""
# Begin Source File # Begin Source File
SOURCE=.\src\msw\dummy.cpp SOURCE=.\msw\dummy.cpp
# ADD CPP /Yc"wx/wxprec.h" # ADD CPP /Yc"wx/wxprec.h"
# End Source File # End Source File
#$ ExpandGlue("WXCOMMONSRCS", "# Begin Source File\n\nSOURCE=.\\src\\common\\", "\n# End Source File\n# Begin Source File\n\nSOURCE=.\\src\\common\\", "\n# End Source File\n"); #$ ExpandGlue("WXMSWSRCS", "# Begin Source File\n\nSOURCE=.\\msw\\", "\n# End Source File\n# Begin Source File\n\nSOURCE=.\\msw\\", "\n# End Source File\n");
#$ ExpandGlue("WXMSWSRCS", "# Begin Source File\n\nSOURCE=.\\src\\msw\\", "\n# End Source File\n# Begin Source File\n\nSOURCE=.\\src\\msw\\", "\n# End Source File\n"); #$ ExpandGlue("WXMSWCSRCS", "# Begin Source File\n\nSOURCE=.\\msw\\", "\n# SUBTRACT CPP /YX /Yc /Yu\n# End Source File\n# Begin Source File\n\nSOURCE=.\\msw\\", "\n# SUBTRACT CPP /YX /Yc /Yu\n# End Source File\n");
#$ ExpandGlue("WXCSRCS", "# Begin Source File\n\nSOURCE=.\\src\\common\\", "\n# SUBTRACT CPP /YX /Yc /Yu\n# End Source File\n# Begin Source File\n\nSOURCE=.\\src\\common\\", "\n# SUBTRACT CPP /YX /Yc /Yu\n# End Source File\n"); # End Group
#$ ExpandGlue("WXMSWCSRCS", "# Begin Source File\n\nSOURCE=.\\src\\msw\\", "\n# SUBTRACT CPP /YX /Yc /Yu\n# End Source File\n# Begin Source File\n\nSOURCE=.\\src\\msw\\", "\n# SUBTRACT CPP /YX /Yc /Yu\n# End Source File\n"); # Begin Group "Headers"
# PROP Default_Filter ""
# Begin Group "Setup"
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\include\wx\msw\setup0.h
!IF "$(CFG)" == "wxBase - Win32 Release"
# Begin Custom Build - Creating wx/setup.h from $(InputPath)
InputPath=..\include\wx\msw\setup0.h
"../lib/base/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy $(InputPath) ..\lib\base\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "wxBase - Win32 Debug"
# Begin Custom Build - Creating wx/setup.h from $(InputPath)
InputPath=..\include\wx\msw\setup0.h
"../lib/based/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy $(InputPath) ..\lib\based\wx\setup.h
# End Custom Build
!ENDIF
# End Source File
# End Group
# Begin Group "Common"
# PROP Default_Filter ""
#$ ExpandGlue("WXHEADERS", "# Begin Source File\n\nSOURCE=..\\include\\wx\\", "\n# End Source File\n# Begin Source File\n\nSOURCE=..\\include\\wx\\", "\n# End Source File\n");
# End Group
# Begin Group "MSW"
# PROP Default_Filter ""
#$ ExpandGlue("WXMSWHEADERS", "# Begin Source File\n\nSOURCE=..\\include\\wx\\msw\\", "\n# End Source File\n# Begin Source File\n\nSOURCE=..\\include\\wx\\msw\\", "\n# End Source File\n");
# End Group
# End Group
# End Target # End Target
# End Project # End Project
#! vi: set sta ts=8 sw=4 noet nolist tw=0 ft=make:

View File

@@ -30,6 +30,21 @@
my $tag = $file =~ /\.c$/ ? "WXCSRCS" : "WXCOMMONSRCS"; my $tag = $file =~ /\.c$/ ? "WXCSRCS" : "WXCOMMONSRCS";
$project{$tag} .= $file . " " $project{$tag} .= $file . " "
} }
foreach $file (sort keys %wxWXINCLUDE) {
next if $wxWXINCLUDE{$file} !~ /\bB\b/;
next if $file =~ /setup.h/;
next if $file =~ /[^.]*.cpp$/;
$project{"WXHEADERS"} .= $file . " "
}
foreach $file (sort keys %wxMSWINCLUDE) {
next if $wxMSWINCLUDE{$file} !~ /\bB\b/;
next if $file =~ /setup0?.h/;
$project{"WXMSWHEADERS"} .= $file . " "
}
$project{"WXVERSION"} = "232";
#$} #$}
# Microsoft Developer Studio Project File - Name="wxBaseDll" - Package Owner=<4> # Microsoft Developer Studio Project File - Name="wxBaseDll" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00 # Microsoft Developer Studio Generated Build File, Format Version 6.00
@@ -66,53 +81,53 @@ RSC=rc.exe
# PROP BASE Use_MFC 0 # PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0 # PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "Release" # PROP BASE Output_Dir "../lib"
# PROP BASE Intermediate_Dir "Release" # PROP BASE Intermediate_Dir "../BaseDllRelease"
# PROP BASE Target_Dir "" # PROP BASE Target_Dir ""
# PROP Use_MFC 0 # PROP Use_MFC 0
# PROP Use_Debug_Libraries 0 # PROP Use_Debug_Libraries 0
# PROP Output_Dir "BaseDllRelease" # PROP Output_Dir "../lib"
# PROP Intermediate_Dir "BaseDllRelease" # PROP Intermediate_Dir "../BaseDllRelease"
# PROP Ignore_Export_Lib 0 # PROP Ignore_Export_Lib 0
# PROP Target_Dir "" # PROP Target_Dir ""
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXBASEDLL_EXPORTS" /YX /FD /c # ADD BASE CPP /nologo /MD /W4 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MT" /D "_USRDLL" /D "WXBASEDLL_EXPORTS" /YX /FD /c
# ADD CPP /nologo /MT /W4 /O2 /I "$(wx)\include" /I "$(wx)\src\regex" /I "$(wx)\src\zlib" /D "NDEBUG" /D wxUSE_GUI=0 /D "__WIN95__" /D "WIN32" /D "_WIN32" /D WINVER=0x400 /D "__WINDOWS__" /D "__WIN32__" /D "__WXMSW__" /D "_MT" /D "WXMAKINGDLL" /Yu"wx/wxprec.h" /FD /c # ADD CPP /nologo /MD /W4 /O2 /I "../lib/basedll" /I "../include" /I "./regex" /I "./zlib" /D "NDEBUG" /D wxUSE_GUI=0 /D "WIN32" /D WINVER=0x400 /D "_MT" /D "WXMAKINGDLL" /Yu"wx/wxprec.h" /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /i "$(wx)\include" /d "NDEBUG" # ADD RSC /l 0x409 /i "../include" /d "NDEBUG"
BSC32=bscmake.exe BSC32=bscmake.exe
# ADD BASE BSC32 /nologo # ADD BASE BSC32 /nologo
# ADD BSC32 /nologo # ADD BSC32 /nologo
LINK32=link.exe LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"BaseDllRelease/wxbase221.dll" # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"../lib/wxbase#$ $text = $project{"WXVERSION"} . '.dll"'
# ADD LINK32 kernel32.lib user32.lib advapi32.lib wsock32.lib /nologo /version:2.2 /dll /machine:I386 /out:"BaseDllRelease/wxbase221.dll" # ADD LINK32 kernel32.lib user32.lib advapi32.lib wsock32.lib ../lib/zlib.lib ../lib/regex.lib /nologo /version:2.3 /dll /machine:I386 /out:"../lib/wxbase#$ $text = $project{"WXVERSION"} . '.dll"'
!ELSEIF "$(CFG)" == "wxBaseDll - Win32 Debug" !ELSEIF "$(CFG)" == "wxBaseDll - Win32 Debug"
# PROP BASE Use_MFC 0 # PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1 # PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "Debug" # PROP BASE Output_Dir "../lib"
# PROP BASE Intermediate_Dir "Debug" # PROP BASE Intermediate_Dir "../BaseDllDebug"
# PROP BASE Target_Dir "" # PROP BASE Target_Dir ""
# PROP Use_MFC 0 # PROP Use_MFC 0
# PROP Use_Debug_Libraries 1 # PROP Use_Debug_Libraries 1
# PROP Output_Dir "BaseDllDebug" # PROP Output_Dir "../lib"
# PROP Intermediate_Dir "BaseDllDebug" # PROP Intermediate_Dir "../BaseDllDebug"
# PROP Ignore_Export_Lib 0 # PROP Ignore_Export_Lib 0
# PROP Target_Dir "" # PROP Target_Dir ""
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXBASEDLL_EXPORTS" /YX /FD /GZ /c # ADD BASE CPP /nologo /MDd /W4 /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MT" /D "_USRDLL" /D "WXBASEDLL_EXPORTS" /YX /FD /c
# ADD CPP /nologo /MTd /W4 /Gm /Zi /Od /I "$(wx)\include" /I "$(wx)\src\regex" /I "$(wx)\src\zlib" /D "_DEBUG" /D wxUSE_GUI=0 /D "__WIN95__" /D "WIN32" /D "_WIN32" /D WINVER=0x400 /D "__WINDOWS__" /D "__WIN32__" /D "__WXMSW__" /D "_MT" /D "WXMAKINGDLL" /D "__WXDEBUG__" /Yu"wx/wxprec.h" /FD /GZ /c # ADD CPP /nologo /MDd /W4 /Zi /Od /I "../lib/basedlld" /I "../include" /I "./regex" /I "./zlib" /D "_DEBUG" /D wxUSE_GUI=0 /D "WIN32" /D WINVER=0x400 /D "_MT" /D "WXMAKINGDLL" /Yu"wx/wxprec.h" /FD /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /i "$(wx)\include" /d "_DEBUG" # ADD RSC /l 0x409 /i "../include" /d "_DEBUG"
BSC32=bscmake.exe BSC32=bscmake.exe
# ADD BASE BSC32 /nologo # ADD BASE BSC32 /nologo
# ADD BSC32 /nologo # ADD BSC32 /nologo
LINK32=link.exe LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept /out:"BaseDllDebug/wxbase221d.dll" # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept /out:"../lib/wxbase#$ $text = $project{"WXVERSION"} . 'd.dll"'
# ADD LINK32 kernel32.lib user32.lib advapi32.lib wsock32.lib /nologo /version:2.2 /dll /debug /machine:I386 /pdbtype:sept /out:"BaseDllDebug/wxbase221d.dll" # ADD LINK32 kernel32.lib user32.lib advapi32.lib wsock32.lib ../lib/zlibd.lib ../lib/regexd.lib /nologo /version:2.2 /dll /debug /machine:I386 /pdbtype:sept /out:"../lib/wxbase#$ $text = $project{"WXVERSION"} . 'd.dll"'
!ENDIF !ENDIF
@@ -122,16 +137,70 @@ LINK32=link.exe
# Name "wxBaseDll - Win32 Debug" # Name "wxBaseDll - Win32 Debug"
# Begin Source File # Begin Source File
SOURCE=.\src\common\base.rc SOURCE=.\common\base.rc
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\src\msw\dummydll.cpp SOURCE=.\msw\dummydll.cpp
# ADD CPP /Yc"wx/wxprec.h" # ADD CPP /Yc"wx/wxprec.h"
# End Source File # End Source File
#$ ExpandGlue("WXCOMMONSRCS", "# Begin Source File\n\nSOURCE=.\\src\\common\\", "\n# End Source File\n# Begin Source File\n\nSOURCE=.\\src\\common\\", "\n# End Source File\n"); # Begin Group "Common Files"
#$ ExpandGlue("WXMSWSRCS", "# Begin Source File\n\nSOURCE=.\\src\\msw\\", "\n# End Source File\n# Begin Source File\n\nSOURCE=.\\src\\msw\\", "\n# End Source File\n");
#$ ExpandGlue("WXCSRCS", "# Begin Source File\n\nSOURCE=.\\src\\common\\", "\n# SUBTRACT CPP /YX /Yc /Yu\n# End Source File\n# Begin Source File\n\nSOURCE=.\\src\\common\\", "\n# SUBTRACT CPP /YX /Yc /Yu\n# End Source File\n"); # PROP Default_Filter ""
#$ ExpandGlue("WXMSWCSRCS", "# Begin Source File\n\nSOURCE=.\\src\\msw\\", "\n# SUBTRACT CPP /YX /Yc /Yu\n# End Source File\n# Begin Source File\n\nSOURCE=.\\src\\msw\\", "\n# SUBTRACT CPP /YX /Yc /Yu\n# End Source File\n"); #$ ExpandGlue("WXCOMMONSRCS", "# Begin Source File\n\nSOURCE=.\\common\\", "\n# End Source File\n# Begin Source File\n\nSOURCE=.\\common\\", "\n# End Source File\n");
#$ ExpandGlue("WXCSRCS", "# Begin Source File\n\nSOURCE=.\\common\\", "\n# SUBTRACT CPP /YX /Yc /Yu\n# End Source File\n# Begin Source File\n\nSOURCE=.\\common\\", "\n# SUBTRACT CPP /YX /Yc /Yu\n# End Source File\n");
# End Group
# Begin Group "MSW Files"
# PROP Default_Filter ""
#$ ExpandGlue("WXMSWSRCS", "# Begin Source File\n\nSOURCE=.\\msw\\", "\n# End Source File\n# Begin Source File\n\nSOURCE=.\\msw\\", "\n# End Source File\n");
#$ ExpandGlue("WXMSWCSRCS", "# Begin Source File\n\nSOURCE=.\\msw\\", "\n# SUBTRACT CPP /YX /Yc /Yu\n# End Source File\n# Begin Source File\n\nSOURCE=.\\msw\\", "\n# SUBTRACT CPP /YX /Yc /Yu\n# End Source File\n");
# End Group
# Begin Group "Headers"
# PROP Default_Filter ""
# Begin Group "Setup"
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\include\wx\msw\setup0.h
!IF "$(CFG)" == "wxBaseDll - Win32 Release"
# Begin Custom Build - Creating wx/setup.h from $(InputPath)
InputPath=..\include\wx\msw\setup0.h
"../lib/basedll/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy $(InputPath) ..\lib\basedll\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "wxBaseDll - Win32 Debug"
# Begin Custom Build - Creating wx/setup.h from $(InputPath)
InputPath=..\include\wx\msw\setup0.h
"../lib/basedlld/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy $(InputPath) ..\lib\basedlld\wx\setup.h
# End Custom Build
!ENDIF
# End Source File
# End Group
# Begin Group "Common"
# PROP Default_Filter ""
#$ ExpandGlue("WXHEADERS", "# Begin Source File\n\nSOURCE=..\\include\\wx\\", "\n# End Source File\n# Begin Source File\n\nSOURCE=..\\include\\wx\\", "\n# End Source File\n");
# End Group
# Begin Group "MSW"
# PROP Default_Filter ""
#$ ExpandGlue("WXMSWHEADERS", "# Begin Source File\n\nSOURCE=..\\include\\wx\\msw\\", "\n# End Source File\n# Begin Source File\n\nSOURCE=..\\include\\wx\\msw\\", "\n# End Source File\n");
# End Group
# End Group
# End Target # End Target
# End Project # End Project
#! vi: set sta ts=8 sw=4 noet nolist tw=0 ft=make:

View File

@@ -1,7 +1,7 @@
#!############################################################################# #!#############################################################################
#! File: vc6dll.t #! File: vc6dll.t
#! Purpose: tmake template file from which wxWinDll.dsp is generated by running #! Purpose: tmake template file from which wxdll.dsp is generated by running
#! tmake -t vc6dll wxwin.pro -o wxWinDll.dsp #! tmake -t vc6dll wxwin.pro -o wxdll.dsp
#! Author: Vadim Zeitlin #! Author: Vadim Zeitlin
#! Created: 13.10.99 #! Created: 13.10.99
#! Version: $Id$ #! Version: $Id$
@@ -37,28 +37,50 @@
next if $wxHTML{$file} =~ /\b16\b/; next if $wxHTML{$file} =~ /\b16\b/;
$project{"WXHTMLSRCS"} .= $file . " " $project{"WXHTMLSRCS"} .= $file . " "
} }
foreach $file (sort keys %wxWXINCLUDE) {
next if $file =~ /setup.h/;
next if $file =~ /[^.]*.cpp$/;
$project{"WXHEADERS"} .= $file . " "
}
foreach $file (sort keys %wxGENERICINCLUDE) {
next if $wxGeneric{$file} =~ /\b(PS|G|16|U)\b/;
$project{"WXGENERICHEADERS"} .= $file . " "
}
foreach $file (sort keys %wxMSWINCLUDE) {
next if $file =~ /setup0?.h/;
$project{"WXMSWHEADERS"} .= $file . " "
}
foreach $file (sort keys %wxHTMLINCLUDE) {
$project{"WXHTMLHEADERS"} .= $file . " "
}
$project{"WXVERSION"} = "232";
#$} #$}
# Microsoft Developer Studio Project File - Name="wxWinDll" - Package Owner=<4> # Microsoft Developer Studio Project File - Name="wxdll" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00 # Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT ** # ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
CFG=wxWinDll - Win32 Debug CFG=wxdll - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run !MESSAGE use the Export Makefile command and run
!MESSAGE !MESSAGE
!MESSAGE NMAKE /f "wxWinDll.mak". !MESSAGE NMAKE /f "wxdll.mak".
!MESSAGE !MESSAGE
!MESSAGE You can specify a configuration when running NMAKE !MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE !MESSAGE
!MESSAGE NMAKE /f "wxWinDll.mak" CFG="wxWinDll - Win32 Debug" !MESSAGE NMAKE /f "wxdll.mak" CFG="wxdll - Win32 Debug"
!MESSAGE !MESSAGE
!MESSAGE Possible choices for configuration are: !MESSAGE Possible choices for configuration are:
!MESSAGE !MESSAGE
!MESSAGE "wxWinDll - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE "wxdll - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "wxWinDll - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE "wxdll - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE !MESSAGE
# Begin Project # Begin Project
@@ -69,99 +91,160 @@ CPP=cl.exe
MTL=midl.exe MTL=midl.exe
RSC=rc.exe RSC=rc.exe
!IF "$(CFG)" == "wxWinDll - Win32 Release" !IF "$(CFG)" == "wxdll - Win32 Release"
# PROP BASE Use_MFC 0 # PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0 # PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "Release" # PROP BASE Output_Dir "../lib"
# PROP BASE Intermediate_Dir "Release" # PROP BASE Intermediate_Dir "../ReleaseDll"
# PROP BASE Target_Dir "" # PROP BASE Target_Dir ""
# PROP Use_MFC 0 # PROP Use_MFC 0
# PROP Use_Debug_Libraries 0 # PROP Use_Debug_Libraries 0
# PROP Output_Dir "ReleaseDLL" # PROP Output_Dir "../lib"
# PROP Intermediate_Dir "ReleaseDLL" # PROP Intermediate_Dir "../ReleaseDLL"
# PROP Ignore_Export_Lib 0 # PROP Ignore_Export_Lib 0
# PROP Target_Dir "" # PROP Target_Dir ""
# ADD BASE CPP /nologo /MD /W4 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXWINDLL_EXPORTS" /YX /FD /c # ADD BASE CPP /nologo /MD /W4 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXWINDLL_EXPORTS" /YX /FD /c
# ADD CPP /nologo /MD /W4 /GX /O2 /I "$(wx)\include" /I "$(wx)\src\regex" /I "$(wx)\src\zlib" /I "$(wx)\src\jpeg" /I "$(wx)\src\png" /I "$(wx)\src\tiff" /D "NDEBUG" /D wxUSE_GUI=1 /D "WIN32" /D "_WINDOWS" /D "_USRDLL" /D "WXWINDLL_EXPORTS" /D "__WXMSW__" /D "__WIN95__" /D "__WINDOWS__" /D "__WIN32__" /D "WXMAKINGDLL" /Yu"wx/wxprec.h" /FD /c # ADD CPP /nologo /MD /W4 /O2 /I "../lib/mswdll" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /D "_USRDLL" /D "WIN32" /D "NDEBUG" /D WINVER=0x0400 /D "STRICT" /D "_MT" /D "WXMAKINGDLL" /Yu"wx/wxprec.h" /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /i "$(wx)\include" /d "NDEBUG" # ADD RSC /l 0x409 /i "../include" /d "NDEBUG"
BSC32=bscmake.exe BSC32=bscmake.exe
# ADD BASE BSC32 /nologo # ADD BASE BSC32 /nologo
# ADD BSC32 /nologo # ADD BSC32 /nologo
LINK32=link.exe LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib src\jpeg\Release\jpeg.lib src\tiff\Release\tiff.lib src\png\Release\png.lib src\regex\Release\regex.lib src\zlib\Release\zlib.lib /nologo /dll /machine:I386 /out:"ReleaseDll/wxmsw221.dll" # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib ..\lib\jpeg.lib ..\lib\tiff.lib ..\lib\png.lib ..\lib\regex.lib ..\lib\zlib.lib /nologo /dll /machine:I386 /out:"../lib/wxmsw#$ $text = $project{"WXVERSION"} . '.dll"'
# ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib src\jpeg\Release\jpeg.lib src\tiff\Release\tiff.lib src\png\Release\png.lib src\regex\Release\regex.lib src\zlib\Release\zlib.lib /nologo /dll /machine:I386 /out:"ReleaseDll/wxmsw221.dll" # ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib ..\lib\jpeg.lib ..\lib\tiff.lib ..\lib\png.lib ..\lib\regex.lib ..\lib\zlib.lib /nologo /version:2.3 /dll /machine:I386 /out:"../lib/wxmsw#$ $text = $project{"WXVERSION"} . '.dll"'
!ELSEIF "$(CFG)" == "wxWinDll - Win32 Debug" !ELSEIF "$(CFG)" == "wxdll - Win32 Debug"
# PROP BASE Use_MFC 0 # PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1 # PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "Debug" # PROP BASE Output_Dir "../lib"
# PROP BASE Intermediate_Dir "Debug" # PROP BASE Intermediate_Dir "../DebugDll"
# PROP BASE Target_Dir "" # PROP BASE Target_Dir ""
# PROP Use_MFC 0 # PROP Use_MFC 0
# PROP Use_Debug_Libraries 1 # PROP Use_Debug_Libraries 1
# PROP Output_Dir "DebugDLL" # PROP Output_Dir "../lib"
# PROP Intermediate_Dir "DebugDLL" # PROP Intermediate_Dir "../DebugDll"
# PROP Ignore_Export_Lib 0 # PROP Ignore_Export_Lib 0
# PROP Target_Dir "" # PROP Target_Dir ""
# ADD BASE CPP /nologo /MDd /W4 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXWINDLL_EXPORTS" /YX /FD /GZ /c # ADD BASE CPP /nologo /MDd /W4 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXWINDLL_EXPORTS" /YX /FD /GZ /c
# ADD CPP /nologo /MDd /W4 /Gm /Zi /Od /I "$(wx)\include" /I "$(wx)\src\regex" /I "$(wx)\src\zlib" /I "$(wx)\src\jpeg" /I "$(wx)\src\png" /I "$(wx)\src\tiff" /D "_DEBUG" /D "__WXDEBUG__" /D wxUSE_GUI=1 /D "WIN32" /D "_WINDOWS" /D "_USRDLL" /D "WXWINDLL_EXPORTS" /D "__WXMSW__" /D "__WIN95__" /D "__WINDOWS__" /D "__WIN32__" /D "WXMAKINGDLL" /Yu"wx/wxprec.h" /FD /GZ /c # ADD CPP /nologo /MDd /W4 /Zi /Od /I "../lib/mswdlld" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /D "_USRDLL" /D "WIN32" /D "_DEBUG" /D WINVER=0x0400 /D "STRICT" /D "_MT" /D "WXMAKINGDLL" /Yu"wx/wxprec.h" /FD /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /i "$(wx)\include" /d "_DEBUG" # ADD RSC /l 0x409 /i "../include" /d "_DEBUG"
BSC32=bscmake.exe BSC32=bscmake.exe
# ADD BASE BSC32 /nologo # ADD BASE BSC32 /nologo
# ADD BSC32 /nologo # ADD BSC32 /nologo
LINK32=link.exe LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib src\jpeg\Debug\jpeg.lib src\tiff\Debug\tiff.lib src\png\Debug\png.lib src\regex\Debug\regex.lib src\zlib\Debug\zlib.lib /dll /debug /machine:I386 /pdbtype:sept /out:"DebugDll/wxmsw221d.dll" # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib ..\lib\jpegd.lib ..\lib\tiffd.lib ..\lib\pngd.lib ..\lib\regexd.lib ..\lib\zlibd.lib /dll /debug /machine:I386 /pdbtype:sept /out:"../lib/wxmsw#$ $text = $project{"WXVERSION"} . 'd.dll"'
# ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib src\jpeg\Debug\jpeg.lib src\tiff\Debug\tiff.lib src\png\Debug\png.lib src\regex\Debug\regex.lib src\zlib\Debug\zlib.lib /nologo /dll /debug /machine:I386 /pdbtype:sept /out:"DebugDll/wxmsw221d.dll" # ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib ..\lib\jpegd.lib ..\lib\tiffd.lib ..\lib\pngd.lib ..\lib\regexd.lib ..\lib\zlibd.lib /nologo /version:2.3 /dll /debug /machine:I386 /pdbtype:sept /out:"../lib/wxmsw#$ $text = $project{"WXVERSION"} . 'd.dll"'
!ENDIF !ENDIF
# Begin Target # Begin Target
# Name "wxWinDll - Win32 Release" # Name "wxdll - Win32 Release"
# Name "wxWinDll - Win32 Debug" # Name "wxdll - Win32 Debug"
# Begin Group "Common Files"
# PROP Default_Filter ""
#$ ExpandGlue("WXCOMMONSRCS", "# Begin Source File\n\nSOURCE=.\\common\\", "\n# End Source File\n# Begin Source File\n\nSOURCE=.\\common\\", "\n# End Source File\n");
#$ ExpandGlue("WXCSRCS", "# Begin Source File\n\nSOURCE=.\\common\\", "\n# SUBTRACT CPP /YX /Yc /Yu\n# End Source File\n# Begin Source File\n\nSOURCE=.\\common\\", "\n# SUBTRACT CPP /YX /Yc /Yu\n# End Source File\n");
# Begin Source File
SOURCE=.\common\y_tab.c
# ADD CPP /W1 /D "USE_DEFINE"
# SUBTRACT CPP /YX /Yc /Yu
# End Source File
# End Group
# Begin Group "Generic Files"
# PROP Default_Filter ""
#$ ExpandGlue("WXGENERICSRCS", "# Begin Source File\n\nSOURCE=.\\generic\\", "\n# End Source File\n# Begin Source File\n\nSOURCE=.\\generic\\", "\n# End Source File\n");
# End Group
# Begin Group "wxHTML Files"
# PROP Default_Filter ""
#$ ExpandGlue("WXHTMLSRCS", "# Begin Source File\n\nSOURCE=.\\html\\", "\n# End Source File\n# Begin Source File\n\nSOURCE=.\\html\\", "\n# End Source File\n");
# End Group
# Begin Group "MSW Files"
# PROP Default_Filter "" # PROP Default_Filter ""
# Begin Source File # Begin Source File
SOURCE=.\src\msw\dummydll.cpp SOURCE=.\msw\dummydll.cpp
# ADD CPP /Yc"wx/wxprec.h" # ADD CPP /Yc"wx/wxprec.h"
# End Source File # End Source File
#$ ExpandGlue("WXMSWSRCS", "# Begin Source File\n\nSOURCE=.\\src\\msw\\", "\n# End Source File\n# Begin Source File\n\nSOURCE=.\\src\\msw\\", "\n# End Source File\n"); #$ ExpandGlue("WXMSWSRCS", "# Begin Source File\n\nSOURCE=.\\msw\\", "\n# End Source File\n# Begin Source File\n\nSOURCE=.\\msw\\", "\n# End Source File\n");
#$ ExpandGlue("WXOLESRCS", "# Begin Source File\n\nSOURCE=.\\src\\msw\\ole\\", "\n# End Source File\n# Begin Source File\n\nSOURCE=.\\src\\msw\\ole\\", "\n# End Source File\n"); #$ ExpandGlue("WXMSWCSRCS", "# Begin Source File\n\nSOURCE=.\\msw\\", "\n# SUBTRACT CPP /YX /Yc /Yu\n# End Source File\n# Begin Source File\n\nSOURCE=.\\msw\\", "\n# SUBTRACT CPP /YX /Yc /Yu\n# End Source File\n");
#$ ExpandGlue("WXGENERICSRCS", "# Begin Source File\n\nSOURCE=.\\src\\generic\\", "\n# End Source File\n# Begin Source File\n\nSOURCE=.\\src\\generic\\", "\n# End Source File\n"); # End Group
#$ ExpandGlue("WXCOMMONSRCS", "# Begin Source File\n\nSOURCE=.\\src\\common\\", "\n# End Source File\n# Begin Source File\n\nSOURCE=.\\src\\common\\", "\n# End Source File\n"); # Begin Group "OLE Files"
#$ ExpandGlue("WXCSRCS", "# Begin Source File\n\nSOURCE=.\\src\\common\\", "\n# SUBTRACT CPP /YX /Yc /Yu\n# End Source File\n# Begin Source File\n\nSOURCE=.\\src\\common\\", "\n# SUBTRACT CPP /YX /Yc /Yu\n# End Source File\n");
#$ ExpandGlue("WXMSWCSRCS", "# Begin Source File\n\nSOURCE=.\\src\\msw\\", "\n# SUBTRACT CPP /YX /Yc /Yu\n# End Source File\n# Begin Source File\n\nSOURCE=.\\src\\msw\\", "\n# SUBTRACT CPP /YX /Yc /Yu\n# End Source File\n");
#$ ExpandGlue("WXHTMLSRCS", "# Begin Source File\n\nSOURCE=.\\src\\html\\", "\n# End Source File\n# Begin Source File\n\nSOURCE=.\\src\\html\\", "\n# End Source File\n");
# PROP Default_Filter ""
#$ ExpandGlue("WXOLESRCS", "# Begin Source File\n\nSOURCE=.\\msw\\ole\\", "\n# End Source File\n# Begin Source File\n\nSOURCE=.\\msw\\ole\\", "\n# End Source File\n");
# End Group
# Begin Group "Resources"
# PROP Default_Filter ""
# Begin Source File # Begin Source File
SOURCE=.\src\msw\version.rc SOURCE=.\msw\version.rc
# End Source File # End Source File
# End Group
# Begin Group "Headers"
# PROP Default_Filter ""
# Begin Group "Setup"
# PROP Default_Filter ""
# Begin Source File # Begin Source File
SOURCE=.\src\common\y_tab.c SOURCE=..\include\wx\msw\setup0.h
!IF "$(CFG)" == "wxdll - Win32 Release"
# Begin Custom Build - Creating wx/setup.h from $(InputPath)
InputPath=..\include\wx\msw\setup0.h
!IF "$(CFG)" == "wxWinDll - Win32 Release" "../lib/mswdll/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy $(InputPath) ..\lib\mswdll\wx\setup.h
# ADD CPP /W1 # End Custom Build
# SUBTRACT CPP /YX /Yc /Yu !ELSEIF "$(CFG)" == "wxdll - Win32 Debug"
# Begin Custom Build - Creating wx/setup.h from $(InputPath)
InputPath=..\include\wx\msw\setup0.h
!ELSEIF "$(CFG)" == "wxWinDll - Win32 Debug" "../lib/mswdlld/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy $(InputPath) ..\lib\mswdlld\wx\setup.h
# ADD CPP /W1
# SUBTRACT CPP /YX /Yc /Yu
# End Custom Build
!ENDIF !ENDIF
# End Source File # End Source File
# End Group
# Begin Group "Common"
# PROP Default_Filter ""
#$ ExpandGlue("WXHEADERS", "# Begin Source File\n\nSOURCE=..\\include\\wx\\", "\n# End Source File\n# Begin Source File\n\nSOURCE=..\\include\\wx\\", "\n# End Source File\n");
# End Group
# Begin Group "MSW"
# PROP Default_Filter ""
#$ ExpandGlue("WXMSWHEADERS", "# Begin Source File\n\nSOURCE=..\\include\\wx\\msw\\", "\n# End Source File\n# Begin Source File\n\nSOURCE=..\\include\\wx\\msw\\", "\n# End Source File\n");
# End Group
# Begin Group "Generic"
# PROP Default_Filter ""
#$ ExpandGlue("WXGENERICHEADERS", "# Begin Source File\n\nSOURCE=..\\include\\wx\\generic\\", "\n# End Source File\n# Begin Source File\n\nSOURCE=..\\include\\wx\\generic\\", "\n# End Source File\n");
# End Group
# Begin Group "HTML"
# PROP Default_Filter ""
#$ ExpandGlue("WXHTMLHEADERS", "# Begin Source File\n\nSOURCE=..\\include\\wx\\html\\", "\n# End Source File\n# Begin Source File\n\nSOURCE=..\\include\\wx\\html\\", "\n# End Source File\n");
# End Group
# End Group
# End Target # End Target
# End Project # End Project
#! vi: set sta ts=8 sw=4 noet nolist tw=0 ft=make:

View File

@@ -1,8 +1,8 @@
#!############################################################################# #!#############################################################################
#! File: vc6lib.t #! File: vc6lib.t
#! Purpose: tmake template file from which the VC++ 6.0 project file for #! Purpose: tmake template file from which the VC++ 6.0 project file for
#! building static wxWindows library wxvc.dsp is generated by running #! building static wxWindows library wx.dsp is generated by running
#! tmake -t vc6lib wxwin.pro -o wxvc.dsp #! tmake -t vc6lib wxwin.pro -o wx.dsp
#! Author: Vadim Zeitlin #! Author: Vadim Zeitlin
#! Created: 29.09.01 #! Created: 29.09.01
#! Version: $Id$ #! Version: $Id$
@@ -59,37 +59,37 @@
$project{"WXHTMLHEADERS"} .= $file . " " $project{"WXHTMLHEADERS"} .= $file . " "
} }
#$} #$}
# Microsoft Developer Studio Project File - Name="wxvc" - Package Owner=<4> # Microsoft Developer Studio Project File - Name="wx" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00 # Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT ** # ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Static Library" 0x0104 # TARGTYPE "Win32 (x86) Static Library" 0x0104
CFG=wxvc - Win32 Debug CFG=wx - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run !MESSAGE use the Export Makefile command and run
!MESSAGE !MESSAGE
!MESSAGE NMAKE /f "wxvc.mak". !MESSAGE NMAKE /f "wx.mak".
!MESSAGE !MESSAGE
!MESSAGE You can specify a configuration when running NMAKE !MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE !MESSAGE
!MESSAGE NMAKE /f "wxvc.mak" CFG="wxvc - Win32 Debug" !MESSAGE NMAKE /f "wx.mak" CFG="wx - Win32 Debug"
!MESSAGE !MESSAGE
!MESSAGE Possible choices for configuration are: !MESSAGE Possible choices for configuration are:
!MESSAGE !MESSAGE
!MESSAGE "wxvc - Win32 Release" (based on "Win32 (x86) Static Library") !MESSAGE "wx - Win32 Release" (based on "Win32 (x86) Static Library")
!MESSAGE "wxvc - Win32 Debug" (based on "Win32 (x86) Static Library") !MESSAGE "wx - Win32 Debug" (based on "Win32 (x86) Static Library")
!MESSAGE !MESSAGE
# Begin Project # Begin Project
# PROP AllowPerConfigDependencies 0 # PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName "wxvc" # PROP Scc_ProjName "wx"
# PROP Scc_LocalPath ".." # PROP Scc_LocalPath ".."
CPP=cl.exe CPP=cl.exe
RSC=rc.exe RSC=rc.exe
!IF "$(CFG)" == "wxvc - Win32 Release" !IF "$(CFG)" == "wx - Win32 Release"
# PROP BASE Use_MFC 0 # PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0 # PROP BASE Use_Debug_Libraries 0
@@ -102,7 +102,7 @@ RSC=rc.exe
# PROP Intermediate_Dir "../Release" # PROP Intermediate_Dir "../Release"
# PROP Target_Dir "" # PROP Target_Dir ""
# ADD BASE CPP /nologo /MD /W4 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MT" /YX /FD /c # ADD BASE CPP /nologo /MD /W4 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MT" /YX /FD /c
# ADD CPP /nologo /MD /W4 /O2 /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /D "WIN32" /D "NDEBUG" /D WINVER=0x0400 /D "STRICT" /Yu"wx/wxprec.h" /FD /c # ADD CPP /nologo /MD /W4 /O2 /I "../lib/msw" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /D "WIN32" /D "NDEBUG" /D WINVER=0x0400 /D "STRICT" /Yu"wx/wxprec.h" /FD /c
# ADD BASE RSC /l 0x409 # ADD BASE RSC /l 0x409
# ADD RSC /l 0x409 # ADD RSC /l 0x409
BSC32=bscmake.exe BSC32=bscmake.exe
@@ -112,7 +112,7 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo # ADD BASE LIB32 /nologo
# ADD LIB32 /nologo /out:"..\lib\wxmsw.lib" # ADD LIB32 /nologo /out:"..\lib\wxmsw.lib"
!ELSEIF "$(CFG)" == "wxvc - Win32 Debug" !ELSEIF "$(CFG)" == "wx - Win32 Debug"
# PROP BASE Use_MFC 0 # PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1 # PROP BASE Use_Debug_Libraries 1
@@ -125,7 +125,7 @@ LIB32=link.exe -lib
# PROP Intermediate_Dir "../Debug" # PROP Intermediate_Dir "../Debug"
# PROP Target_Dir "" # PROP Target_Dir ""
# ADD BASE CPP /nologo /MDd /W4 /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c # ADD BASE CPP /nologo /MDd /W4 /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
# ADD CPP /nologo /MDd /W4 /Zi /Od /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /D "WIN32" /D "_DEBUG" /D "__WXDEBUG__" /D WINVER=0x0400 /D "STRICT" /Yu"wx/wxprec.h" /FD /c # ADD CPP /nologo /MDd /W4 /Zi /Od /I "../lib/mswd" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /D "WIN32" /D "_DEBUG" /D "__WXDEBUG__" /D WINVER=0x0400 /D "STRICT" /Yu"wx/wxprec.h" /FD /c
# ADD BASE RSC /l 0x409 # ADD BASE RSC /l 0x409
# ADD RSC /l 0x409 # ADD RSC /l 0x409
BSC32=bscmake.exe BSC32=bscmake.exe
@@ -139,8 +139,8 @@ LIB32=link.exe -lib
# Begin Target # Begin Target
# Name "wxvc - Win32 Release" # Name "wx - Win32 Release"
# Name "wxvc - Win32 Debug" # Name "wx - Win32 Debug"
# Begin Group "Common Files" # Begin Group "Common Files"
# PROP Default_Filter "" # PROP Default_Filter ""
@@ -172,6 +172,7 @@ SOURCE=.\msw\dummy.cpp
# ADD CPP /Yc"wx/wxprec.h" # ADD CPP /Yc"wx/wxprec.h"
# End Source File # End Source File
#$ ExpandGlue("WXMSWSRCS", "# Begin Source File\n\nSOURCE=.\\msw\\", "\n# End Source File\n# Begin Source File\n\nSOURCE=.\\msw\\", "\n# End Source File\n"); #$ ExpandGlue("WXMSWSRCS", "# Begin Source File\n\nSOURCE=.\\msw\\", "\n# End Source File\n# Begin Source File\n\nSOURCE=.\\msw\\", "\n# End Source File\n");
#$ ExpandGlue("WXMSWCSRCS", "# Begin Source File\n\nSOURCE=.\\msw\\", "\n# SUBTRACT CPP /YX /Yc /Yu\n# End Source File\n# Begin Source File\n\nSOURCE=.\\msw\\", "\n# SUBTRACT CPP /YX /Yc /Yu\n# End Source File\n");
# End Group # End Group
# Begin Group "OLE Files" # Begin Group "OLE Files"
@@ -187,17 +188,23 @@ SOURCE=.\msw\dummy.cpp
# Begin Source File # Begin Source File
SOURCE=..\include\wx\msw\setup0.h SOURCE=..\include\wx\msw\setup0.h
!IF "$(CFG)" == "wx - Win32 Release"
# Begin Custom Build - Creating wx/setup.h from $(InputPath) # Begin Custom Build - Creating wx/setup.h from $(InputPath)
InputPath=..\include\wx\msw\setup0.h InputPath=..\include\wx\msw\setup0.h
"../include/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" "../lib/msw/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy $(InputPath) ..\include\wx\setup.h copy $(InputPath) ..\lib\msw\wx\setup.h
# End Custom Build # End Custom Build
# End Source File !ELSEIF "$(CFG)" == "wx - Win32 Debug"
# Begin Source File # Begin Custom Build - Creating wx/setup.h from $(InputPath)
InputPath=..\include\wx\msw\setup0.h
SOURCE=..\include\wx\setup.h "../lib/mswd/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy $(InputPath) ..\lib\mswd\wx\setup.h
# End Custom Build
!ENDIF
# End Source File # End Source File
# End Group # End Group
# Begin Group "Common" # Begin Group "Common"

File diff suppressed because it is too large Load Diff

View File

@@ -1,104 +0,0 @@
Microsoft Developer Studio Workspace File, Format Version 6.00
# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
###############################################################################
Project: "jpeg"=.\jpeg\JpegVC.dsp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################
Project: "png"=.\png\PngVC.dsp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################
Project: "regex"=.\regex\RegexVC.dsp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################
Project: "tiff"=.\tiff\TiffVC.dsp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################
Project: "wxvc"=.\wxvc.dsp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
Begin Project Dependency
Project_Dep_Name zlib
End Project Dependency
Begin Project Dependency
Project_Dep_Name png
End Project Dependency
Begin Project Dependency
Project_Dep_Name jpeg
End Project Dependency
Begin Project Dependency
Project_Dep_Name tiff
End Project Dependency
Begin Project Dependency
Project_Dep_Name regex
End Project Dependency
}}}
###############################################################################
Project: "zlib"=.\zlib\ZlibVC.dsp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################
Global:
Package=<5>
{{{
}}}
Package=<3>
{{{
}}}
###############################################################################

File diff suppressed because it is too large Load Diff

View File

@@ -1,29 +0,0 @@
Microsoft Developer Studio Workspace File, Format Version 6.00
# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
###############################################################################
Project: "wxvc_dll"=.\wxvc_dll.dsp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################
Global:
Package=<5>
{{{
}}}
Package=<3>
{{{
}}}
###############################################################################

File diff suppressed because it is too large Load Diff

View File

@@ -1,89 +0,0 @@
Microsoft Developer Studio Workspace File, Format Version 6.00
# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
###############################################################################
Project: "jpeg"=.\jpeg\JpegVC.dsp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################
Project: "png"=.\png\PngVC.dsp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################
Project: "tiff"=.\tiff\TiffVC.dsp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################
Project: "wxvc_universal"=.\wxvc_universal.dsp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
Begin Project Dependency
Project_Dep_Name zlib
End Project Dependency
Begin Project Dependency
Project_Dep_Name png
End Project Dependency
Begin Project Dependency
Project_Dep_Name jpeg
End Project Dependency
Begin Project Dependency
Project_Dep_Name tiff
End Project Dependency
}}}
###############################################################################
Project: "zlib"=.\zlib\ZlibVC.dsp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################
Global:
Package=<5>
{{{
}}}
Package=<3>
{{{
}}}
###############################################################################