X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/003d347f8d676ee99a79a28c2735fa335debbbd6..038072e2f1eaf2bf32d748a71234d767ebba8919:/src/msw/makefile.vc

diff --git a/src/msw/makefile.vc b/src/msw/makefile.vc
index 25a417a77a..e6e423c139 100644
--- a/src/msw/makefile.vc
+++ b/src/msw/makefile.vc
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 13:52, 2001/08/06
+# This file was automatically generated by tmake at 15:17, 2001/09/17
 # 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
@@ -233,6 +236,7 @@ COMMONOBJS = \
 		$(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 \
@@ -300,6 +304,7 @@ MSWOBJS = $(MSWDIR)\$D\accel.obj \
 		$(MSWDIR)\$D\glcanvas.obj \
 		$(MSWDIR)\$D\gsocket.obj \
 		$(MSWDIR)\$D\gsockmsw.obj \
+		$(MSWDIR)\$D\helpbest.obj \
 		$(MSWDIR)\$D\helpchm.obj \
 		$(MSWDIR)\$D\helpwin.obj \
 		$(MSWDIR)\$D\icon.obj \
@@ -475,16 +480,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 $(DELAY_LOAD)
 <<
 
 !endif