AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Modified vc.t according to last changes to makefile.vc, and regenerated

Browse Source 
makefile.vc.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19526 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Mattia Barbon 2003-03-07 16:03:15 +00:00
parent fb5230de74
commit 0ddf7c0cad
2 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
distrib/msw/tmake/vc.t
View File

@ -164,7 +164,7 @@ HTMLOBJS = #$ ExpandList("WXHTMLOBJS");
# Add $(HTMLOBJS) if wanting wxHTML classes
OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(HTMLOBJS)
ARCHINCDIR=$(WXDIR)\lib\msw$(INCEXT)
ARCHINCDIR=$(WXDIR)\lib\$(_WXINC_BUILD)$(_WXINC_DLLSUFFIX)$(_WXINC_SUFFIX)$(LIBEXT)
SETUP_H=$(ARCHINCDIR)\wx\setup.h
# Normal, static library
@ -394,7 +394,7 @@ $(CPPFLAGS2) /c $(COMMDIR)\unzip.c /Fo$@
png:
cd $(WXDIR)\src\png
nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) CRTFLAG=$(CRTFLAG)
nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) CRTFLAG=$(CRTFLAG) UNICODE=0
cd $(WXDIR)\src\msw
clean_png:
@ -404,7 +404,7 @@ clean_png:
zlib:
cd $(WXDIR)\src\zlib
nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) CRTFLAG=$(CRTFLAG)
nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) CRTFLAG=$(CRTFLAG) UNICODE=0
cd $(WXDIR)\src\msw
clean_zlib:
@ -414,7 +414,7 @@ clean_zlib:
jpeg:
cd $(WXDIR)\src\jpeg
nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) CRTFLAG=$(CRTFLAG) all
nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) CRTFLAG=$(CRTFLAG) UNICODE=0 all
cd $(WXDIR)\src\msw
clean_jpeg:
@ -424,7 +424,7 @@ clean_jpeg:
tiff:
cd $(WXDIR)\src\tiff
nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) CRTFLAG=$(CRTFLAG) all
nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) CRTFLAG=$(CRTFLAG) UNICODE=0 all
cd $(WXDIR)\src\msw
clean_tiff:
@ -434,7 +434,7 @@ clean_tiff:
regex:
cd $(WXDIR)\src\regex
nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) CRTFLAG=$(CRTFLAG) all
nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) CRTFLAG=$(CRTFLAG) UNICODE=0 all
cd $(WXDIR)\src\msw
clean_regex:
@ -448,11 +448,11 @@ rcparser:
cd $(WXDIR)\src\msw
cleanall: clean clean_png clean_zlib clean_jpeg clean_tiff clean_regex
-erase ..\..\lib\wx$(WXVERSION)$(LIBEXT).dll
-erase ..\..\lib\wx$(WXVERSION)$(LIBEXT).lib
-erase ..\..\lib\wx$(WXVERSION)$(LIBEXT).exp
-erase ..\..\lib\wx$(WXVERSION)$(LIBEXT).pdb
-erase ..\..\lib\wx$(WXVERSION)$(LIBEXT).ilk
-erase ..\..\lib\$(WXLIBNAME).dll
-erase ..\..\lib\$(WXLIBNAME).lib
-erase ..\..\lib\$(WXLIBNAME).exp
-erase ..\..\lib\$(WXLIBNAME).pdb
-erase ..\..\lib\$(WXLIBNAME).ilk
clean: $(PERIPH_CLEAN_TARGET)

4
src/msw/makefile.vc
View File

@ -137,6 +137,7 @@ NONESSENTIALOBJS= $(GENDIR)\$D\colrdlgg.obj \
COMMONOBJS = \
$(COMMDIR)\$D\y_tab.obj \
$(COMMDIR)\$D\accesscmn.obj \
$(COMMDIR)\$D\appcmn.obj \
$(COMMDIR)\$D\artprov.obj \
$(COMMDIR)\$D\artstd.obj \
@ -163,6 +164,7 @@ COMMONOBJS = \
$(COMMDIR)\$D\dobjcmn.obj \
$(COMMDIR)\$D\docmdi.obj \
$(COMMDIR)\$D\docview.obj \
$(COMMDIR)\$D\dpycmn.obj \
$(COMMDIR)\$D\dseldlg.obj \
$(COMMDIR)\$D\dynarray.obj \
$(COMMDIR)\$D\dynlib.obj \
@ -269,6 +271,7 @@ COMMONOBJS = \
$(COMMDIR)\$D\zstream.obj
MSWOBJS = $(MSWDIR)\$D\accel.obj \
$(OLEDIR)\$D\access.obj \
$(MSWDIR)\$D\app.obj \
$(OLEDIR)\$D\automtn.obj \
$(MSWDIR)\$D\bitmap.obj \
@ -300,6 +303,7 @@ MSWOBJS = $(MSWDIR)\$D\accel.obj \
$(MSWDIR)\$D\dibutils.obj \
$(MSWDIR)\$D\dir.obj \
$(MSWDIR)\$D\dirdlg.obj \
$(MSWDIR)\$D\display.obj \
$(MSWDIR)\$D\dragimag.obj \
$(OLEDIR)\$D\dropsrc.obj \
$(OLEDIR)\$D\droptgt.obj \