Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Only compile parser.o if PROLOGIO/RESOURCES are enabled.

Browse Source 
Removed it from *.t for platforms where configure would add it,
it should possibly be removed from more, and this probably
breaks the msw project files somehow too, but I'm not sure where
to fix that.

There were some other changes apparent in the diff...  seemingly
a result of earlier changes to tmake templates -- I'm committing
them too, on the pretence that they are either right, or we've a
problem in the tmake stuff to fix.  Nothing has broken for me yet..


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@17725 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Ron Lee
2002-11-05 10:03:08 +00:00
parent d6c9911e4d
commit d06d0bc30a
18 changed files with 623 additions and 636 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1002
configure vendored
View File

File diff suppressed because it is too large Load Diff

4
configure.in
View File

@@ -4351,6 +4351,7 @@ fi
if test "$wxUSE_PROLOGIO" = "yes" ; then if test "$wxUSE_PROLOGIO" = "yes" ; then
AC_DEFINE(wxUSE_PROLOGIO) AC_DEFINE(wxUSE_PROLOGIO)
ALL_OBJECTS="$ALL_OBJECTS parser.o"
fi fi
if test "$wxUSE_RESOURCES" = "yes" ; then if test "$wxUSE_RESOURCES" = "yes" ; then
@@ -4360,6 +4361,9 @@ if test "$wxUSE_RESOURCES" = "yes" ; then
AC_DEFINE(wxUSE_RESOURCES) AC_DEFINE(wxUSE_RESOURCES)
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS resource" SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS resource"
fi fi
if test "$wxUSE_PROLOGIO" != "yes" ; then
ALL_OBJECTS="$ALL_OBJECTS parser.o"
fi
fi fi
if test "$wxUSE_X_RESOURCES" = "yes"; then if test "$wxUSE_X_RESOURCES" = "yes"; then

2
distrib/msw/tmake/gtk.t
View File

