X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/04ef50df3a0fa3c343800c554e609f98fc7575cc..0c8b041f147ff9bb6ce38f0e2da1fd82f6484523:/src/msw/makefile.mic

diff --git a/src/msw/makefile.mic b/src/msw/makefile.mic
index 2de5b50152..b544a55a3f 100644
--- a/src/msw/makefile.mic
+++ b/src/msw/makefile.mic
@@ -1,9 +1,14 @@
 ##############################################################################
 # Microwindows template Makefile
 # Copyright (c) 2000 Martin Jolicoeur, Greg Haerr
+# Licence:   wxWindows Licence
 ##############################################################################
 
-TOP=/home/julians/microwindows/microwin/src
+TOP=$(MICROWINDOWS)
+ifeq "$(MICROWINDOWS)" ""
+TOP=/home/julians/local/microwindows/microwindows-0.89pre8/src
+endif
+
 CONFIG = $(TOP)/config
 WXDIR = ../..
 OBJSUFF = o
@@ -30,27 +35,32 @@ PNGLIB  = $(WXDIR)/lib/libpng.a
 JPEGLIB = $(WXDIR)/lib/libjpeg.a
 TIFFLIB = $(WXDIR)/lib/libtiff.a
 
-GENERICOBJS_ORIG = \
+GENERICOBJS = \
+                $(GENDIR)/accel.$(OBJSUFF) \
                 $(GENDIR)/busyinfo.$(OBJSUFF) \
 		$(GENDIR)/calctrl.$(OBJSUFF) \
 		$(GENDIR)/choicdgg.$(OBJSUFF) \
+		$(GENDIR)/colrdlgg.$(OBJSUFF) \
 		$(GENDIR)/dirctrlg.$(OBJSUFF) \
 		$(GENDIR)/dragimgg.$(OBJSUFF) \
+		$(GENDIR)/fontdlgg.$(OBJSUFF) \
 		$(GENDIR)/grid.$(OBJSUFF) \
+		$(GENDIR)/gridctrl.$(OBJSUFF) \
 		$(GENDIR)/gridsel.$(OBJSUFF) \
+		$(GENDIR)/imaglist.$(OBJSUFF) \
 		$(GENDIR)/laywin.$(OBJSUFF) \
+		$(GENDIR)/listctrl.$(OBJSUFF) \
 		$(GENDIR)/logg.$(OBJSUFF) \
+		$(GENDIR)/msgdlgg.$(OBJSUFF) \
 		$(GENDIR)/numdlgg.$(OBJSUFF) \
 		$(GENDIR)/panelg.$(OBJSUFF) \
 		$(GENDIR)/progdlgg.$(OBJSUFF) \
-		$(GENDIR)/prop.$(OBJSUFF) \
-		$(GENDIR)/propform.$(OBJSUFF) \
-		$(GENDIR)/proplist.$(OBJSUFF) \
 		$(GENDIR)/sashwin.$(OBJSUFF) \
-		$(GENDIR)/scrolwin.$(OBJSUFF) \
+		$(GENDIR)/scrlwing.$(OBJSUFF) \
+		$(GENDIR)/spinctlg.$(OBJSUFF) \
 		$(GENDIR)/splash.$(OBJSUFF) \
 		$(GENDIR)/splitter.$(OBJSUFF) \
-		$(GENDIR)/statusbr.$(OBJSUFF) \
+		$(GENDIR)/tabg.$(OBJSUFF) \
 		$(GENDIR)/tbarsmpl.$(OBJSUFF) \
 		$(GENDIR)/textdlgg.$(OBJSUFF) \
 		$(GENDIR)/tipdlg.$(OBJSUFF) \
@@ -59,37 +69,26 @@ GENERICOBJS_ORIG = \
 		$(GENDIR)/treelay.$(OBJSUFF) \
 		$(GENDIR)/wizard.$(OBJSUFF)
 
