popup windows wre not using TOPMOST style under wxUniv any longer -- fixed

[wxWidgets.git] / src / msw / makefile.mic

diff --git a/src/msw/makefile.mic b/src/msw/makefile.mic
index f0611d2b0690eee150a327e5a839f06e525d1552..60d21f875ba164803ac6e03cb064599948826e0f 100644 (file)
--- a/src/msw/makefile.mic
+++ b/src/msw/makefile.mic
@@ -3,7 +3,11 @@
 # Copyright (c) 2000 Martin Jolicoeur, Greg Haerr
 ##############################################################################
 
-TOP=/home/julians/local/microwindows/microwin/src
+TOP=$(MICROWINDOWS)
+ifeq "$(MICROWINDOWS)" ""
+TOP=/home/julians/local/microwindows/microwindows-0.89pre8/src
+endif
+
 CONFIG = $(TOP)/config
 WXDIR = ../..
 OBJSUFF = o
@@ -55,7 +59,6 @@ GENERICOBJS = \
                $(GENDIR)/spinctlg.$(OBJSUFF) \
                $(GENDIR)/splash.$(OBJSUFF) \
                $(GENDIR)/splitter.$(OBJSUFF) \
-               $(GENDIR)/statusbr.$(OBJSUFF) \
                $(GENDIR)/tabg.$(OBJSUFF) \
                $(GENDIR)/tbarsmpl.$(OBJSUFF) \
                $(GENDIR)/textdlgg.$(OBJSUFF) \
@@ -68,11 +71,13 @@ GENERICOBJS = \
 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) \
@@ -129,7 +134,6 @@ COMMONOBJS  = \
                $(COMMDIR)/mstream.$(OBJSUFF) \
                $(COMMDIR)/nbkbase.$(OBJSUFF) \
                $(COMMDIR)/object.$(OBJSUFF) \
-               $(COMMDIR)/objstrm.$(OBJSUFF) \
                $(COMMDIR)/paper.$(OBJSUFF) \
                $(COMMDIR)/popupcmn.$(OBJSUFF) \
                $(COMMDIR)/prntbase.$(OBJSUFF) \
@@ -138,14 +142,18 @@ COMMONOBJS  = \
                $(COMMDIR)/radiocmn.$(OBJSUFF) \
                $(COMMDIR)/resource.$(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) \
@@ -203,7 +211,6 @@ MSWOBJS     = \
                $(MICROWINDIR)/font.$(OBJSUFF) \
                $(MICROWINDIR)/fontenum.$(OBJSUFF) \
                $(MICROWINDIR)/fontutil.$(OBJSUFF) \
-               $(MICROWINDIR)/frame.$(OBJSUFF) \
                $(MICROWINDIR)/gdiimage.$(OBJSUFF) \
                $(MICROWINDIR)/gdiobj.$(OBJSUFF) \
                $(MICROWINDIR)/icon.$(OBJSUFF) \
@@ -211,12 +218,12 @@ MSWOBJS     = \
                $(MICROWINDIR)/microwin.$(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) \
                $(OLEDIR)/dataobj.$(OBJSUFF)
@@ -236,6 +243,7 @@ UNIVOBJS     = \
                $(UNIVDIR)/framuniv.$(OBJSUFF) \
                $(UNIVDIR)/gauge.$(OBJSUFF) \
                $(UNIVDIR)/inphand.$(OBJSUFF) \
+               $(UNIVDIR)/inpcons.$(OBJSUFF) \
                $(UNIVDIR)/listbox.$(OBJSUFF) \
                $(UNIVDIR)/menu.$(OBJSUFF) \
                $(UNIVDIR)/notebook.$(OBJSUFF) \
@@ -251,8 +259,10 @@ UNIVOBJS     = \
                $(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)
@@ -322,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