# 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
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) \
$(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)/clipcmn.$(OBJSUFF) \
$(COMMDIR)/cmdline.$(OBJSUFF) \
+ $(COMMDIR)/cmdproc.$(OBJSUFF) \
$(COMMDIR)/cmndata.$(OBJSUFF) \
$(COMMDIR)/config.$(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) \
$(COMMDIR)/fontcmn.$(OBJSUFF) \
$(COMMDIR)/fontmap.$(OBJSUFF) \
$(COMMDIR)/framecmn.$(OBJSUFF) \
+ $(COMMDIR)/gaugecmn.$(OBJSUFF) \
$(COMMDIR)/gdicmn.$(OBJSUFF) \
$(COMMDIR)/geometry.$(OBJSUFF) \
$(COMMDIR)/gifdecod.$(OBJSUFF) \
$(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)/radiocmn.$(OBJSUFF) \
$(COMMDIR)/resource.$(OBJSUFF) \
$(COMMDIR)/sizer.$(OBJSUFF) \
$(COMMDIR)/strconv.$(OBJSUFF) \
$(COMMDIR)/stream.$(OBJSUFF) \
$(COMMDIR)/string.$(OBJSUFF) \
$(COMMDIR)/tbarbase.$(OBJSUFF) \
+ $(COMMDIR)/textcmn.$(OBJSUFF) \
$(COMMDIR)/textfile.$(OBJSUFF) \
$(COMMDIR)/timercmn.$(OBJSUFF) \
$(COMMDIR)/tokenzr.$(OBJSUFF) \
$(HTMLDIR)/winpars.$(OBJSUFF)
MSWOBJS = \
- $(MICROWINDIR)/accel.$(OBJSUFF) \
$(MICROWINDIR)/app.$(OBJSUFF) \
$(MICROWINDIR)/bitmap.$(OBJSUFF) \
$(MICROWINDIR)/brush.$(OBJSUFF) \
$(MICROWINDIR)/dialog.$(OBJSUFF) \
$(MICROWINDIR)/dialup.$(OBJSUFF) \
$(UNIXDIR)/dir.$(OBJSUFF) \
+ $(MICROWINDIR)/evtloop.$(OBJSUFF) \
$(MICROWINDIR)/font.$(OBJSUFF) \
$(MICROWINDIR)/fontenum.$(OBJSUFF) \
$(MICROWINDIR)/fontutil.$(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)/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)/listbox.$(OBJSUFF) \
$(UNIVDIR)/scrthumb.$(OBJSUFF) \
$(UNIVDIR)/slider.$(OBJSUFF) \
$(UNIVDIR)/spinbutt.$(OBJSUFF) \
- $(UNIVDIR)/spinctrl.$(OBJSUFF) \
$(UNIVDIR)/statbmp.$(OBJSUFF) \
$(UNIVDIR)/statbox.$(OBJSUFF) \
$(UNIVDIR)/statline.$(OBJSUFF) \
# 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 +=
include $(TOP)/Makefile.rules
# List of objects to compile
-OBJS = $(COMMONOBJS) $(MSWOBJS) $(GENERICOBJS)
+OBJS = $(COMMONOBJS) $(MSWOBJS) $(GENERICOBJS) $(UNIVOBJS)
all: $(WXLIB)
-$(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
projects / wxWidgets.git / blobdiff