-GENERICOBJS = \
-		$(GENDIR)/laywin.$(OBJSUFF) \
-		$(GENDIR)/logg.$(OBJSUFF) \
-		$(GENDIR)/panelg.$(OBJSUFF) \
-		$(GENDIR)/sashwin.$(OBJSUFF) \
-		$(GENDIR)/scrolwin.$(OBJSUFF) \
-		$(GENDIR)/splash.$(OBJSUFF) \
-		$(GENDIR)/splitter.$(OBJSUFF) \
-		$(GENDIR)/statusbr.$(OBJSUFF) \
-		$(GENDIR)/tbarsmpl.$(OBJSUFF) \
-		$(GENDIR)/tipwin.$(OBJSUFF)
-
-COMMONOBJS_OTHER=\
-		$(COMMDIR)/choiccmn.$(OBJSUFF) \
-		$(COMMDIR)/ctrlsub.$(OBJSUFF) \
-		$(COMMDIR)/dobjcmn.$(OBJSUFF) \
-		$(COMMDIR)/lboxcmn.$(OBJSUFF) \
-		$(COMMDIR)/textcmn.$(OBJSUFF) \
-
 COMMONOBJS  = \
 		$(COMMDIR)/appcmn.$(OBJSUFF) \
+		$(COMMDIR)/choiccmn.$(OBJSUFF) \
+		$(COMMDIR)/clntdata.$(OBJSUFF) \
 		$(COMMDIR)/clipcmn.$(OBJSUFF) \
 		$(COMMDIR)/cmdline.$(OBJSUFF) \
+		$(COMMDIR)/cmdproc.$(OBJSUFF) \
 		$(COMMDIR)/cmndata.$(OBJSUFF) \
 		$(COMMDIR)/config.$(OBJSUFF) \
+		$(COMMDIR)/containr.$(OBJSUFF) \
 		$(COMMDIR)/cshelp.$(OBJSUFF) \
 		$(COMMDIR)/ctrlcmn.$(OBJSUFF) \
+		$(COMMDIR)/ctrlsub.$(OBJSUFF) \
 		$(COMMDIR)/datetime.$(OBJSUFF) \
 		$(COMMDIR)/datstrm.$(OBJSUFF) \
 		$(COMMDIR)/dcbase.$(OBJSUFF) \
+		$(COMMDIR)/dircmn.$(OBJSUFF) \
 		$(COMMDIR)/dlgcmn.$(OBJSUFF) \
+		$(COMMDIR)/dobjcmn.$(OBJSUFF) \
+		$(COMMDIR)/docview.$(OBJSUFF) \
 		$(COMMDIR)/dynarray.$(OBJSUFF) \
 		$(COMMDIR)/dynlib.$(OBJSUFF) \
 		$(COMMDIR)/effects.$(OBJSUFF) \
@@ -105,6 +104,7 @@ COMMONOBJS  = \
 		$(COMMDIR)/fontcmn.$(OBJSUFF) \
 		$(COMMDIR)/fontmap.$(OBJSUFF) \
 		$(COMMDIR)/framecmn.$(OBJSUFF) \
+		$(COMMDIR)/gaugecmn.$(OBJSUFF) \
 		$(COMMDIR)/gdicmn.$(OBJSUFF) \
 		$(COMMDIR)/geometry.$(OBJSUFF) \
 		$(COMMDIR)/gifdecod.$(OBJSUFF) \
@@ -121,30 +121,39 @@ COMMONOBJS  = \
 		$(COMMDIR)/imagtiff.$(OBJSUFF) \
 		$(COMMDIR)/imagxpm.$(OBJSUFF) \
 		$(COMMDIR)/intl.$(OBJSUFF) \
+		$(COMMDIR)/ipcbase.$(OBJSUFF) \
 		$(COMMDIR)/layout.$(OBJSUFF) \
