X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/06069dda0dd6eb62969f84c6ecdf85d3d26ba70c..4aaef122cbbd5bbe0e70b824e320458e2329dd13:/src/msw/makefile.vc?ds=sidebyside

diff --git a/src/msw/makefile.vc b/src/msw/makefile.vc
index a60cc90e7d..87b429ff60 100644
--- a/src/msw/makefile.vc
+++ b/src/msw/makefile.vc
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 17:00, 2001/08/30
+# This file was automatically generated by tmake at 00:08, 2002/01/03
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE VC.T!
 
 # File:     makefile.vc
@@ -37,6 +37,9 @@ PERIPH_CLEAN_TARGET=
 # Set to 0 if not using GLCanvas (only affects DLL build)
 USE_GLCANVAS=1
 
+# Set to 0 if you are using MSVC 5
+USE_MSVC_5=0
+
 # These are absolute paths, so that the compiler
 # generates correct __FILE__ symbols for debugging.
 # Otherwise you don't be able to double-click on a memory
@@ -49,6 +52,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 @<<
@@ -88,6 +93,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 \
@@ -134,6 +140,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 \
@@ -154,8 +161,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 \
@@ -206,7 +215,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 \
@@ -221,18 +229,20 @@ 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 \
 		$(COMMDIR)\$D\tokenzr.obj \
+		$(COMMDIR)\$D\toplvcmn.obj \
 		$(COMMDIR)\$D\treebase.obj \
 		$(COMMDIR)\$D\txtstrm.obj \
 		$(COMMDIR)\$D\unzip.obj \
@@ -349,6 +359,7 @@ MSWOBJS = $(MSWDIR)\$D\accel.obj \
 		$(MSWDIR)\$D\thread.obj \
 		$(MSWDIR)\$D\timer.obj \
 		$(MSWDIR)\$D\tooltip.obj \
+		$(MSWDIR)\$D\toplevel.obj \
 		$(MSWDIR)\$D\treectrl.obj \
 		$(MSWDIR)\$D\utils.obj \
 		$(MSWDIR)\$D\utilsexc.obj \
@@ -382,15 +393,20 @@ 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)
 
-setuph:
-    cd $(WXDIR)\include\wx\msw
-    if not exist setup.h copy setup0.h setup.h
-    cd $(WXDIR)\src\msw
+$(ARCHINCDIR)\wx:
+    mkdir $(ARCHINCDIR)
+    mkdir $(ARCHINCDIR)\wx
 
-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
@@ -416,20 +432,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
@@ -476,16 +499,26 @@ GL_LIBS=opengl32.lib glu32.lib
 # GL_LIBS_DELAY=/delayload:opengl32.dll
 !endif
 
+!if "$(USE_MSVC_5)" == "1"
+# we are too big
+INCREMENTAL=/INCREMENTAL:NO
+DELAY_LOAD=
+!else
+INCREMENTAL=
+DELAY_LOAD=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 \
+	/delayload:oleaut32.dll /delayload:rpcrt4.dll $(GL_LIBS_DELAY)
+!endif
+
 # Update the dynamic link library
 $(WXDIR)\lib\$(WXLIBNAME).dll: $(DUMMYOBJ) $(OBJECTS)
     $(link) @<<
-    $(LINKFLAGS)
+    $(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
-	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
-	/delayload:oleaut32.dll /delayload:rpcrt4.dll $(GL_LIBS_DELAY)
+    $(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
@@ -495,10 +528,10 @@ $(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
+$D\dummy.obj: dummy.$(SRCSUFF) $(WXDIR)\include\wx\wx.h $(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
+$D\dummydll.obj: dummydll.$(SRCSUFF) $(WXDIR)\include\wx\wx.h $(SETUP_H)
         cl @<<
 $(CPPFLAGS) $(MAKEPRECOMP) /Fo$D\dummydll.obj /c /Tp dummydll.cpp
 <<
@@ -579,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 @<<
@@ -630,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: