X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c3f64df223f87ef094ee81577a0334905855d14d..f7f78039d2e18114efdec0abe46dc4ed2d4529a8:/src/msw/makefile.vc

diff --git a/src/msw/makefile.vc b/src/msw/makefile.vc
index 448b94cbfd..666cfd7a63 100644
--- a/src/msw/makefile.vc
+++ b/src/msw/makefile.vc
@@ -103,9 +103,6 @@ GENERICOBJS= $(GENDIR)\$D\busyinfo.obj \
 		$(GENDIR)\$D\numdlgg.obj \
 		$(GENDIR)\$D\panelg.obj \
 		$(GENDIR)\$D\progdlgg.obj \
-		$(GENDIR)\$D\prop.obj \
-		$(GENDIR)\$D\propform.obj \
-		$(GENDIR)\$D\proplist.obj \
 		$(GENDIR)\$D\sashwin.obj \
 		$(GENDIR)\$D\scrlwing.obj \
 		$(GENDIR)\$D\spinctlg.obj \
@@ -117,7 +114,6 @@ GENERICOBJS= $(GENDIR)\$D\busyinfo.obj \
 		$(GENDIR)\$D\tipdlg.obj \
 		$(GENDIR)\$D\tipwin.obj \
 		$(GENDIR)\$D\treectlg.obj \
-		$(GENDIR)\$D\treelay.obj \
 		$(GENDIR)\$D\wizard.obj
 
 # These are generic things that don't need to be compiled on MSW,
@@ -137,6 +133,7 @@ NONESSENTIALOBJS= $(GENDIR)\$D\colrdlgg.obj \
 
 COMMONOBJS = \
 		$(COMMDIR)\$D\y_tab.obj \
+		$(COMMDIR)\$D\accesscmn.obj \
 		$(COMMDIR)\$D\appcmn.obj \
 		$(COMMDIR)\$D\artprov.obj \
 		$(COMMDIR)\$D\artstd.obj \
@@ -163,6 +160,7 @@ COMMONOBJS = \
 		$(COMMDIR)\$D\dobjcmn.obj \
 		$(COMMDIR)\$D\docmdi.obj \
 		$(COMMDIR)\$D\docview.obj \
+		$(COMMDIR)\$D\dpycmn.obj \
 		$(COMMDIR)\$D\dseldlg.obj \
 		$(COMMDIR)\$D\dynarray.obj \
 		$(COMMDIR)\$D\dynlib.obj \
@@ -222,7 +220,6 @@ COMMONOBJS = \
 		$(COMMDIR)\$D\mstream.obj \
 		$(COMMDIR)\$D\nbkbase.obj \
 		$(COMMDIR)\$D\object.obj \
-		$(COMMDIR)\$D\odbc.obj \
 		$(COMMDIR)\$D\paper.obj \
 		$(COMMDIR)\$D\popupcmn.obj \
 		$(COMMDIR)\$D\prntbase.obj \
@@ -231,7 +228,7 @@ COMMONOBJS = \
 		$(COMMDIR)\$D\quantize.obj \
 		$(COMMDIR)\$D\radiocmn.obj \
 		$(COMMDIR)\$D\regex.obj \
-		$(COMMDIR)\$D\resource.obj \
+		$(COMMDIR)\$D\rgncmn.obj \
 		$(COMMDIR)\$D\sckaddr.obj \
 		$(COMMDIR)\$D\sckfile.obj \
 		$(COMMDIR)\$D\sckipc.obj \
@@ -244,6 +241,7 @@ COMMONOBJS = \
 		$(COMMDIR)\$D\stream.obj \
 		$(COMMDIR)\$D\string.obj \
 		$(COMMDIR)\$D\sysopt.obj \
+		$(COMMDIR)\$D\taskbarcmn.obj \
 		$(COMMDIR)\$D\tbarbase.obj \
 		$(COMMDIR)\$D\textbuf.obj \
 		$(COMMDIR)\$D\textcmn.obj \
@@ -263,12 +261,12 @@ COMMONOBJS = \
 		$(COMMDIR)\$D\wfstream.obj \
 		$(COMMDIR)\$D\wincmn.obj \
 		$(COMMDIR)\$D\wxchar.obj \
-		$(COMMDIR)\$D\wxexpr.obj \
 		$(COMMDIR)\$D\xpmdecod.obj \
 		$(COMMDIR)\$D\zipstrm.obj \
 		$(COMMDIR)\$D\zstream.obj
 
 MSWOBJS = $(MSWDIR)\$D\accel.obj \
+		$(OLEDIR)\$D\access.obj \
 		$(MSWDIR)\$D\app.obj \
 		$(OLEDIR)\$D\automtn.obj \
 		$(MSWDIR)\$D\bitmap.obj \
