X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3d5231db07a04de50075f18fd605d3d87234a33b..0e0a4e6447cdccefebcad271aa25fe9b8e4d7fb3:/src/msw/makefile.vc

diff --git a/src/msw/makefile.vc b/src/msw/makefile.vc
index e5c5a967d0..439458b4d0 100644
--- a/src/msw/makefile.vc
+++ b/src/msw/makefile.vc
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake 
+# This file was automatically generated by tmake
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE VC.T!
 
 # File:     makefile.vc
@@ -91,6 +91,7 @@ $(CPPFLAGS) /Fo$@ /c /Tp $<
 GENERICOBJS= $(GENDIR)\$D\busyinfo.obj \
 		$(GENDIR)\$D\calctrl.obj \
 		$(GENDIR)\$D\choicdgg.obj \
+		$(GENDIR)\$D\dcbuffer.obj \
 		$(GENDIR)\$D\dcpsg.obj \
 		$(GENDIR)\$D\dirctrlg.obj \
 		$(GENDIR)\$D\dragimgg.obj \
@@ -126,7 +127,6 @@ NONESSENTIALOBJS= $(GENDIR)\$D\colrdlgg.obj \
 		$(GENDIR)\$D\fontdlgg.obj \
 		$(GENDIR)\$D\helpext.obj \
 		$(GENDIR)\$D\helphtml.obj \
-		$(GENDIR)\$D\helpwxht.obj \
 		$(GENDIR)\$D\imaglist.obj \
 		$(GENDIR)\$D\listctrl.obj \
 		$(GENDIR)\$D\msgdlgg.obj \
@@ -136,6 +136,8 @@ NONESSENTIALOBJS= $(GENDIR)\$D\colrdlgg.obj \
 COMMONOBJS = \
 		$(COMMDIR)\$D\y_tab.obj \
 		$(COMMDIR)\$D\appcmn.obj \
+		$(COMMDIR)\$D\artprov.obj \
+		$(COMMDIR)\$D\artstd.obj \
 		$(COMMDIR)\$D\choiccmn.obj \
 		$(COMMDIR)\$D\clipcmn.obj \
 		$(COMMDIR)\$D\clntdata.obj \
@@ -189,9 +191,11 @@ COMMONOBJS = \
 		$(COMMDIR)\$D\hashmap.obj \
 		$(COMMDIR)\$D\helpbase.obj \
 		$(COMMDIR)\$D\http.obj \
+		$(COMMDIR)\$D\iconbndl.obj \
 		$(COMMDIR)\$D\imagall.obj \
 		$(COMMDIR)\$D\imagbmp.obj \
 		$(COMMDIR)\$D\image.obj \
+		$(COMMDIR)\$D\imagfill.obj \
 		$(COMMDIR)\$D\imaggif.obj \
 		$(COMMDIR)\$D\imagiff.obj \
 		$(COMMDIR)\$D\imagjpeg.obj \
@@ -229,6 +233,7 @@ COMMONOBJS = \
 		$(COMMDIR)\$D\sckfile.obj \
 		$(COMMDIR)\$D\sckipc.obj \
 		$(COMMDIR)\$D\sckstrm.obj \
+		$(COMMDIR)\$D\settcmn.obj \
 		$(COMMDIR)\$D\sizer.obj \
 		$(COMMDIR)\$D\socket.obj \
 		$(COMMDIR)\$D\statbar.obj \
@@ -315,6 +320,7 @@ MSWOBJS = $(MSWDIR)\$D\accel.obj \
 		$(MSWDIR)\$D\helpwin.obj \
 		$(MSWDIR)\$D\icon.obj \
 		$(MSWDIR)\$D\imaglist.obj \
+		$(MSWDIR)\$D\iniconf.obj \
 		$(MSWDIR)\$D\joystick.obj \
 		$(MSWDIR)\$D\listbox.obj \
 		$(MSWDIR)\$D\listctrl.obj \
@@ -449,18 +455,18 @@ $(WXDIR)\$D:
 
 # wxWindows library as DLL
 dll:
-        nmake -f makefile.vc all FINAL=$(FINAL) DLL=1 WXMAKINGDLL=1 NEW_WXLIBNAME=$(NEW_WXLIBNAME) UNICODE=$(UNICODE)
+        nmake -f makefile.vc all FINAL=$(FINAL) DLL=1 WXMAKINGDLL=1 NEW_WXLIBNAME=$(NEW_WXLIBNAME) UNICODE=$(UNICODE) MSLU=$(MSLU)
 
 cleandll:
-        nmake -f makefile.vc clean FINAL=$(FINAL) DLL=1 WXMAKINGDLL=1 NEW_WXLIBNAME=$(NEW_WXLIBNAME) UNICODE=$(UNICODE)
+        nmake -f makefile.vc clean FINAL=$(FINAL) DLL=1 WXMAKINGDLL=1 NEW_WXLIBNAME=$(NEW_WXLIBNAME) UNICODE=$(UNICODE) MSLU=$(MSLU)
 
 # wxWindows + app as DLL. Only affects main.cpp.
 dllapp:
-        nmake -f makefile.vc all FINAL=$(FINAL) DLL=1 UNICODE=$(UNICODE)
+        nmake -f makefile.vc all FINAL=$(FINAL) DLL=1 UNICODE=$(UNICODE) MSLU=$(MSLU)
 
 # wxWindows + app as DLL, for Netscape plugin - remove DllMain.
 dllnp:
-        nmake -f makefile.vc all NOMAIN=1 FINAL=$(FINAL) DLL=1 UNICODE=$(UNICODE)
+        nmake -f makefile.vc all NOMAIN=1 FINAL=$(FINAL) DLL=1 UNICODE=$(UNICODE) MSLU=$(MSLU)
 
 # Use this to make dummy.obj and generate a PCH.
 # You might use the dll target, then the pch target, in order to
@@ -526,7 +532,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 $(WXDIR)\lib\regex$(LIBEXT).lib $(DELAY_LOAD)
+    $(DUMMYOBJ) $(OBJECTS) $(MSLU_LIBS) $(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