+		$(COMMDIR)/lboxcmn.$(OBJSUFF) \
 		$(COMMDIR)/list.$(OBJSUFF) \
 		$(COMMDIR)/log.$(OBJSUFF) \
 		$(COMMDIR)/longlong.$(OBJSUFF) \
 		$(COMMDIR)/matrix.$(OBJSUFF) \
 		$(COMMDIR)/memory.$(OBJSUFF) \
 		$(COMMDIR)/menucmn.$(OBJSUFF) \
+		$(COMMDIR)/mimecmn.$(OBJSUFF) \
 		$(COMMDIR)/module.$(OBJSUFF) \
 		$(COMMDIR)/mstream.$(OBJSUFF) \
+		$(COMMDIR)/nbkbase.$(OBJSUFF) \
 		$(COMMDIR)/object.$(OBJSUFF) \
-		$(COMMDIR)/objstrm.$(OBJSUFF) \
 		$(COMMDIR)/paper.$(OBJSUFF) \
+		$(COMMDIR)/popupcmn.$(OBJSUFF) \
 		$(COMMDIR)/prntbase.$(OBJSUFF) \
 		$(COMMDIR)/process.$(OBJSUFF) \
 		$(COMMDIR)/quantize.$(OBJSUFF) \
-		$(COMMDIR)/resource.$(OBJSUFF) \
+		$(COMMDIR)/radiocmn.$(OBJSUFF) \
 		$(COMMDIR)/sizer.$(OBJSUFF) \
+		$(COMMDIR)/statbar.$(OBJSUFF) \
 		$(COMMDIR)/strconv.$(OBJSUFF) \
 		$(COMMDIR)/stream.$(OBJSUFF) \
 		$(COMMDIR)/string.$(OBJSUFF) \
+		$(COMMDIR)/sysopt.$(OBJSUFF) \
 		$(COMMDIR)/tbarbase.$(OBJSUFF) \
+		$(COMMDIR)/textbuf.$(OBJSUFF) \
+		$(COMMDIR)/textcmn.$(OBJSUFF) \
 		$(COMMDIR)/textfile.$(OBJSUFF) \
 		$(COMMDIR)/timercmn.$(OBJSUFF) \
 		$(COMMDIR)/tokenzr.$(OBJSUFF) \
+		$(COMMDIR)/toplvcmn.$(OBJSUFF) \
 		$(COMMDIR)/treebase.$(OBJSUFF) \
 		$(COMMDIR)/txtstrm.$(OBJSUFF) \
 		$(COMMDIR)/utilscmn.$(OBJSUFF) \
@@ -181,7 +190,6 @@ HTMLOBJS = \
 		$(HTMLDIR)/winpars.$(OBJSUFF)
 
 MSWOBJS     = \
-		$(MICROWINDIR)/accel.$(OBJSUFF) \
 		$(MICROWINDIR)/app.$(OBJSUFF) \
 		$(MICROWINDIR)/bitmap.$(OBJSUFF) \
 		$(MICROWINDIR)/brush.$(OBJSUFF) \
@@ -199,40 +207,43 @@ MSWOBJS     = \
 		$(MICROWINDIR)/dialog.$(OBJSUFF) \
 		$(MICROWINDIR)/dialup.$(OBJSUFF) \
 		$(UNIXDIR)/dir.$(OBJSUFF) \
+		$(MICROWINDIR)/evtloop.$(OBJSUFF) \
 		$(MICROWINDIR)/font.$(OBJSUFF) \
 		$(MICROWINDIR)/fontenum.$(OBJSUFF) \
 		$(MICROWINDIR)/fontutil.$(OBJSUFF) \
-		$(MICROWINDIR)/frame.$(OBJSUFF) \
 		$(MICROWINDIR)/gdiimage.$(OBJSUFF) \
 		$(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) \
 		$(MICROWINDIR)/region.$(OBJSUFF) \
 		$(MICROWINDIR)/settings.$(OBJSUFF) \
+		$(MICROWINDIR)/snglinst.$(OBJSUFF) \
 		$(MICROWINDIR)/thread.$(OBJSUFF) \
 		$(MICROWINDIR)/timer.$(OBJSUFF) \
