Simplified BC++ makefiles; C++Builder 1.0 compilation seems to work;

changed #ifdef -> #if for wxUSE_STD_IOSTREAM; #ifdefed thread usage in app.cpp.


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

utils/dialoged/src/makefile.b32

@@ -12,42 +12,9 @@
 # WXWIN and BCCDIR are set by parent make
 
 WXDIR = $(WXWIN)
-!include $(WXDIR)\src\makeb32.env
-
-WXLIBDIR = $(WXDIR)\lib
-WXINC = $(WXDIR)\include\msw
-WXLIB = $(WXLIBDIR)\wx32.lib
-LIBS=$(WXLIB) cw32 import32 ole2w32
 
 TARGET=dialoged
-
-!if "$(FINAL)" == "0"
-LINKFLAGS=/v /Tpe /L$(WXLIBDIR);$(BCCDIR)\lib
-OPT = -Od
-DEBUG_FLAGS= -v
-!else
-LINKFLAGS=/Tpe /L$(WXLIBDIR);$(BCCDIR)\lib
-OPT = -Od
-DEBUG_FLAGS =
-!endif
-CPPFLAGS=$(DEBUG_FLAGS) $(OPT) @$(CFG) @$(INCFILE)
-
 OBJECTS = dialoged.obj reseditr.obj dlghndlr.obj reswrite.obj winprop.obj edtree.obj edlist.obj symbtable.obj winstyle.obj
 
-$(TARGET).exe:	$(OBJECTS) $(TARGET).def $(TARGET).res
-  tlink32 $(LINKFLAGS) @&&!
-c0w32.obj $(OBJECTS)
-$(TARGET)
-nul
-$(LIBS)
-$(TARGET).def
-$(TARGET).res
-!
-
-$(TARGET).res :      $(TARGET).rc $(WXDIR)\include\msw\wx.rc
-    brc32 -r /i$(BCCDIR)\include /i$(WXDIR)\include\msw /i$(WXDIR)\contrib\fafa $(TARGET)
-
-clean:
-        -erase *.obj *.exe *.res *.map *.rws
-
+!include $(WXDIR)\src\makeb32.env
 

utils/tex2rtf/src/makefile.b32

@@ -12,51 +12,9 @@
 # WXWIN and BCCDIR are set by parent make
 
 WXDIR = $(WXWIN)
-!include $(WXDIR)\src\makeb32.env
-
-WXLIBDIR = $(WXDIR)\lib
-WXINC = $(WXDIR)\include\msw
-WXLIB = $(WXLIBDIR)\wx32.lib
-LIBS=$(WXLIB) cw32 import32 ole2w32
 
 TARGET=tex2rtf
-
-!if "$(FINAL)" == "0"
-LINKFLAGS=/v /Tpe /L$(WXLIBDIR);$(BCCDIR)\lib
-OPT = -Od
-DEBUG_FLAGS= -v
-!else
-LINKFLAGS=/Tpe /L$(WXLIBDIR);$(BCCDIR)\lib
-OPT = -Od
-DEBUG_FLAGS =
-!endif
-CPPFLAGS=$(DEBUG_FLAGS) $(OPT) @$(CFG)
-
 OBJECTS = tex2rtf.obj tex2any.obj texutils.obj rtfutils.obj xlputils.obj htmlutil.obj readshg.obj table.obj
 
-$(TARGET).exe:	$(OBJECTS) $(TARGET).res
-  tlink32 $(LINKFLAGS) @&&!
-c0w32.obj $(OBJECTS)
-$(TARGET)
-nul
-$(LIBS)
-$(TARGET).def
-$(TARGET).res
-!
-
-.$(SRCSUFF).obj:
-	bcc32 $(CPPFLAGS) -c {$< }
-
-.c.obj:
-	bcc32 $(CPPFLAGS) -P- -c {$< }
-
-$(TARGET).res :      $(TARGET).rc $(WXDIR)\include\wx\msw\wx.rc
-    brc32 -r /i$(BCCDIR)\include /i$(WXDIR)\include $(TARGET)
-
-clean:
-        -erase *.obj
-        -erase *.exe
-        -erase *.res
-        -erase *.map
-        -erase *.rws
+!include $(WXDIR)\src\makeprog.b32
 

utils/wxtree/src/makefile.b32

@@ -10,62 +10,9 @@
 # Makefile : Builds 32bit wxtree library for 32-bit BC++
 
 WXDIR = $(WXWIN)
-!include $(WXDIR)\src\makeb32.env
 
-WXINC = $(WXDIR)\include
 TARGET=test
-TESTOBJECTS=test.obj
-LIBTARGET= $(WXLIBDIR)\wxprop.lib
-LIBS=$(WXLIBDIR)\wx32.lib $(LIBTARGET) cw32 import32 ole2w32
+OBJECTS=$(TARGET)
 
-!ifndef DEBUG
-DEBUG=0
-!endif
+!include $(WXDIR)\src\makeprog.b32
 
-!if "$(FINAL)" == "0"
-LINKFLAGS=/v /Tpe /L$(WXLIBDIR);$(BCCDIR)\lib
-OPT = -Od
-DEBUG_FLAGS= -v -DDEBUG=$(DEBUG)
-!else
-LINKFLAGS=/Tpe /L$(WXLIBDIR);$(BCCDIR)\lib
-OPT = -O2
-DEBUG_FLAGS = -DDEBUG=$(DEBUG)
-!endif
-
-CPPFLAGS=$(DEBUG_FLAGS) $(OPT) @$(CFG)
-
-.$(SRCSUFF).obj:
-	bcc32 $(CPPFLAGS) -c {$< }
-
-.c.obj:
-	bcc32 $(CPPFLAGS) -P- -c {$< }
-
-OBJECTS = wxtree.obj
-
-all:    $(LIBTARGET)
-
-$(LIBTARGET):	$(OBJECTS)
-	erase $(LIBTARGET)
-	tlib $(LIBTARGET) /P32 @&&!
-+$(OBJECTS:.obj =.obj +)
-!
-
-wxtree.obj:	wxtree.$(SRCSUFF) wxtree.h
-
-$(TARGET).exe:	$(TESTOBJECTS) $(LIBTARGET) $(TARGET).def $(TARGET).res
-  tlink32 $(LINKFLAGS) @&&!
-c0w32.obj $(TESTOBJECTS)
-$(TARGET)
-nul
-$(LIBS) $(LIBTARGET)
-$(TARGET).def
-$(TARGET).res
-!
-
-test.obj:	test.$(SRCSUFF) test.h
-
-$(TARGET).res :      $(TARGET).rc $(WXDIR)\include\wx\msw\wx.rc
-    brc32 -r /i$(BCCDIR)\include /i$(WXDIR)\include $(TARGET)
-
-clean:
-        -erase *.obj $(LIBTARGET) *.exe *.res *.map *.rws