resource loader structure added for loading menu bar, apple menu will not get multipl...

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

diff --git a/src/msw/makefile.mic b/src/msw/makefile.mic
index 5467c5068a6c3dd95c3c41cb95a48abdb00ad107..60d21f875ba164803ac6e03cb064599948826e0f 100644 (file)
--- a/src/msw/makefile.mic
+++ b/src/msw/makefile.mic
@@ -3,7 +3,10 @@
 # Copyright (c) 2000 Martin Jolicoeur, Greg Haerr
 ##############################################################################
 
-TOP=/home/julians/microwindows/microwindows-0.89pre8/src
+TOP=$(MICROWINDOWS)
+ifeq "$(MICROWINDOWS)" ""
+TOP=/home/julians/local/microwindows/microwindows-0.89pre8/src
+endif
 
 CONFIG = $(TOP)/config
 WXDIR = ../..
@@ -131,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) \
@@ -339,6 +341,8 @@ cleanwx:
        -$(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