@@ -284,7 +282,6 @@ MSWOBJS = $(MSWDIR)\$D\accel.obj \
 		$(MSWDIR)\$D\colour.obj \
 		$(MSWDIR)\$D\combobox.obj \
 		$(MSWDIR)\$D\control.obj \
-		$(MSWDIR)\$D\curico.obj \
 		$(MSWDIR)\$D\cursor.obj \
 		$(MSWDIR)\$D\data.obj \
 		$(OLEDIR)\$D\dataobj.obj \
@@ -297,9 +294,9 @@ MSWOBJS = $(MSWDIR)\$D\accel.obj \
 		$(MSWDIR)\$D\dialog.obj \
 		$(MSWDIR)\$D\dialup.obj \
 		$(MSWDIR)\$D\dib.obj \
-		$(MSWDIR)\$D\dibutils.obj \
 		$(MSWDIR)\$D\dir.obj \
 		$(MSWDIR)\$D\dirdlg.obj \
+		$(MSWDIR)\$D\display.obj \
 		$(MSWDIR)\$D\dragimag.obj \
 		$(OLEDIR)\$D\dropsrc.obj \
 		$(OLEDIR)\$D\droptgt.obj \
@@ -405,7 +402,7 @@ HTMLOBJS = $(HTMLDIR)\$D\helpctrl.obj \
 # Add $(HTMLOBJS) if wanting wxHTML classes
 OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(HTMLOBJS)
 
-ARCHINCDIR=$(WXDIR)\lib\msw$(INCEXT)
+ARCHINCDIR=$(WXDIR)\lib\$(_WXINC_BUILD)$(_WXINC_DLLSUFFIX)$(_WXINC_SUFFIX)$(LIBEXT)
 SETUP_H=$(ARCHINCDIR)\wx\setup.h
 
 # Normal, static library
@@ -635,7 +632,7 @@ $(CPPFLAGS2) /c $(COMMDIR)\unzip.c /Fo$@
 
 png:
     cd $(WXDIR)\src\png
-    nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) CRTFLAG=$(CRTFLAG)
+    nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) CRTFLAG=$(CRTFLAG) UNICODE=0
     cd $(WXDIR)\src\msw
 
 clean_png:
@@ -645,7 +642,7 @@ clean_png:
 
 zlib:
     cd $(WXDIR)\src\zlib
-    nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) CRTFLAG=$(CRTFLAG)
+    nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) CRTFLAG=$(CRTFLAG) UNICODE=0
     cd $(WXDIR)\src\msw
 
 clean_zlib:
@@ -655,7 +652,7 @@ clean_zlib:
 
 jpeg:
     cd $(WXDIR)\src\jpeg
-    nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL)  CRTFLAG=$(CRTFLAG) all
+    nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL)  CRTFLAG=$(CRTFLAG) UNICODE=0 all
     cd $(WXDIR)\src\msw
 
 clean_jpeg:
@@ -665,7 +662,7 @@ clean_jpeg:
 
 tiff:
     cd $(WXDIR)\src\tiff
-    nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL)  CRTFLAG=$(CRTFLAG) all
+    nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL)  CRTFLAG=$(CRTFLAG) UNICODE=0 all
     cd $(WXDIR)\src\msw
 
 clean_tiff:
@@ -675,7 +672,7 @@ clean_tiff:
 
 regex:
     cd $(WXDIR)\src\regex
-    nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) CRTFLAG=$(CRTFLAG) all
+    nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) CRTFLAG=$(CRTFLAG) UNICODE=0 all
     cd $(WXDIR)\src\msw
 
 clean_regex:
@@ -689,11 +686,11 @@ rcparser:
     cd $(WXDIR)\src\msw
 
 cleanall: clean clean_png clean_zlib clean_jpeg clean_tiff clean_regex
-        -erase ..\..\lib\wx$(WXVERSION)$(LIBEXT).dll
-        -erase ..\..\lib\wx$(WXVERSION)$(LIBEXT).lib
-        -erase ..\..\lib\wx$(WXVERSION)$(LIBEXT).exp
-        -erase ..\..\lib\wx$(WXVERSION)$(LIBEXT).pdb
-        -erase ..\..\lib\wx$(WXVERSION)$(LIBEXT).ilk
+        -erase ..\..\lib\$(WXLIBNAME).dll
+        -erase ..\..\lib\$(WXLIBNAME).lib
+        -erase ..\..\lib\$(WXLIBNAME).exp
+        -erase ..\..\lib\$(WXLIBNAME).pdb
+        -erase ..\..\lib\$(WXLIBNAME).ilk
 
 
 clean: $(PERIPH_CLEAN_TARGET)