X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f0b22b4a039b5797b94ecde35e2b67f6716c9e84..abfcca57dd0d805ceec9e19c4be207614d79252a:/src/msw/makefile.mic?ds=sidebyside

diff --git a/src/msw/makefile.mic b/src/msw/makefile.mic
index ebf8204047..7fc4d7b2e7 100644
--- a/src/msw/makefile.mic
+++ b/src/msw/makefile.mic
@@ -3,7 +3,7 @@
 # Copyright (c) 2000 Martin Jolicoeur, Greg Haerr
 ##############################################################################
 
-TOP=/home/julians/microwindows/microwin/src
+TOP=/home/julians/local/microwindows/microwin/src
 CONFIG = $(TOP)/config
 WXDIR = ../..
 OBJSUFF = o
@@ -31,8 +31,8 @@ JPEGLIB = $(WXDIR)/lib/libjpeg.a
 TIFFLIB = $(WXDIR)/lib/libtiff.a
 
 GENERICOBJS = \
-        $(GENDIR)/accel.$(OBJSUFF) \
-        $(GENDIR)/busyinfo.$(OBJSUFF) \
+                $(GENDIR)/accel.$(OBJSUFF) \
+                $(GENDIR)/busyinfo.$(OBJSUFF) \
 		$(GENDIR)/calctrl.$(OBJSUFF) \
 		$(GENDIR)/choicdgg.$(OBJSUFF) \
 		$(GENDIR)/colrdlgg.$(OBJSUFF) \
@@ -42,6 +42,7 @@ GENERICOBJS = \
 		$(GENDIR)/grid.$(OBJSUFF) \
 		$(GENDIR)/gridctrl.$(OBJSUFF) \
 		$(GENDIR)/gridsel.$(OBJSUFF) \
+		$(GENDIR)/imaglist.$(OBJSUFF) \
 		$(GENDIR)/laywin.$(OBJSUFF) \
 		$(GENDIR)/listctrl.$(OBJSUFF) \
 		$(GENDIR)/logg.$(OBJSUFF) \
@@ -50,7 +51,7 @@ GENERICOBJS = \
 		$(GENDIR)/panelg.$(OBJSUFF) \
 		$(GENDIR)/progdlgg.$(OBJSUFF) \
 		$(GENDIR)/sashwin.$(OBJSUFF) \
-		$(GENDIR)/scrolwin.$(OBJSUFF) \
+		$(GENDIR)/scrlwing.$(OBJSUFF) \
 		$(GENDIR)/spinctlg.$(OBJSUFF) \
 		$(GENDIR)/splash.$(OBJSUFF) \
 		$(GENDIR)/splitter.$(OBJSUFF) \
@@ -126,6 +127,7 @@ COMMONOBJS  = \
 		$(COMMDIR)/mimecmn.$(OBJSUFF) \
 		$(COMMDIR)/module.$(OBJSUFF) \
 		$(COMMDIR)/mstream.$(OBJSUFF) \
+		$(COMMDIR)/nbkbase.$(OBJSUFF) \
 		$(COMMDIR)/object.$(OBJSUFF) \
 		$(COMMDIR)/objstrm.$(OBJSUFF) \
 		$(COMMDIR)/paper.$(OBJSUFF) \
@@ -206,10 +208,7 @@ MSWOBJS     = \
 		$(MICROWINDIR)/gdiobj.$(OBJSUFF) \
 		$(MICROWINDIR)/icon.$(OBJSUFF) \
 		$(MICROWINDIR)/main.$(OBJSUFF) \
-		$(MICROWINDIR)/menu.$(OBJSUFF) \
-		$(MICROWINDIR)/menuitem.$(OBJSUFF) \
 		$(MICROWINDIR)/microwin.$(OBJSUFF) \
-		$(MICROWINDIR)/msgdlg.$(OBJSUFF) \
 		$(MICROWINDIR)/palette.$(OBJSUFF) \
 		$(MICROWINDIR)/pen.$(OBJSUFF) \
 		$(MICROWINDIR)/regconf.$(OBJSUFF) \
@@ -219,7 +218,7 @@ MSWOBJS     = \
 		$(MICROWINDIR)/thread.$(OBJSUFF) \
 		$(MICROWINDIR)/timer.$(OBJSUFF) \
 		$(MICROWINDIR)/utils.$(OBJSUFF) \
-		$(MICROWINDIR)/window.$(OBJSUFF)
+		$(MICROWINDIR)/window.$(OBJSUFF) \
 		$(OLEDIR)/dataobj.$(OBJSUFF)
 
 UNIVOBJS_TODO = $(UNIVDIR)/choice.$(OBJSUFF) \
@@ -234,7 +233,7 @@ UNIVOBJS     = \
 		$(UNIVDIR)/colschem.$(OBJSUFF) \
 		$(UNIVDIR)/combobox.$(OBJSUFF) \
 		$(UNIVDIR)/control.$(OBJSUFF) \
-		$(UNIVDIR)/frameuniv.$(OBJSUFF) \
+		$(UNIVDIR)/framuniv.$(OBJSUFF) \
 		$(UNIVDIR)/gauge.$(OBJSUFF) \
 		$(UNIVDIR)/inphand.$(OBJSUFF) \
 		$(UNIVDIR)/listbox.$(OBJSUFF) \
@@ -248,7 +247,6 @@ UNIVOBJS     = \
 		$(UNIVDIR)/scrthumb.$(OBJSUFF) \
 		$(UNIVDIR)/slider.$(OBJSUFF) \
 		$(UNIVDIR)/spinbutt.$(OBJSUFF) \
-		$(UNIVDIR)/spinctrl.$(OBJSUFF) \
 		$(UNIVDIR)/statbmp.$(OBJSUFF) \
 		$(UNIVDIR)/statbox.$(OBJSUFF) \
 		$(UNIVDIR)/statline.$(OBJSUFF) \
@@ -266,7 +264,7 @@ include $(CONFIG)
 # Directories list for header files
 INCLUDEDIRS += -I$(WXDIR)/include
 # Defines for preprocessor
-DEFINES += -DMWIN -D__WXMSW__ -D__WXMICROWIN__ -D__WXUNIVERSAL__ -D__WIN32__ -D__WIN95__ -DHAVE_BOOL -DMICROWIN_TODO=1 -D__UNIX__ -DHAVE_NANOSLEEP -DMICROWIN_NOCONTROLS -D__WXDEBUG__
+DEFINES += -DMWIN -D__WXMSW__ -D__WXMICROWIN__ -D__WXUNIVERSAL__ -D__WIN32__ -D__WIN95__ -DHAVE_BOOL -DMICROWIN_TODO=1 -D__UNIX__ -DHAVE_NANOSLEEP -DMICROWIN_NOCONTROLS -D__WXDEBUG__ -DwxSIZE_T_IS_UINT -DWXWIN_OS_DESCRIPTION="\"MicroWindows\""
 
 # Compilation flags for C files OTHER than include directories
 CFLAGS +=
@@ -324,12 +322,17 @@ cleanwx:
 	-$(RM) *.o
 	-$(RM) *.bak
 	-$(RM) core
+	-$(RM) ole/*.o
 	-$(RM) ../common/y_tab.c
 	-$(RM) ../common/lex_yy.c
 	-$(RM) ../common/*.o
 	-$(RM) ../common/*.bak
 	-$(RM) ../generic/*.o
 	-$(RM) ../generic/*.bak
+	-$(RM) ../univ/*.o
+	-$(RM) ../univ/*.bak
+	-$(RM) ../unix/*.o
+	-$(RM) ../unix/*.bak
 	-$(RM) ../html/*.o
 	-$(RM) ../zlib/*.o
 	-$(RM) ../zlib/*.bak