X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/34a1d7328f198b5ad31c33a07a6078f089feb45f..2e36d5cf818d64c8abdb3da1861d233d774be139:/src/msw/makefile.vc?ds=sidebyside

diff --git a/src/msw/makefile.vc b/src/msw/makefile.vc
index 42f4d99036..f577adba32 100644
--- a/src/msw/makefile.vc
+++ b/src/msw/makefile.vc
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 14:54, 2001/09/26
+# This file was automatically generated by tmake at 11:30, 2002/01/23
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE VC.T!
 
 # File:     makefile.vc
@@ -21,10 +21,8 @@ THISDIR=$(WXWIN)\src\msw
 
 !if "$(WXMAKINGDLL)" == "1"
 LIBTARGET=$(WXDIR)\lib\$(WXLIBNAME).dll
-DUMMYOBJ=$D\dummydll.obj
 !else
 LIBTARGET=$(WXLIB)
-DUMMYOBJ=$D\dummy.obj
 !endif
 
 # This one overrides the others, to be consistent with the settings in setup.h
@@ -52,6 +50,8 @@ DOCDIR = $(WXDIR)\docs
 HTMLDIR = $(WXDIR)\src\html
 JPEGDIR = $(WXDIR)\src\jpeg
 TIFFDIR = $(WXDIR)\src\tiff
+REGEXDIR = $(WXDIR)\src\regex
+
 
 {$(GENDIR)}.cpp{$(GENDIR)\$D}.obj:
 	cl @<<
@@ -91,6 +91,7 @@ $(CPPFLAGS) /Fo$@ /c /Tp $<
 GENERICOBJS= $(GENDIR)\$D\busyinfo.obj \
 		$(GENDIR)\$D\calctrl.obj \
 		$(GENDIR)\$D\choicdgg.obj \
+		$(GENDIR)\$D\dcpsg.obj \
 		$(GENDIR)\$D\dirctrlg.obj \
 		$(GENDIR)\$D\dragimgg.obj \
 		$(GENDIR)\$D\grid.obj \
@@ -137,6 +138,7 @@ COMMONOBJS = \
 		$(COMMDIR)\$D\appcmn.obj \
 		$(COMMDIR)\$D\choiccmn.obj \
 		$(COMMDIR)\$D\clipcmn.obj \
+		$(COMMDIR)\$D\clntdata.obj \
 		$(COMMDIR)\$D\cmdline.obj \
 		$(COMMDIR)\$D\cmdproc.obj \
 		$(COMMDIR)\$D\cmndata.obj \
@@ -157,8 +159,10 @@ COMMONOBJS = \
 		$(COMMDIR)\$D\dobjcmn.obj \
 		$(COMMDIR)\$D\docmdi.obj \
 		$(COMMDIR)\$D\docview.obj \
+		$(COMMDIR)\$D\dseldlg.obj \
 		$(COMMDIR)\$D\dynarray.obj \
 		$(COMMDIR)\$D\dynlib.obj \
+		$(COMMDIR)\$D\dynload.obj \
 		$(COMMDIR)\$D\effects.obj \
 		$(COMMDIR)\$D\encconv.obj \
 		$(COMMDIR)\$D\event.obj \
@@ -188,6 +192,7 @@ COMMONOBJS = \
 		$(COMMDIR)\$D\imagbmp.obj \
 		$(COMMDIR)\$D\image.obj \
 		$(COMMDIR)\$D\imaggif.obj \
+		$(COMMDIR)\$D\imagiff.obj \
 		$(COMMDIR)\$D\imagjpeg.obj \
 		$(COMMDIR)\$D\imagpcx.obj \
 		$(COMMDIR)\$D\imagpng.obj \
@@ -209,7 +214,6 @@ COMMONOBJS = \
 		$(COMMDIR)\$D\mstream.obj \
 		$(COMMDIR)\$D\nbkbase.obj \
 		$(COMMDIR)\$D\object.obj \
-		$(COMMDIR)\$D\objstrm.obj \
 		$(COMMDIR)\$D\odbc.obj \
 		$(COMMDIR)\$D\paper.obj \
 		$(COMMDIR)\$D\popupcmn.obj \
@@ -224,14 +228,15 @@ COMMONOBJS = \
 		$(COMMDIR)\$D\sckfile.obj \
 		$(COMMDIR)\$D\sckipc.obj \
 		$(COMMDIR)\$D\sckstrm.obj \
-		$(COMMDIR)\$D\serbase.obj \
 		$(COMMDIR)\$D\sizer.obj \
 		$(COMMDIR)\$D\socket.obj \
+		$(COMMDIR)\$D\statbar.obj \
 		$(COMMDIR)\$D\strconv.obj \
 		$(COMMDIR)\$D\stream.obj \
 		$(COMMDIR)\$D\string.obj \
 		$(COMMDIR)\$D\sysopt.obj \
 		$(COMMDIR)\$D\tbarbase.obj \
+		$(COMMDIR)\$D\textbuf.obj \
 		$(COMMDIR)\$D\textcmn.obj \
 		$(COMMDIR)\$D\textfile.obj \
 		$(COMMDIR)\$D\timercmn.obj \
@@ -379,6 +384,7 @@ HTMLOBJS = $(HTMLDIR)\$D\helpctrl.obj \
 		$(HTMLDIR)\$D\m_list.obj \
 		$(HTMLDIR)\$D\m_meta.obj \
 		$(HTMLDIR)\$D\m_pre.obj \
+		$(HTMLDIR)\$D\m_style.obj \
 		$(HTMLDIR)\$D\m_tables.obj \
 		$(HTMLDIR)\$D\winpars.obj
 
@@ -387,15 +393,25 @@ HTMLOBJS = $(HTMLDIR)\$D\helpctrl.obj \
 # Add $(HTMLOBJS) if wanting wxHTML classes
 OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(HTMLOBJS)
 
+ARCHINCDIR=$(WXDIR)\lib\msw$(INCEXT)
+SETUP_H=$(ARCHINCDIR)\wx\setup.h
+
 # Normal, static library
-all:    setuph dirs $(DUMMYOBJ) $(OBJECTS) $(PERIPH_TARGET) png zlib jpeg tiff regex $(LIBTARGET)
+all:    dirs $(SETUP_H) $(DUMMYOBJ) $(OBJECTS) $(PERIPH_TARGET) png zlib jpeg tiff regex $(LIBTARGET)
+
+$(ARCHINCDIR)\wx:
+    mkdir $(ARCHINCDIR)
+    mkdir $(ARCHINCDIR)\wx
 
-setuph:
+$(WXDIR)\include\wx\msw\setup.h:
     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
+$(SETUP_H): $(WXDIR)\include\wx\msw\setup.h
+    copy $(WXDIR)\include\wx\msw\setup.h $@
+
+dirs: $(MSWDIR)\$D $(COMMDIR)\$D $(GENDIR)\$D $(OLEDIR)\$D $(HTMLDIR)\$D $(JPEGDIR)\$D $(TIFFDIR)\$D $(REGEXDIR)\$D $(ARCHINCDIR)\wx $(WXDIR)\$D
 
 $D:
     mkdir $D
@@ -421,20 +437,27 @@ $(JPEGDIR)\$D:
 $(TIFFDIR)\$D:
     mkdir $(TIFFDIR)\$D
 
+$(REGEXDIR)\$D:
+    mkdir $(REGEXDIR)\$D
+
+$(WXDIR)\$D:
+    mkdir $(WXDIR)\$D
+
+
 # wxWindows library as DLL
 dll:
-        nmake -f makefile.vc all FINAL=$(FINAL) DLL=1 WXMAKINGDLL=1 NEW_WXLIBNAME=$(NEW_WXLIBNAME)
+        nmake -f makefile.vc all FINAL=$(FINAL) DLL=1 WXMAKINGDLL=1 NEW_WXLIBNAME=$(NEW_WXLIBNAME) UNICODE=$(UNICODE)
 
 cleandll:
-        nmake -f makefile.vc clean FINAL=$(FINAL) DLL=1 WXMAKINGDLL=1 NEW_WXLIBNAME=$(NEW_WXLIBNAME)
+        nmake -f makefile.vc clean FINAL=$(FINAL) DLL=1 WXMAKINGDLL=1 NEW_WXLIBNAME=$(NEW_WXLIBNAME) UNICODE=$(UNICODE)
 
 # wxWindows + app as DLL. Only affects main.cpp.
 dllapp:
-        nmake -f makefile.vc all FINAL=$(FINAL) DLL=1
+        nmake -f makefile.vc all FINAL=$(FINAL) DLL=1 UNICODE=$(UNICODE)
 
 # wxWindows + app as DLL, for Netscape plugin - remove DllMain.
 dllnp:
-        nmake -f makefile.vc all NOMAIN=1 FINAL=$(FINAL) DLL=1
+        nmake -f makefile.vc all NOMAIN=1 FINAL=$(FINAL) DLL=1 UNICODE=$(UNICODE)
 
 # Use this to make dummy.obj and generate a PCH.
 # You might use the dll target, then the pch target, in order to
