64 bit fixes

[wxWidgets.git] / samples / minimal / makefile.mic

diff --git a/samples/minimal/makefile.mic b/samples/minimal/makefile.mic
index 3110304db4686d075f97b54ee410cb1d56c25e16..6cabbbfdcc187542fd92ac2b3331be0585e726d5 100644 (file)
--- a/samples/minimal/makefile.mic
+++ b/samples/minimal/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
@@ -47,7 +51,6 @@ include $(TOP)/Makefile.rules
 
 # List of objects to compile
 OBJS = minimal.o
-MTESTOBJS = mtest.o
 
 all: minimal
 
@@ -60,9 +63,6 @@ all: minimal
 minimal: $(OBJS) $(MWINLIBS) $(WXLIB) $(TOP)/config
        $(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) -o $@ $(WXLIB) $(MWINLIBS) -lm
 
-mtest: $(MTESTOBJS) $(MWINLIBS) $(TOP)/config
-       $(CC) $(CFLAGS) $(LDFLAGS) $(MTESTOBJS) -o $@ $(MWINLIBS)
-
 #.SUFFIXES: .cpp .cxx .c
 
 #.c.o:
@@ -74,15 +74,12 @@ mtest: $(MTESTOBJS) $(MWINLIBS) $(TOP)/config
 .cpp.o:
        $(CC) -c $(CPPFLAGS) $(CFLAGS) -o $@ $*.cpp
 
-#$(COMMDIR)/appcmn.o:    $(COMMDIR)/appcmn.cpp
-#      $(CC) -c $(CPPFLAGS) -o $@ $*.cpp
-
-#appcmn.o:     $(COMMDIR)/appcmn.cpp
-#      $(CC) $(CPPFLAGS) -c -o $@ $<
-
 cleanwx:
        -$(RM) *.o
        -$(RM) minimal
 
 wx:
-       @pushd $(WXDIR)/src/microwin; make all; popd
+       @pushd $(WXDIR)/src/msw; make -f makefile.mic all; popd
+
+wxfull:
+       @pushd $(WXDIR)/src/msw; make -f makefile.mic cleanwx all; popd