small mods

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6420 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-03-03 19:22:35 +00:00
parent 70dc22dcc9
commit e51b013093
6 changed files with 66 additions and 123 deletions
--- a/samples/sockets/makefile.b32
+++ b/samples/sockets/makefile.b32
@@ -1,83 +1,17 @@
 #
-# File:		makefile.b32
-# Author:	Guilhem Lavaux
-# Created:	1998
+# File:		makefile.vc
+# Author:	Julian Smart
+# Created:	1999
 # Updated:	
-# Copyright:	(c) Guilhem Lavaux
+# Copyright:	(c) Julian Smart
 #
-# "%W% %G%"
-#
-# Makefile : Builds 32-bit wxSocket sample under BC++
+# Makefile : Builds sample for 32-bit BC++

-WXDIR = $(WXWIN)
-
-ZLIB = $(WXDIR)\lib\zlib.lib
-XPMLIB = $(WXDIR)\lib\xpm.lib
-
-!include $(WXDIR)\src\makeb32.env
-
-WXLIBDIR = $(WXDIR)\lib
-WXINC = $(WXDIR)\include\msw
-WXLIB = $(WXLIBDIR)\wx32.lib
-LIBS=$(WXLIB) $(ZLIB) $(XPMLIB) cw32 import32 ole2w32
-
-!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)
-
-.$(SRCSUFF).obj:
-	bcc32 $(CPPFLAGS) -c {$< }
-
-.c.obj:
-	bcc32 $(CPPFLAGS) -P- -c {$< }
-
-CLIENT_TARGET=client
-SERVER_TARGET=server
-CLIENT_OBJECTS=client.obj
-SERVER_OBJECTS=server.obj
-
-all:    $(CLIENT_TARGET).exe $(SERVER_TARGET).exe
-
-$(CLIENT_TARGET).exe:   $(CLIENT_OBJECTS) $(CLIENT_TARGET).res
-  tlink32 $(LINKFLAGS) @&&!
-  c0w32.obj $(CLIENT_OBJECTS)
-  $(CLIENT_TARGET)
-  nul
-  $(LIBS)
-  $(CLIENT_TARGET).def
-  $(CLIENT_TARGET).res
-!
-
-client.obj:     client.cpp
-
-$(CLIENT_TARGET).res :      $(CLIENT_TARGET).rc $(WXDIR)\include\wx\msw\wx.rc
-    brc32 -r /i$(BCCDIR)\include /i$(WXDIR)\include $(CLIENT_TARGET)
-
-$(SERVER_TARGET).exe:   $(SERVER_OBJECTS) $(SERVER_TARGET).res
-  tlink32 $(LINKFLAGS) @&&!
-  c0w32.obj $(SERVER_OBJECTS)
-  $(SERVER_TARGET)
-  nul
-  $(LIBS)
-  $(SERVER_TARGET).def
-  $(SERVER_TARGET).res
-!
-
-server.obj:     server.cpp
-
-$(SERVER_TARGET).res:   $(SERVER_TARGET).rc $(WXDIR)\include\wx\msw\wx.rc
-    brc32 -r /i$(BCCDIR)\include /i$(WXDIR)\include $(SERVER_TARGET)
+all:
+    make -f server.b32 all
+    make -f client.b32 all

 clean:
-        -erase *.obj
-        -erase *.exe
-        -erase *.res
-        -erase *.map
-        -erase *.rws
+    make -f server.b32 clean
+    make -f client.b32 clean
+