@@ -456,12 +479,12 @@ pch1:   dirs $(DUMMYOBJ)
 
 ### Static library
 
-$(WXDIR)\lib\$(WXLIBNAME).lib:      $D\dummy.obj $(OBJECTS) $(PERIPH_LIBS)
+$(WXDIR)\lib\$(WXLIBNAME).lib:      $(DUMMYOBJ) $(OBJECTS) $(PERIPH_LIBS)
 	-erase $(LIBTARGET)
 	$(implib) @<<
 -out:$@
 -machine:$(CPU)
-$(OBJECTS) $D\dummy.obj $(PERIPH_LIBS)
+$(OBJECTS) $(DUMMYOBJ) $(PERIPH_LIBS)
 <<
 
 !else
@@ -500,7 +523,7 @@ $(WXDIR)\lib\$(WXLIBNAME).dll: $(DUMMYOBJ) $(OBJECTS)
     $(link) @<<
     $(LINKFLAGS) $(INCREMENTAL)
     -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\jpeg$(LIBEXT).lib $(WXDIR)\lib\tiff$(LIBEXT).lib $(DELAY_LOAD)
+    $(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 $(WXDIR)\lib\regex$(LIBEXT).lib $(DELAY_LOAD)
 <<
 
 !endif
@@ -510,13 +533,8 @@ $(WXDIR)\lib\$(WXLIBNAME).dll: $(DUMMYOBJ) $(OBJECTS)
 ########################################################
 # Windows-specific objects
 
-$D\dummy.obj: dummy.$(SRCSUFF) $(WXDIR)\include\wx\wx.h $(WXDIR)\include\wx\msw\setup.h
-        cl $(CPPFLAGS) $(MAKEPRECOMP) /Fo$D\dummy.obj /c /Tp dummy.cpp
-
-$D\dummydll.obj: dummydll.$(SRCSUFF) $(WXDIR)\include\wx\wx.h $(WXDIR)\include\wx\msw\setup.h
-        cl @<<
-$(CPPFLAGS) $(MAKEPRECOMP) /Fo$D\dummydll.obj /c /Tp dummydll.cpp
-<<
+$(DUMMYOBJ): $(DUMMY).$(SRCSUFF) $(WXDIR)\include\wx\wx.h $(SETUP_H)
+        cl $(CPPFLAGS) $(MAKEPRECOMP) /Fo$(DUMMYOBJ) /c /Tp $(DUMMY).cpp
 
 # Compile certain files with no optimization (some files cause a
 # compiler crash for buggy versions of VC++, e.g. 4.0).
@@ -594,7 +612,7 @@ $(COMMDIR)\y_tab.c:     $(COMMDIR)\dosyacc.c
 $(COMMDIR)\lex_yy.c:    $(COMMDIR)\doslex.c
     copy "$(COMMDIR)"\doslex.c "$(COMMDIR)"\lex_yy.c
 
-$(OBJECTS):	$(WXDIR)/include/wx/setup.h
+$(OBJECTS):	$(SETUP_H)
 
 $(COMMDIR)\$D\unzip.obj:     $(COMMDIR)\unzip.c
         cl @<<
@@ -645,7 +663,7 @@ clean_tiff:
 
 regex:
     cd $(WXDIR)\src\regex
-    nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) CRTFLAG=$(CRTFLAG)
+    nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) CRTFLAG=$(CRTFLAG) all
     cd $(WXDIR)\src\msw
 
 clean_regex:
@@ -672,6 +690,9 @@ clean: $(PERIPH_CLEAN_TARGET)
         -erase *.pdb
         -erase *.sbr
         -erase $(WXLIBNAME).pch
+	-erase $(WXDIR)\$D\$(PCH)
+	-erase $(WXDIR)\$D\*.pdb
+	-erase $(WXDIR)\$D\*.obj
         -erase $(GENDIR)\$D\*.obj
         -erase $(GENDIR)\$D\*.pdb
         -erase $(GENDIR)\$D\*.sbr
@@ -706,6 +727,7 @@ clean: $(PERIPH_CLEAN_TARGET)
         -rmdir $(HTMLDIR)\$(D)
         -rmdir $(JPEGDIR)\$(D)
         -rmdir $(TIFFDIR)\$(D)
+	-rmdir $(WXDIR)\$D
 
 # Making documents
 docs:   allhlp allhtml allpdfrtf allhtb allhtmlhelp