Added more makefiles; fixed some samples for Cygwin

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1654 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

utils/wxtree/src/makefile.b32

@@ -1,18 +1,16 @@
 #
 # File:		makefile.b32
-# Author:	Patrick Halke
-# Created:	1995
+# Author:	Julian Smart
+# Created:	1999
 # Updated:	
-# Copyright:	(c) 1993, AIAI, University of Edinburgh
 #
-# "%W% %G%"
 #
-# Makefile : Builds 32bit wxtree library for 32-bit BC++
+# Makefile : Builds wxTree sample for 32-bit BC++
 
 WXDIR = $(WXWIN)
 
 TARGET=test
-OBJECTS=$(TARGET)
+OBJECTS=$(TARGET).obj wxtree.obj
 
 !include $(WXDIR)\src\makeprog.b32
 

utils/wxtree/src/makefile.bcc

@@ -1,96 +1,16 @@
 #
 # File:		makefile.bcc
 # Author:	Julian Smart
-# Created:	1993
+# Created:	1999
 # Updated:	
-# Copyright:	(c) 1993, AIAI, University of Edinburgh
 #
-# "%W% %G%"
 #
-# Makefile : Builds tree library and example (DOS).
+# Makefile : Builds wxTree sample for 16-bit BC++
 
-!if "$(BCCDIR)" == ""
-!error You must define the BCCDIR variable in autoexec.bat, e.g. BCCDIR=d:\bc4
-!endif
-
-!if "$(WXWIN)" == ""
-!error You must define the WXWIN variable in autoexec.bat, e.g. WXWIN=c:\wx
-!endif
-
-# Change WXDIR to wherever wxWindows is found
 WXDIR = $(WXWIN)
-!include $(WXDIR)\src\makebcc.env
 
-WXLIB = $(WXDIR)\lib\wx.lib
-WXINC = $(WXDIR)\include
-CFG=$(WXWIN)\src\wxwin.cfg
+TARGET=test
+OBJECTS=$(TARGET).obj wxtree.obj
 
-TREEDIR = $(WXDIR)\utils\wxtree
-TREELIB = $(TREEDIR)\lib\wxtree.lib
-
-WXHELPDIR = $(WXDIR)\utils\wxhelp
-TEX2RTFDIR = $(WXDIR)\utils\tex2rtf
-DOCDIR = $(WXHELPDIR)\docs
-
-# Default is to output RTF for WinHelp
-!ifndef WINHELP
-WINHELP=-winhelp
-!endif
-
-INC=/I$(WXDIR)\include\base /I$(WXDIR)\include\msw
-
-LIBS=$(WXLIB) $(TREELIB) mathwl cwl import mathwl
-
-!ifndef FINAL
-FINAL=0
-!endif
-
-!if "$(FINAL)" == "0"
-LINKFLAGS=/v/Vt /Twe /L$(WXDIR)\lib;$(BCCDIR)\lib
-OPT = -Od
-DEBUG_FLAGS= -v
-!else
-LINKFLAGS=/Twe /L$(WXDIR)\lib;$(BCCDIR)\lib
-OPT = -O2
-DEBUG_FLAGS=
-!endif
-CPPFLAGS=$(DEBUG_FLAGS) $(OPT) @$(CFG)
-CFLAGS=$(DEBUG_FLAGS) $(OPT) @$(CFG)
-
-HEADERS = wxtree.h
-SOURCES = wxtree.$(SRCSUFF)
-OBJECTS = wxtree.obj
-
-all:    $(TREELIB)
-
-.$(SRCSUFF).obj:
-	bcc $(CPPFLAGS) $(INC) -c {$< }
-
-$(TREELIB):      $(OBJECTS)
-        erase $(TREELIB)
-        tlib /P128 @&&!
-$(TREELIB) &
-+$(OBJECTS:.obj =.obj +)
-!
-
-test.obj: test.$(SRCSUFF)
-
-test.res :      test.rc $(WXDIR)\include\msw\wx.rc
-    rc /i$(BCCDIR)\include /i$(WXDIR)\include\msw /i$(WXDIR)\contrib\fafa -r test
-
-test.exe:      test.obj test.def test.res $(TREELIB)
-        tlink $(LINKFLAGS) @&&!
-c0wl.obj test.obj
-test
-nul
-$(LIBS)
-test.def
-!
-        rc -K test.res
-
-clean:
-        -erase *.obj
-        -erase *.exe
-        -erase *.res
-		-erase ..\lib\*.lib
+!include $(WXDIR)\src\makeprog.bcc
 

utils/wxtree/src/makefile.g95

@@ -1,48 +1,16 @@
 #
-# File:		makefile.g95
-# Author:	Julian Smart
-# Created:	1996
-#
-# "%W% %G%"
-#
-# Makefile : Builds wxTree library and example under GNU-WIN32
+# File:         makefile.g95
+# Author:       Julian Smart
+# Created:      1999
+# Updated:
+# Copyright:    (c) Julian Smart, 1999
 #
+# Makefile for wxWindows sample (Cygwin/Mingw32).
+
 WXDIR = ../../..
-include $(WXDIR)/src/makeg95.env
 
-PROPDIR = $(WXDIR)/utils/wxtree
-TREELIB = $(PROPDIR)/lib/$(LIBPREFIX)wxtree.$(LIBSUFF)
-THISDIR = $(PROPDIR)/src
+TARGET=test
+OBJECTS = $(TARGET).o wxtree.o
 
-OBJECTS = $(OBJDIR)/wxtree.$(OBJSUFF)
-TESTOBJECTS = $(OBJDIR)/test.$(OBJSUFF) $(OBJDIR)/test_resources.$(OBJSUFF)
+include $(WXDIR)/src/makeprog.g95
 
-LDFLAGS =  -Wl,--subsystem,windows -mwindows -L$(WXDIR)/lib -L../lib
-LDLIBS=-lwxtree $(LIBS)
-
-all:    $(OBJDIR) $(TREELIB)
-
-test:   $(OBJDIR) test.exe
-
-$(OBJDIR):
-	mkdir $(OBJDIR)
-
-$(TREELIB):      $(OBJECTS)
-	rm -f $@
-	ar $(AROPTIONS) $@ $(OBJECTS)
-	$(RANLIB) $@
-
-$(OBJDIR)/test.$(OBJSUFF):		test.h test.$(SRCSUFF) $(TREELIB)
-	$(CC) -c $(CPPFLAGS) -o $@ test.$(SRCSUFF)
-
-test.exe: $(TESTOBJECTS)
-	$(CC) $(LDFLAGS) -o test$(GUISUFFIX)$(EXESUFF) $(TESTOBJECTS) $(LDLIBS)
-
-$(OBJDIR)/wxtree.$(OBJSUFF):      wxtree.h wxtree.$(SRCSUFF)
-	$(CC) -c $(CPPFLAGS) -o $@ wxtree.$(SRCSUFF)
-
-$(OBJDIR)/test_resources.o:  test.rc
-	$(RESCOMP) -i test.rc -o $(OBJDIR)/test_resources.o $(RESFLAGS)
-
-clean:
-	rm -f *.$(OBJSUFF) $(TREELIB) objects/test.o *.exe *.res *.map *.rsc