X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/20a2bdc9c3abad3e4634f95282da6a8a6bc88c45..9f41d601565ed8fef859133519e90e8793dc7372:/distrib/msw/tmake/vc.t diff --git a/distrib/msw/tmake/vc.t b/distrib/msw/tmake/vc.t index f1ebfbe598..f3fdb950b9 100644 --- a/distrib/msw/tmake/vc.t +++ b/distrib/msw/tmake/vc.t @@ -13,6 +13,8 @@ #! now transform these hashes into $project tags foreach $file (sort keys %wxGeneric) { + next if $wxGeneric{$file} =~ /\bU\b/; + my $tag = ""; if ( $wxGeneric{$file} =~ /\b(PS|G|16|U)\b/ ) { $tag = "WXNONESSENTIALOBJS"; @@ -36,7 +38,7 @@ next if $wxMSW{$file} =~ /\b16\b/; #! OLE files live in a subdir - $project{"WXMSWOBJS"} .= '..\msw\\'; + $project{"WXMSWOBJS"} .= '..\\msw\\'; $project{"WXMSWOBJS"} .= 'ole\\' if $wxMSW{$file} =~ /\bO\b/; $file =~ s/cp?p?$/obj/; $project{"WXMSWOBJS"} .= '$D\\' . $file . " "; @@ -99,6 +101,8 @@ OLEDIR=ole MSWDIR=$(WXDIR)\src\msw DOCDIR = $(WXDIR)\docs HTMLDIR = $(WXDIR)\src\html +JPEGDIR = $(WXDIR)\src\jpeg +TIFFDIR = $(WXDIR)\src\tiff {..\generic}.cpp{..\generic\$D}.obj: cl @<< @@ -155,10 +159,14 @@ HTMLOBJS = #$ ExpandList("WXHTMLOBJS"); OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(HTMLOBJS) # Normal, static library -all: dirs $(DUMMYOBJ) $(OBJECTS) $(PERIPH_TARGET) png zlib xpm jpeg tiff $(LIBTARGET) +all: setuph dirs $(DUMMYOBJ) $(OBJECTS) $(PERIPH_TARGET) png zlib jpeg tiff $(LIBTARGET) -dirs: $(MSWDIR)\$D $(COMMDIR)\$D $(GENDIR)\$D $(OLEDIR)\$D $(HTMLDIR)\$D +setuph: + cd $(WXDIR)\include\wx\msw + if not exist setup.h copy setup0.h setup.h + cd $(WXDIR)\src\msw +dirs: $(MSWDIR)\$D $(COMMDIR)\$D $(GENDIR)\$D $(OLEDIR)\$D $(HTMLDIR)\$D $(JPEGDIR)\$D $(TIFFDIR)\$D $D: mkdir $D @@ -178,6 +186,12 @@ $(OLEDIR)\$D: $(HTMLDIR)\$D: mkdir $(HTMLDIR)\$D +$(JPEGDIR)\$D: + mkdir $(JPEGDIR)\$D + +$(TIFFDIR)\$D: + mkdir $(TIFFDIR)\$D + # wxWindows library as DLL dll: nmake -f makefile.vc all FINAL=$(FINAL) DLL=1 WXMAKINGDLL=1 NEW_WXLIBNAME=$(NEW_WXLIBNAME) @@ -243,7 +257,7 @@ $(WXDIR)\lib\$(WXLIBNAME).dll: $(DUMMYOBJ) $(OBJECTS) $(link) @<< $(LINKFLAGS) -out:$(WXDIR)\lib\$(WXLIBNAME).dll - $(DUMMYOBJ) $(OBJECTS) $(guilibsdll) shell32.lib comctl32.lib ctl3d32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib odbc32.lib advapi32.lib winmm.lib $(GL_LIBS) $(WXDIR)\lib\png$(LIBEXT).lib $(WXDIR)\lib\zlib$(LIBEXT).lib $(WXDIR)\lib\xpm$(LIBEXT).lib $(WXDIR)\lib\jpeg$(LIBEXT).lib $(WXDIR)\lib\tiff$(LIBEXT).lib + $(DUMMYOBJ) $(OBJECTS) $(guilibsdll) shell32.lib comctl32.lib ctl3d32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib odbc32.lib advapi32.lib winmm.lib $(GL_LIBS) $(WXDIR)\lib\png$(LIBEXT).lib $(WXDIR)\lib\zlib$(LIBEXT).lib $(WXDIR)\lib\jpeg$(LIBEXT).lib $(WXDIR)\lib\tiff$(LIBEXT).lib delayimp.lib /delayload:ws2_32.dll /delayload:advapi32.dll /delayload:user32.dll /delayload:gdi32.dll /delayload:comdlg32.dll /delayload:shell32.dll /delayload:comctl32.dll /delayload:ole32.dll @@ -330,16 +344,6 @@ $(CPPFLAGS2) /Od /Fo$(MSWDIR)\$D\treectrl.obj /c /Tp $(MSWDIR)\treectrl.cpp $(CPPFLAGS2) /Od /Fo$(HTMLDIR)\$D\helpfrm.obj /c /Tp $(HTMLDIR)\helpfrm.cpp << -# If taking wxWindows from CVS, setup.h doesn't exist yet. -# Actually the 'if not exist setup.h' test doesn't work -# (copies the file anyway) -# we'll have to comment this rule out. - -# $(WXDIR)\include\wx\msw\setup.h: $(WXDIR)\include\wx\msw\setup0.h -# cd "$(WXDIR)"\include\wx\msw -# if not exist setup.h copy setup0.h setup.h -# cd "$(WXDIR)"\src\msw - ..\common\$D\y_tab.obj: ..\common\y_tab.c ..\common\lex_yy.c cl @<< $(CPPFLAGS2) /c ..\common\y_tab.c -DUSE_DEFINE -DYY_USE_PROTOS /Fo$@ @@ -400,22 +404,12 @@ clean_tiff: nmake -f makefile.vc clean cd $(WXDIR)\src\msw -xpm: - cd $(WXDIR)\src\xpm - nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) CRTFLAG=$(CRTFLAG) - cd $(WXDIR)\src\msw - -clean_xpm: - cd $(WXDIR)\src\xpm - nmake -f makefile.vc clean - cd $(WXDIR)\src\msw - rcparser: cd $(WXDIR)\utils\rcparser\src nmake -f makefile.vc FINAL=$(FINAL) cd $(WXDIR)\src\msw -cleanall: clean clean_png clean_zlib clean_xpm clean_jpeg clean_tiff +cleanall: clean clean_png clean_zlib clean_jpeg clean_tiff -erase ..\..\lib\wx$(WXVERSION)$(LIBEXT).dll -erase ..\..\lib\wx$(WXVERSION)$(LIBEXT).lib -erase ..\..\lib\wx$(WXVERSION)$(LIBEXT).exp @@ -440,21 +434,32 @@ clean: $(PERIPH_CLEAN_TARGET) -erase $(MSWDIR)\$D\*.obj -erase $(MSWDIR)\$D\*.sbr -erase $(MSWDIR)\$D\*.pdb + -erase $(MSWDIR)\$D\*.pch -erase $(OLEDIR)\$D\*.obj -erase $(OLEDIR)\$D\*.sbr -erase $(OLEDIR)\$D\*.pdb -erase $(HTMLDIR)\$D\*.obj -erase $(HTMLDIR)\$D\*.sbr -erase $(HTMLDIR)\$D\*.pdb + -erase $(JPEGDIR)\$D\*.obj + -erase $(JPEGDIR)\$D\*.sbr + -erase $(JPEGDIR)\$D\*.idb + -erase $(JPEGDIR)\$D\*.pdb + -erase $(TIFFDIR)\$D\*.obj + -erase $(TIFFDIR)\$D\*.sbr + -erase $(TIFFDIR)\$D\*.pdb + -erase $(TIFFDIR)\$D\*.idb -rmdir $(D) - -rmdir ole\$(D) - -rmdir ..\generic\$(D) - -rmdir ..\common\$(D) - -rmdir ..\html\$(D) - + -rmdir $(GENDIR)\$(D) + -rmdir $(COMMDIR)\$(D) + -rmdir $(MSWDIR)\$(D) + -rmdir $(OLEDIR)\$(D) + -rmdir $(HTMLDIR)\$(D) + -rmdir $(JPEGDIR)\$(D) + -rmdir $(TIFFDIR)\$(D) # Making documents -docs: allhlp allhtml allpdfrtf htb htmlhelp +docs: allhlp allhtml allpdfrtf allhtb allhtmlhelp alldocs: docs hlp: wxhlp wxhlp: $(DOCDIR)/winhelp/wx.hlp @@ -473,21 +478,43 @@ referencps: $(WXDIR)\docs\ps\referenc.ps allhlp: wxhlp cd $(WXDIR)\utils\dialoged\src nmake -f makefile.vc hlp + cd $(WXDIR)\utils\tex2rtf\src + nmake -f makefile.vc hlp cd $(THISDIR) allhtml: wxhtml cd $(WXDIR)\utils\dialoged\src nmake -f makefile.vc html + cd $(WXDIR)\utils\tex2rtf\src + nmake -f makefile.vc html + cd $(THISDIR) + +allhtmlhelp: htmlhelp + cd $(WXDIR)\utils\dialoged\src + nmake -f makefile.vc htmlhelp + cd $(WXDIR)\utils\tex2rtf\src + nmake -f makefile.vc htmlhelp + cd $(THISDIR) + +allhtb: htb + cd $(WXDIR)\utils\dialoged\src + nmake -f makefile.vc htb + cd $(WXDIR)\utils\tex2rtf\src + nmake -f makefile.vc htb cd $(THISDIR) allps: wxps referencps cd $(WXDIR)\utils\dialoged\src nmake -f makefile.vc ps + cd $(WXDIR)\utils\tex2rtf\src + nmake -f makefile.vc ps cd $(THISDIR) allpdfrtf: pdfrtf cd $(WXDIR)\utils\dialoged\src nmake -f makefile.vc pdfrtf + cd $(WXDIR)\utils\tex2rtf\src + nmake -f makefile.vc pdfrtf cd $(THISDIR) $(DOCDIR)/winhelp/wx.hlp: $(DOCDIR)/latex/wx/wx.rtf $(DOCDIR)/latex/wx/wx.hpj