@@ -13,8 +13,6 @@
IncludeTemplate("filelist.t"); IncludeTemplate("filelist.t");
#! find all our sources #! find all our sources
$project{"COMMONOBJS"} .= "parser.o ";
foreach $file (sort keys %wxGeneric) { foreach $file (sort keys %wxGeneric) {
next if $wxGeneric{$file} =~ /\bNotGTK\b/; next if $wxGeneric{$file} =~ /\bNotGTK\b/;

1
distrib/msw/tmake/motif.t
View File

@@ -13,7 +13,6 @@
IncludeTemplate("filelist.t"); IncludeTemplate("filelist.t");
#! find all our sources #! find all our sources
$project{"COMMONOBJS"} .= "parser.o ";
$project{"GUIOBJS"} .= "xmcombo.o "; $project{"GUIOBJS"} .= "xmcombo.o ";
foreach $file (sort keys %wxGeneric) { foreach $file (sort keys %wxGeneric) {

2
distrib/msw/tmake/msw.t
View File

@@ -13,8 +13,6 @@
IncludeTemplate("filelist.t"); IncludeTemplate("filelist.t");
#! find all our sources #! find all our sources
$project{"COMMONOBJS"} .= "parser.o ";
foreach $file (sort keys %wxGeneric) { foreach $file (sort keys %wxGeneric) {
next if $wxGeneric{$file} =~ /\b(PS|G|U|16)\b/; next if $wxGeneric{$file} =~ /\b(PS|G|U|16)\b/;

2
distrib/msw/tmake/x11.t
View File

@@ -13,8 +13,6 @@
IncludeTemplate("filelist.t"); IncludeTemplate("filelist.t");
#! find all our sources #! find all our sources
$project{"COMMONOBJS"} .= "parser.o ";
foreach $file (sort keys %wxX11) { foreach $file (sort keys %wxX11) {
($fileobj = $file) =~ s/cp?p?$/\o/; ($fileobj = $file) =~ s/cp?p?$/\o/;

1
src/gtk/files.lst
View File

@@ -636,7 +636,6 @@ ALL_HEADERS = \
protocol/protocol.h protocol/protocol.h
COMMONOBJS = \ COMMONOBJS = \
parser.o \
appcmn.o \ appcmn.o \
artprov.o \ artprov.o \
artstd.o \ artstd.o \

1
src/gtk1/files.lst
View File

@@ -636,7 +636,6 @@ ALL_HEADERS = \
protocol/protocol.h protocol/protocol.h
COMMONOBJS = \ COMMONOBJS = \
parser.o \
appcmn.o \ appcmn.o \
artprov.o \ artprov.o \
artstd.o \ artstd.o \

2
src/mac/carbon/files.lst
View File

@@ -621,7 +621,7 @@ ALL_HEADERS = \
generic/imaglist.h \ generic/imaglist.h \
generic/laywin.h \ generic/laywin.h \
generic/listctrl.h \ generic/listctrl.h \
generic/mdig.cpp \ generic/mdig.h \
generic/msgdlgg.h \ generic/msgdlgg.h \
generic/notebook.h \ generic/notebook.h \
generic/paletteg.h \ generic/paletteg.h \

2
src/mac/files.lst
View File

@@ -621,7 +621,7 @@ ALL_HEADERS = \
generic/imaglist.h \ generic/imaglist.h \
generic/laywin.h \ generic/laywin.h \
generic/listctrl.h \ generic/listctrl.h \
generic/mdig.cpp \ generic/mdig.h \
generic/msgdlgg.h \ generic/msgdlgg.h \
generic/notebook.h \ generic/notebook.h \
generic/paletteg.h \ generic/paletteg.h \

2
src/mgl/files.lst
View File

@@ -494,7 +494,7 @@ ALL_HEADERS = \
generic/imaglist.h \ generic/imaglist.h \
generic/laywin.h \ generic/laywin.h \
generic/listctrl.h \ generic/listctrl.h \
generic/mdig.cpp \ generic/mdig.h \
generic/msgdlgg.h \ generic/msgdlgg.h \
generic/notebook.h \ generic/notebook.h \
generic/paletteg.h \ generic/paletteg.h \

2
src/microwin/files.lst
View File

@@ -589,7 +589,7 @@ ALL_HEADERS = \
generic/imaglist.h \ generic/imaglist.h \
generic/laywin.h \ generic/laywin.h \
generic/listctrl.h \ generic/listctrl.h \
generic/mdig.cpp \ generic/mdig.h \
generic/msgdlgg.h \ generic/msgdlgg.h \
generic/notebook.h \ generic/notebook.h \
generic/paletteg.h \ generic/paletteg.h \

3
src/motif/files.lst
View File

@@ -583,7 +583,7 @@ ALL_HEADERS = \
generic/imaglist.h \ generic/imaglist.h \
generic/laywin.h \ generic/laywin.h \
generic/listctrl.h \ generic/listctrl.h \
generic/mdig.cpp \ generic/mdig.h \
generic/msgdlgg.h \ generic/msgdlgg.h \
generic/notebook.h \ generic/notebook.h \
generic/paletteg.h \ generic/paletteg.h \
@@ -627,7 +627,6 @@ ALL_HEADERS = \
protocol/protocol.h protocol/protocol.h
COMMONOBJS = \ COMMONOBJS = \
parser.o \
appcmn.o \ appcmn.o \
artprov.o \ artprov.o \
artstd.o \ artstd.o \

3
src/msw/files.lst
View File

@@ -658,6 +658,7 @@ ALL_HEADERS = \
generic/imaglist.h \ generic/imaglist.h \
generic/laywin.h \ generic/laywin.h \
generic/listctrl.h \ generic/listctrl.h \
generic/mdig.h \
generic/msgdlgg.h \ generic/msgdlgg.h \
generic/notebook.h \ generic/notebook.h \
generic/paletteg.h \ generic/paletteg.h \
@@ -701,7 +702,6 @@ ALL_HEADERS = \
protocol/protocol.h protocol/protocol.h
COMMONOBJS = \ COMMONOBJS = \
parser.o \
appcmn.o \ appcmn.o \
artprov.o \ artprov.o \
artstd.o \ artstd.o \
@@ -995,7 +995,6 @@ GUI_LOWLEVEL_OBJS = \
gdiimage.o \ gdiimage.o \
gdiobj.o \ gdiobj.o \
icon.o \ icon.o \
imaglist.o \
main.o \ main.o \
palette.o \ palette.o \
pen.o \ pen.o \

120
src/wxBase.dsp
View File

@@ -2,8 +2,8 @@
# 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) Static Library" 0x0104 # TARGTYPE "Win32 (x86) Static Library" 0x0104
# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
CFG=wxBase - Win32 Debug CFG=wxBase - 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,
@@ -32,6 +32,8 @@ CFG=wxBase - Win32 Debug
# PROP AllowPerConfigDependencies 0 # PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName "" # PROP Scc_ProjName ""
# PROP Scc_LocalPath "" # PROP Scc_LocalPath ""
CPP=cl.exe
RSC=rc.exe
!IF "$(CFG)" == "wxBase - Win32 Release Unicode DLL" !IF "$(CFG)" == "wxBase - Win32 Release Unicode DLL"
@@ -46,13 +48,10 @@ CFG=wxBase - Win32 Debug
# PROP Intermediate_Dir "../BaseReleaseUnicodeDll" # PROP Intermediate_Dir "../BaseReleaseUnicodeDll"
# PROP Ignore_Export_Lib 0 # PROP Ignore_Export_Lib 0
# PROP Target_Dir "" # PROP Target_Dir ""
CPP=cl.exe
# ADD BASE CPP /nologo /MD /W4 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" /D "WXBASEDLL_EXPORTS" /YX /FD /c # ADD BASE CPP /nologo /MD /W4 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" /D "WXBASEDLL_EXPORTS" /YX /FD /c
# ADD CPP /nologo /MD /W4 /O2 /I "../lib/basedllu" /I "../include" /I "./regex" /I "./zlib" /D "NDEBUG" /D wxUSE_GUI=0 /D "WIN32" /D WINVER=0x400 /D "WXMAKINGDLL" /D "_UNICODE" /D "UNICODE" /Yu"wx/wxprec.h" /FD /c # ADD CPP /nologo /MD /W4 /O2 /I "../lib/basedllu" /I "../include" /I "./regex" /I "./zlib" /D "NDEBUG" /D wxUSE_GUI=0 /D "WIN32" /D WINVER=0x400 /D "WXMAKINGDLL" /D "_UNICODE" /D "UNICODE" /Yu"wx/wxprec.h" /FD /c
MTL=midl.exe
# 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
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /i "../include" /d "NDEBUG" # ADD RSC /l 0x409 /i "../include" /d "NDEBUG"
BSC32=bscmake.exe BSC32=bscmake.exe
@@ -60,7 +59,7 @@ BSC32=bscmake.exe
# 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:"../lib/wxbase233u.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/wxbase233u.dll"
# ADD LINK32 ../lib/zlib.lib ../lib/regex.lib kernel32.lib user32.lib advapi32.lib wsock32.lib shell32.lib /nologo /version:2.3 /dll /machine:I386 /out:"../lib/wxbase233u.dll" # ADD LINK32 kernel32.lib user32.lib advapi32.lib shell32.lib wsock32.lib ../lib/zlib.lib ../lib/regex.lib /nologo /version:2.3 /dll /machine:I386 /out:"../lib/wxbase233u.dll"
!ELSEIF "$(CFG)" == "wxBase - Win32 Debug Unicode DLL" !ELSEIF "$(CFG)" == "wxBase - Win32 Debug Unicode DLL"
@@ -75,21 +74,18 @@ LINK32=link.exe
# PROP Intermediate_Dir "../BaseDebugUnicodeDll" # PROP Intermediate_Dir "../BaseDebugUnicodeDll"
# PROP Ignore_Export_Lib 0 # PROP Ignore_Export_Lib 0
# PROP Target_Dir "" # PROP Target_Dir ""
CPP=cl.exe
# ADD BASE CPP /nologo /MDd /W4 /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_USRDLL" /D "WXBASEDLL_EXPORTS" /YX /FD /c # ADD BASE CPP /nologo /MDd /W4 /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_USRDLL" /D "WXBASEDLL_EXPORTS" /YX /FD /c
# ADD CPP /nologo /MDd /W4 /Zi /Od /I "../lib/basedllud" /I "../include" /I "./regex" /I "./zlib" /D "_DEBUG" /D wxUSE_GUI=0 /D "WIN32" /D WINVER=0x400 /D "WXMAKINGDLL" /D "_UNICODE" /D "UNICODE" /Yu"wx/wxprec.h" /FD /c # ADD CPP /nologo /MDd /W4 /Zi /Od /I "../lib/basedllud" /I "../include" /I "./regex" /I "./zlib" /D "_DEBUG" /D wxUSE_GUI=0 /D "WIN32" /D WINVER=0x400 /D "WXMAKINGDLL" /D "_UNICODE" /D "UNICODE" /Yu"wx/wxprec.h" /FD /c
MTL=midl.exe
# 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
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /i "../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 /out:"../lib/wxbase233ud.dll" /pdbtype:sept # 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/wxbase233ud.dll"
# ADD LINK32 ../lib/zlibd.lib ../lib/regexd.lib kernel32.lib user32.lib advapi32.lib wsock32.lib shell32.lib /nologo /version:2.2 /dll /debug /machine:I386 /out:"../lib/wxbase233ud.dll" /pdbtype:sept # ADD LINK32 kernel32.lib user32.lib advapi32.lib shell32.lib wsock32.lib ../lib/zlibd.lib ../lib/regexd.lib /nologo /version:2.2 /dll /debug /machine:I386 /pdbtype:sept /out:"../lib/wxbase233ud.dll"
!ELSEIF "$(CFG)" == "wxBase - Win32 Release Unicode" !ELSEIF "$(CFG)" == "wxBase - Win32 Release Unicode"
@@ -103,10 +99,8 @@ LINK32=link.exe
# PROP Output_Dir "..\lib" # PROP Output_Dir "..\lib"
# PROP Intermediate_Dir "..\BaseReleaseUnicode" # PROP Intermediate_Dir "..\BaseReleaseUnicode"
# PROP Target_Dir "" # PROP Target_Dir ""
CPP=cl.exe
# ADD BASE CPP /nologo /MD /W4 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c # ADD BASE CPP /nologo /MD /W4 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
# ADD CPP /nologo /MD /W4 /O2 /I "../lib/baseu" /I "../include" /I "./regex" /I "./zlib" /D "NDEBUG" /D wxUSE_GUI=0 /D "WIN32" /D WINVER=0x400 /D "_UNICODE" /D "UNICODE" /Yu"wx/wxprec.h" /FD /c # ADD CPP /nologo /MD /W4 /O2 /I "../lib/baseu" /I "../include" /I "./regex" /I "./zlib" /D "NDEBUG" /D wxUSE_GUI=0 /D "WIN32" /D WINVER=0x400 /D "_UNICODE" /D "UNICODE" /Yu"wx/wxprec.h" /FD /c
RSC=rc.exe
# ADD BASE RSC /l 0x409 # ADD BASE RSC /l 0x409
# ADD RSC /l 0x409 # ADD RSC /l 0x409
BSC32=bscmake.exe BSC32=bscmake.exe
@@ -128,15 +122,13 @@ LIB32=link.exe -lib
# PROP Output_Dir "..\lib" # PROP Output_Dir "..\lib"
# PROP Intermediate_Dir "..\BaseDebugUnicode" # PROP Intermediate_Dir "..\BaseDebugUnicode"
# PROP Target_Dir "" # PROP Target_Dir ""
CPP=cl.exe
# 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 "../lib/baseud" /I "../include" /I "./regex" /I "./zlib" /D "_DEBUG" /D wxUSE_GUI=0 /D "WIN32" /D "__WXDEBUG__" /D WINVER=0x400 /D "_UNICODE" /D "UNICODE" /Yu"wx/wxprec.h" /FD /c # ADD CPP /nologo /MDd /W4 /Zi /Od /I "../lib/baseud" /I "../include" /I "./regex" /I "./zlib" /D "_DEBUG" /D wxUSE_GUI=0 /D "WIN32" /D "__WXDEBUG__" /D WINVER=0x400 /D "_UNICODE" /D "UNICODE" /Yu"wx/wxprec.h" /FD /c
RSC=rc.exe
# 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 # 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\wxbaseud.lib" # ADD LIB32 /nologo /out:"..\lib\wxbaseud.lib"
@@ -154,13 +146,10 @@ LIB32=link.exe -lib
# PROP Intermediate_Dir "../BaseReleaseDll" # PROP Intermediate_Dir "../BaseReleaseDll"
# PROP Ignore_Export_Lib 0 # PROP Ignore_Export_Lib 0
# PROP Target_Dir "" # PROP Target_Dir ""
CPP=cl.exe
# ADD BASE CPP /nologo /MD /W4 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" /D "WXBASEDLL_EXPORTS" /YX /FD /c # ADD BASE CPP /nologo /MD /W4 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" /D "WXBASEDLL_EXPORTS" /YX /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 "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 "WXMAKINGDLL" /Yu"wx/wxprec.h" /FD /c
MTL=midl.exe
# 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
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /i "../include" /d "NDEBUG" # ADD RSC /l 0x409 /i "../include" /d "NDEBUG"
BSC32=bscmake.exe BSC32=bscmake.exe
@@ -168,7 +157,7 @@ BSC32=bscmake.exe
# 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:"../lib/wxbase233.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/wxbase233.dll"
# ADD LINK32 ../lib/zlib.lib ../lib/regex.lib kernel32.lib user32.lib advapi32.lib wsock32.lib shell32.lib /nologo /version:2.3 /dll /machine:I386 /out:"../lib/wxbase233.dll" # ADD LINK32 kernel32.lib user32.lib advapi32.lib shell32.lib wsock32.lib ../lib/zlib.lib ../lib/regex.lib /nologo /version:2.3 /dll /machine:I386 /out:"../lib/wxbase233.dll"
!ELSEIF "$(CFG)" == "wxBase - Win32 Debug DLL" !ELSEIF "$(CFG)" == "wxBase - Win32 Debug DLL"
@@ -183,21 +172,18 @@ LINK32=link.exe
# PROP Intermediate_Dir "../BaseDebugDll" # PROP Intermediate_Dir "../BaseDebugDll"
# PROP Ignore_Export_Lib 0 # PROP Ignore_Export_Lib 0
# PROP Target_Dir "" # PROP Target_Dir ""
CPP=cl.exe
# ADD BASE CPP /nologo /MDd /W4 /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_USRDLL" /D "WXBASEDLL_EXPORTS" /YX /FD /c # ADD BASE CPP /nologo /MDd /W4 /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_USRDLL" /D "WXBASEDLL_EXPORTS" /YX /FD /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 "WXMAKINGDLL" /Yu"wx/wxprec.h" /FD /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 "WXMAKINGDLL" /Yu"wx/wxprec.h" /FD /c
MTL=midl.exe
# 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
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /i "../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 /out:"../lib/wxbase233d.dll" /pdbtype:sept # 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/wxbase233d.dll"
# ADD LINK32 ../lib/zlibd.lib ../lib/regexd.lib kernel32.lib user32.lib advapi32.lib wsock32.lib shell32.lib /nologo /version:2.2 /dll /debug /machine:I386 /out:"../lib/wxbase233d.dll" /pdbtype:sept # ADD LINK32 kernel32.lib user32.lib advapi32.lib shell32.lib wsock32.lib ../lib/zlibd.lib ../lib/regexd.lib /nologo /version:2.2 /dll /debug /machine:I386 /pdbtype:sept /out:"../lib/wxbase233d.dll"
!ELSEIF "$(CFG)" == "wxBase - Win32 Release" !ELSEIF "$(CFG)" == "wxBase - Win32 Release"
@@ -211,10 +197,8 @@ LINK32=link.exe
# PROP Output_Dir "..\lib" # PROP Output_Dir "..\lib"
# PROP Intermediate_Dir "..\BaseRelease" # PROP Intermediate_Dir "..\BaseRelease"
# PROP Target_Dir "" # PROP Target_Dir ""
CPP=cl.exe
# ADD BASE CPP /nologo /MD /W4 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c # ADD BASE CPP /nologo /MD /W4 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /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 /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 /Yu"wx/wxprec.h" /FD /c
RSC=rc.exe
# ADD BASE RSC /l 0x409 # ADD BASE RSC /l 0x409
# ADD RSC /l 0x409 # ADD RSC /l 0x409
BSC32=bscmake.exe BSC32=bscmake.exe
@@ -222,7 +206,7 @@ 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 # ADD LIB32 /nologo /out:"..\lib\wxbase.lib"
!ELSEIF "$(CFG)" == "wxBase - Win32 Debug" !ELSEIF "$(CFG)" == "wxBase - Win32 Debug"
@@ -236,15 +220,13 @@ LIB32=link.exe -lib
# PROP Output_Dir "..\lib" # PROP Output_Dir "..\lib"
# PROP Intermediate_Dir "..\BaseDebug" # PROP Intermediate_Dir "..\BaseDebug"
# PROP Target_Dir "" # PROP Target_Dir ""
CPP=cl.exe
# 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 "../lib/based" /I "../include" /I "./regex" /I "./zlib" /D "_DEBUG" /D wxUSE_GUI=0 /D "WIN32" /D "__WXDEBUG__" /D WINVER=0x400 /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 /Yu"wx/wxprec.h" /FD /c
RSC=rc.exe
# 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 # 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"
@@ -261,6 +243,7 @@ LIB32=link.exe -lib
# Name "wxBase - Win32 Debug DLL" # Name "wxBase - Win32 Debug DLL"
# Name "wxBase - Win32 Release" # Name "wxBase - Win32 Release"
# Name "wxBase - Win32 Debug" # Name "wxBase - Win32 Debug"
# Begin Group "Common Files" # Begin Group "Common Files"
# PROP Default_Filter "" # PROP Default_Filter ""
@@ -322,11 +305,6 @@ SOURCE=.\common\event.cpp
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\common\extended.c
# SUBTRACT CPP /YX /Yc /Yu
# End Source File
# Begin Source File
SOURCE=.\common\ffile.cpp SOURCE=.\common\ffile.cpp
# End Source File # End Source File
# Begin Source File # Begin Source File
@@ -383,10 +361,6 @@ SOURCE=.\common\http.cpp
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\common\init.cpp
# End Source File
# Begin Source File
SOURCE=.\common\intl.cpp SOURCE=.\common\intl.cpp
# End Source File # End Source File
# Begin Source File # Begin Source File
@@ -499,11 +473,6 @@ SOURCE=.\common\txtstrm.cpp
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\common\unzip.c
# SUBTRACT CPP /YX /Yc /Yu
# End Source File
# Begin Source File
SOURCE=.\common\url.cpp SOURCE=.\common\url.cpp
# End Source File # End Source File
# Begin Source File # Begin Source File
@@ -530,32 +499,38 @@ SOURCE=.\common\zipstrm.cpp
SOURCE=.\common\zstream.cpp SOURCE=.\common\zstream.cpp
# End Source File # End Source File
# Begin Source File
SOURCE=.\common\init.cpp
# End Source File
# Begin Source File
SOURCE=.\common\extended.c
# SUBTRACT CPP /YX /Yc /Yu
# End Source File
# Begin Source File
SOURCE=.\common\unzip.c
# SUBTRACT CPP /YX /Yc /Yu
# End Source File
# End Group # End Group
# Begin Group "MSW Files" # Begin Group "MSW Files"
# PROP Default_Filter "" # PROP Default_Filter ""
# Begin Source File # Begin Source File
SOURCE=.\msw\dde.cpp
# End Source File
# Begin Source File
SOURCE=.\msw\dir.cpp
# End Source File
# Begin Source File
SOURCE=.\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
# Begin Source File # Begin Source File
SOURCE=.\msw\gsocket.c SOURCE=.\msw\dde.cpp
# SUBTRACT CPP /YX /Yc /Yu
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\msw\gsockmsw.c SOURCE=.\msw\dir.cpp
# SUBTRACT CPP /YX /Yc /Yu
# End Source File # End Source File
# Begin Source File # Begin Source File
@@ -593,6 +568,18 @@ SOURCE=.\msw\utilsexc.cpp
SOURCE=.\msw\volume.cpp SOURCE=.\msw\volume.cpp
# End Source File # End Source File
# Begin Source File
SOURCE=.\msw\gsocket.c
# SUBTRACT CPP /YX /Yc /Yu
# End Source File
# Begin Source File
SOURCE=.\msw\gsockmsw.c
# SUBTRACT CPP /YX /Yc /Yu
# End Source File
# End Group # End Group
# Begin Group "Headers" # Begin Group "Headers"
@@ -603,9 +590,7 @@ SOURCE=.\msw\volume.cpp
# Begin Source File # Begin Source File
SOURCE=..\include\wx\msw\setup.h SOURCE=..\include\wx\msw\setup.h
!IF "$(CFG)" == "wxBase - Win32 Release Unicode DLL" !IF "$(CFG)" == "wxBase - Win32 Release Unicode DLL"
# Begin Custom Build - Copying $(InputPath) to $(TargetDir) # Begin Custom Build - Copying $(InputPath) to $(TargetDir)
InputPath=..\include\wx\msw\setup.h InputPath=..\include\wx\msw\setup.h
@@ -613,19 +598,14 @@ InputPath=..\include\wx\msw\setup.h
copy "$(InputPath)" ..\lib\basedllu\wx\setup.h copy "$(InputPath)" ..\lib\basedllu\wx\setup.h
# End Custom Build # End Custom Build
!ELSEIF "$(CFG)" == "wxBase - Win32 Debug Unicode DLL" !ELSEIF "$(CFG)" == "wxBase - Win32 Debug Unicode DLL"
# Begin Custom Build - Copying $(InputPath) to $(TargetDir) # Begin Custom Build - Copying $(InputPath) to $(TargetDir)
InputPath=..\include\wx\msw\setup.h InputPath=..\include\wx\msw\setup.h
"../lib/basedllud/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" "../lib/basedllud/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\lib\basedllud\wx\setup.h copy "$(InputPath)" ..\lib\basedllud\wx\setup.h
# End Custom Build # End Custom Build
!ELSEIF "$(CFG)" == "wxBase - Win32 Release Unicode" !ELSEIF "$(CFG)" == "wxBase - Win32 Release Unicode"
# Begin Custom Build - Copying $(InputPath) to $(TargetDir) # Begin Custom Build - Copying $(InputPath) to $(TargetDir)
InputPath=..\include\wx\msw\setup.h InputPath=..\include\wx\msw\setup.h
@@ -633,9 +613,7 @@ InputPath=..\include\wx\msw\setup.h
copy "$(InputPath)" ..\lib\baseu\wx\setup.h copy "$(InputPath)" ..\lib\baseu\wx\setup.h
# End Custom Build # End Custom Build
!ELSEIF "$(CFG)" == "wxBase - Win32 Debug Unicode" !ELSEIF "$(CFG)" == "wxBase - Win32 Debug Unicode"
# Begin Custom Build - Copying $(InputPath) to $(TargetDir) # Begin Custom Build - Copying $(InputPath) to $(TargetDir)
InputPath=..\include\wx\msw\setup.h InputPath=..\include\wx\msw\setup.h
@@ -643,9 +621,7 @@ InputPath=..\include\wx\msw\setup.h
copy "$(InputPath)" ..\lib\baseud\wx\setup.h copy "$(InputPath)" ..\lib\baseud\wx\setup.h
# End Custom Build # End Custom Build
!ELSEIF "$(CFG)" == "wxBase - Win32 Release DLL" !ELSEIF "$(CFG)" == "wxBase - Win32 Release DLL"
# Begin Custom Build - Copying $(InputPath) to $(TargetDir) # Begin Custom Build - Copying $(InputPath) to $(TargetDir)
InputPath=..\include\wx\msw\setup.h InputPath=..\include\wx\msw\setup.h
@@ -653,19 +629,14 @@ InputPath=..\include\wx\msw\setup.h
copy "$(InputPath)" ..\lib\basedll\wx\setup.h copy "$(InputPath)" ..\lib\basedll\wx\setup.h
# End Custom Build # End Custom Build
!ELSEIF "$(CFG)" == "wxBase - Win32 Debug DLL" !ELSEIF "$(CFG)" == "wxBase - Win32 Debug DLL"
# Begin Custom Build - Copying $(InputPath) to $(TargetDir) # Begin Custom Build - Copying $(InputPath) to $(TargetDir)
InputPath=..\include\wx\msw\setup.h InputPath=..\include\wx\msw\setup.h
"../lib/basedlld/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" "../lib/basedlld/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\lib\basedlld\wx\setup.h copy "$(InputPath)" ..\lib\basedlld\wx\setup.h
# End Custom Build # End Custom Build
!ELSEIF "$(CFG)" == "wxBase - Win32 Release" !ELSEIF "$(CFG)" == "wxBase - Win32 Release"
# Begin Custom Build - Copying $(InputPath) to $(TargetDir) # Begin Custom Build - Copying $(InputPath) to $(TargetDir)
InputPath=..\include\wx\msw\setup.h InputPath=..\include\wx\msw\setup.h
@@ -673,9 +644,7 @@ InputPath=..\include\wx\msw\setup.h
copy "$(InputPath)" ..\lib\base\wx\setup.h copy "$(InputPath)" ..\lib\base\wx\setup.h
# End Custom Build # End Custom Build
!ELSEIF "$(CFG)" == "wxBase - Win32 Debug" !ELSEIF "$(CFG)" == "wxBase - Win32 Debug"
# Begin Custom Build - Copying $(InputPath) to $(TargetDir) # Begin Custom Build - Copying $(InputPath) to $(TargetDir)
InputPath=..\include\wx\msw\setup.h InputPath=..\include\wx\msw\setup.h
@@ -683,7 +652,6 @@ InputPath=..\include\wx\msw\setup.h
copy "$(InputPath)" ..\lib\based\wx\setup.h copy "$(InputPath)" ..\lib\based\wx\setup.h
# End Custom Build # End Custom Build
!ENDIF !ENDIF
# End Source File # End Source File
@@ -1035,6 +1003,7 @@ SOURCE=..\include\wx\zipstrm.h
SOURCE=..\include\wx\zstream.h SOURCE=..\include\wx\zstream.h
# End Source File # End Source File
# End Group # End Group
# Begin Group "MSW" # Begin Group "MSW"
@@ -1051,6 +1020,7 @@ SOURCE=..\include\wx\msw\mimetype.h
SOURCE=..\include\wx\msw\winundef.h SOURCE=..\include\wx\msw\winundef.h
# End Source File # End Source File
# End Group # End Group
# End Group # End Group
# End Target # End Target

105
src/wxUniv.dsp
View File

@@ -49,7 +49,7 @@ 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 # ADD LIB32 /nologo /out:"..\lib\wxuniv.lib"
!ELSEIF "$(CFG)" == "wxUniv - Win32 Debug" !ELSEIF "$(CFG)" == "wxUniv - Win32 Debug"
@@ -221,11 +221,6 @@ SOURCE=.\common\event.cpp
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\common\extended.c
# SUBTRACT CPP /YX /Yc /Yu
# End Source File
# Begin Source File
SOURCE=.\common\fddlgcmn.cpp SOURCE=.\common\fddlgcmn.cpp
# End Source File # End Source File
# Begin Source File # Begin Source File
@@ -554,11 +549,6 @@ SOURCE=.\common\txtstrm.cpp
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\common\unzip.c
# SUBTRACT CPP /YX /Yc /Yu
# End Source File
# Begin Source File
SOURCE=.\common\url.cpp SOURCE=.\common\url.cpp
# End Source File # End Source File
# Begin Source File # Begin Source File
@@ -609,6 +599,18 @@ SOURCE=.\common\zipstrm.cpp
SOURCE=.\common\zstream.cpp SOURCE=.\common\zstream.cpp
# End Source File # End Source File
# Begin Source File
SOURCE=.\common\extended.c
# SUBTRACT CPP /YX /Yc /Yu
# End Source File
# Begin Source File
SOURCE=.\common\unzip.c
# SUBTRACT CPP /YX /Yc /Yu
# End Source File
# End Group # End Group
# Begin Group "Generic Files" # Begin Group "Generic Files"
@@ -793,6 +795,7 @@ SOURCE=.\generic\treelay.cpp
SOURCE=.\generic\wizard.cpp SOURCE=.\generic\wizard.cpp
# End Source File # End Source File
# End Group # End Group
# Begin Group "wxHTML Files" # Begin Group "wxHTML Files"
@@ -881,12 +884,18 @@ SOURCE=.\html\m_tables.cpp
SOURCE=.\html\winpars.cpp SOURCE=.\html\winpars.cpp
# End Source File # End Source File
# End Group # End Group
# Begin Group "MSW Files" # Begin Group "MSW Files"
# PROP Default_Filter "" # PROP Default_Filter ""
# Begin Source File # Begin Source File
SOURCE=.\msw\dummy.cpp
# ADD CPP /Yc"wx/wxprec.h"
# End Source File
# Begin Source File
SOURCE=.\msw\app.cpp SOURCE=.\msw\app.cpp
# End Source File # End Source File
# Begin Source File # Begin Source File
@@ -951,11 +960,6 @@ SOURCE=.\msw\dir.cpp
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\msw\dummy.cpp
# ADD CPP /Yc"wx/wxprec.h"
# End Source File
# Begin Source File
SOURCE=.\msw\evtloop.cpp SOURCE=.\msw\evtloop.cpp
# End Source File # End Source File
# Begin Source File # Begin Source File
@@ -980,16 +984,6 @@ SOURCE=.\msw\gdiobj.cpp
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\msw\gsocket.c
# SUBTRACT CPP /YX /Yc /Yu
# End Source File
# Begin Source File
SOURCE=.\msw\gsockmsw.c
# SUBTRACT CPP /YX /Yc /Yu
# End Source File
# Begin Source File
SOURCE=.\msw\icon.cpp SOURCE=.\msw\icon.cpp
# End Source File # End Source File
# Begin Source File # Begin Source File
@@ -1060,26 +1054,22 @@ SOURCE=.\msw\volume.cpp
SOURCE=.\msw\window.cpp SOURCE=.\msw\window.cpp
# End Source File # End Source File
# Begin Source File
SOURCE=.\msw\gsocket.c
# SUBTRACT CPP /YX /Yc /Yu
# End Source File
# Begin Source File
SOURCE=.\msw\gsockmsw.c
# SUBTRACT CPP /YX /Yc /Yu
# End Source File
# End Group # End Group
# Begin Group "Universal Files" # Begin Group "Universal Files"
# PROP Default_Filter "" # PROP Default_Filter ""
# Begin Group "Theme Files"
# PROP Default_Filter ""
# Begin Source File
SOURCE=.\univ\themes\gtk.cpp
# End Source File
# Begin Source File
SOURCE=.\univ\themes\metal.cpp
# End Source File
# Begin Source File
SOURCE=.\univ\themes\win32.cpp
# End Source File
# End Group
# Begin Source File # Begin Source File
SOURCE=.\univ\bmpbuttn.cpp SOURCE=.\univ\bmpbuttn.cpp
@@ -1216,6 +1206,24 @@ SOURCE=.\univ\topluniv.cpp
SOURCE=.\univ\winuniv.cpp SOURCE=.\univ\winuniv.cpp
# End Source File # End Source File
# Begin Group "Theme Files"
# PROP Default_Filter ""
# Begin Source File
SOURCE=.\univ\themes\gtk.cpp
# End Source File
# Begin Source File
SOURCE=.\univ\themes\metal.cpp
# End Source File
# Begin Source File
SOURCE=.\univ\themes\win32.cpp
# End Source File
# End Group
# End Group # End Group
# Begin Group "Headers" # Begin Group "Headers"
@@ -1226,9 +1234,7 @@ SOURCE=.\univ\winuniv.cpp
# Begin Source File # Begin Source File
SOURCE=..\include\wx\univ\setup.h SOURCE=..\include\wx\univ\setup.h
!IF "$(CFG)" == "wxUniv - Win32 Release" !IF "$(CFG)" == "wxUniv - Win32 Release"
# Begin Custom Build - Creating lib\univ\wx\setup.h from $(InputPath) # Begin Custom Build - Creating lib\univ\wx\setup.h from $(InputPath)
InputPath=..\include\wx\univ\setup.h InputPath=..\include\wx\univ\setup.h
@@ -1236,9 +1242,7 @@ InputPath=..\include\wx\univ\setup.h
copy "$(InputPath)" ..\lib\univ\wx\setup.h copy "$(InputPath)" ..\lib\univ\wx\setup.h
# End Custom Build # End Custom Build
!ELSEIF "$(CFG)" == "wxUniv - Win32 Debug" !ELSEIF "$(CFG)" == "wxUniv - Win32 Debug"
# Begin Custom Build - Creating lib\univd\wx\setup.h from $(InputPath) # Begin Custom Build - Creating lib\univd\wx\setup.h from $(InputPath)
InputPath=..\include\wx\univ\setup.h InputPath=..\include\wx\univ\setup.h
@@ -1246,9 +1250,7 @@ InputPath=..\include\wx\univ\setup.h
copy "$(InputPath)" ..\lib\univd\wx\setup.h copy "$(InputPath)" ..\lib\univd\wx\setup.h
# End Custom Build # End Custom Build
!ENDIF !ENDIF
# End Source File # End Source File
# End Group # End Group
# Begin Group "Common" # Begin Group "Common"
@@ -2202,6 +2204,7 @@ SOURCE=..\include\wx\zipstrm.h
SOURCE=..\include\wx\zstream.h SOURCE=..\include\wx\zstream.h
# End Source File # End Source File
# End Group # End Group
# Begin Group "MSW" # Begin Group "MSW"
@@ -2292,6 +2295,10 @@ SOURCE=..\include\wx\generic\listctrl.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\include\wx\generic\mdig.h
# End Source File
# Begin Source File
SOURCE=..\include\wx\generic\msgdlgg.h SOURCE=..\include\wx\generic\msgdlgg.h
# End Source File # End Source File
# Begin Source File # Begin Source File
@@ -2366,6 +2373,7 @@ SOURCE=..\include\wx\generic\treectlg.h
SOURCE=..\include\wx\generic\wizard.h SOURCE=..\include\wx\generic\wizard.h
# End Source File # End Source File
# End Group # End Group
# Begin Group "HTML" # Begin Group "HTML"
@@ -2422,6 +2430,7 @@ SOURCE=..\include\wx\html\m_templ.h
SOURCE=..\include\wx\html\winpars.h SOURCE=..\include\wx\html\winpars.h
# End Source File # End Source File
# End Group # End Group
# Begin Group "Universal" # Begin Group "Universal"

4
src/wxWindows.dsp
View File

@@ -2948,6 +2948,10 @@ SOURCE=..\include\wx\generic\listctrl.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\include\wx\generic\mdig.h
# End Source File
# Begin Source File
SOURCE=..\include\wx\generic\msgdlgg.h SOURCE=..\include\wx\generic\msgdlgg.h
# End Source File # End Source File
# Begin Source File # Begin Source File

1
src/x11/files.lst
View File

@@ -648,7 +648,6 @@ GUI_LOWLEVEL_OBJS = \
window.o window.o
COMMONOBJS = \ COMMONOBJS = \
parser.o \
appcmn.o \ appcmn.o \
artprov.o \ artprov.o \
artstd.o \ artstd.o \