X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/04ef50df3a0fa3c343800c554e609f98fc7575cc..61c213fe224da24ce33c9187263e75a17ca83a04:/samples/minimal/makefile.mic

diff --git a/samples/minimal/makefile.mic b/samples/minimal/makefile.mic
index c73f434bcd..6cabbbfdcc 100644
--- a/samples/minimal/makefile.mic
+++ b/samples/minimal/makefile.mic
@@ -3,7 +3,11 @@
 # Copyright (c) 2000 Martin Jolicoeur, Greg Haerr
 ##############################################################################
 
-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
@@ -25,7 +29,7 @@ include $(CONFIG)
 # Directories list for header files
 INCLUDEDIRS += -I$(WXDIR)/include
 # Defines for preprocessor
-DEFINES += -DMWIN -D__WXMICROWIN__ -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 +=
@@ -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