+		$(MICROWINDIR)/toplevel.$(OBJSUFF) \
 		$(MICROWINDIR)/utils.$(OBJSUFF) \
-		$(MICROWINDIR)/window.$(OBJSUFF)
+		$(MICROWINDIR)/window.$(OBJSUFF) \
+		$(OLEDIR)/dataobj.$(OBJSUFF)
+
+UNIVOBJS_TODO = $(UNIVDIR)/choice.$(OBJSUFF) \
+		$(UNIVDIR)/colordlg.$(OBJSUFF) \
+
 
 UNIVOBJS     = \
 		$(UNIVDIR)/bmpbuttn.$(OBJSUFF) \
 		$(UNIVDIR)/button.$(OBJSUFF) \
 		$(UNIVDIR)/checkbox.$(OBJSUFF) \
 		$(UNIVDIR)/checklst.$(OBJSUFF) \
-		$(UNIVDIR)/choice.$(OBJSUFF) \
-		$(UNIVDIR)/colordlg.$(OBJSUFF) \
 		$(UNIVDIR)/colschem.$(OBJSUFF) \
+		$(UNIVDIR)/combobox.$(OBJSUFF) \
 		$(UNIVDIR)/control.$(OBJSUFF) \
-		$(UNIVDIR)/frameuniv.$(OBJSUFF) \
+		$(UNIVDIR)/framuniv.$(OBJSUFF) \
 		$(UNIVDIR)/gauge.$(OBJSUFF) \
 		$(UNIVDIR)/inphand.$(OBJSUFF) \
+		$(UNIVDIR)/inpcons.$(OBJSUFF) \
 		$(UNIVDIR)/listbox.$(OBJSUFF) \
 		$(UNIVDIR)/menu.$(OBJSUFF) \
 		$(UNIVDIR)/notebook.$(OBJSUFF) \
@@ -244,13 +255,14 @@ UNIVOBJS     = \
 		$(UNIVDIR)/scrthumb.$(OBJSUFF) \
 		$(UNIVDIR)/slider.$(OBJSUFF) \
 		$(UNIVDIR)/spinbutt.$(OBJSUFF) \
-		$(UNIVDIR)/spinctrl.$(OBJSUFF) \
 		$(UNIVDIR)/statbmp.$(OBJSUFF) \
 		$(UNIVDIR)/statbox.$(OBJSUFF) \
 		$(UNIVDIR)/statline.$(OBJSUFF) \
 		$(UNIVDIR)/stattext.$(OBJSUFF) \
+		$(UNIVDIR)/statusbr.$(OBJSUFF) \
 		$(UNIVDIR)/textctrl.$(OBJSUFF) \
 		$(UNIVDIR)/theme.$(OBJSUFF) \
+		$(UNIVDIR)/topluniv.$(OBJSUFF) \
 		$(UNIVDIR)/winuniv.$(OBJSUFF) \
 		$(UNIVDIR)/themes/gtk.$(OBJSUFF) \
 		$(UNIVDIR)/themes/win32.$(OBJSUFF)
@@ -262,7 +274,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 +=
@@ -282,7 +294,7 @@ LIBNAME =
 include $(TOP)/Makefile.rules
 
 # List of objects to compile
-OBJS = $(COMMONOBJS) $(MSWOBJS) $(GENERICOBJS)
+OBJS = $(COMMONOBJS) $(MSWOBJS) $(GENERICOBJS) $(UNIVOBJS)
 
 all: $(WXLIB)
 
@@ -320,12 +332,19 @@ 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) ../univ/themes/*.o
+	-$(RM) ../univ/themes/*.bak
+	-$(RM) ../unix/*.o
+	-$(RM) ../unix/*.bak
 	-$(RM) ../html/*.o
 	-$(RM) ../zlib/*.o
 	-$(RM) ../zlib/*.bak