X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f4ada568223b79c8a5769cc351c36a8e2ccd7841..3db7be803691c60b11a583d5be24b9a8a55aa2b3:/samples/wxsocket/makefile.b32

diff --git a/samples/wxsocket/makefile.b32 b/samples/wxsocket/makefile.b32
index ef99515d6a..94a0ed2b5b 100644
--- a/samples/wxsocket/makefile.b32
+++ b/samples/wxsocket/makefile.b32
@@ -1,82 +1,78 @@
 #
 # File:		makefile.b32
-# Author:	Patrick Halke, modified by Guilhem Lavaux
-# Created:	1997
+# Author:	Guilhem Lavaux
+# Created:	1998
 # Updated:	
-# Copyright:	(c) 1993, AIAI, University of Edinburgh
+# Copyright:	(c) Guilhem Lavaux
 #
 # "%W% %G%"
 #
-# Makefile : Builds 32bit wxstring library for Windows 3.1
-# and Borland C++ 4.x
+# Makefile : Builds 32-bit wxSocket sample under BC++
 
 WXDIR = $(WXWIN)
 
+ZLIB = $(WXDIR)\lib\zlib.lib
+
 !include $(WXDIR)\src\makeb32.env
 
 WXLIBDIR = $(WXDIR)\lib
-WXLIB = $(WXDIR)\lib\wx32.lib
-SOCKETLIB = $(WXDIR)\lib\wxsocket.lib $(WXDIR)\lib\zlib.lib
 WXINC = $(WXDIR)\include\msw
-WXBASESRC = $(WXDIR)\src\base
-WXBASEINC = $(WXDIR)\include\base
-LIBS=$(WXLIB) $(SOCKETLIB) cw32 import32
-
-!ifndef DEBUG
-DEBUG=0
-!endif
+WXLIB = $(WXLIBDIR)\wx32.lib
+LIBS=$(WXLIB) $(ZLIB) cw32 import32 ole2w32
 
 !if "$(FINAL)" == "0"
 LINKFLAGS=/v /Tpe /L$(WXLIBDIR);$(BCCDIR)\lib
 OPT = -Od
-DEBUG_FLAGS= -v -DDEBUG=$(DEBUG)
+DEBUG_FLAGS= -v
 !else
 LINKFLAGS=/Tpe /L$(WXLIBDIR);$(BCCDIR)\lib
-OPT = -O2
-DEBUG_FLAGS = -DDEBUG=$(DEBUG)
+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
 
-.c.obj:
-	bcc32 $(CPPFLAGS) -P- -c {$< }
-
 all:    $(CLIENT_TARGET).exe $(SERVER_TARGET).exe
 
-$(CLIENT_TARGET).exe:   $(CLIENT_OBJECTS) $(CLIENT_TARGET).def $(CLIENT_TARGET).res
+$(CLIENT_TARGET).exe:   $(CLIENT_OBJECTS) $(CLIENT_TARGET).res
   tlink32 $(LINKFLAGS) @&&!
   c0w32.obj $(CLIENT_OBJECTS)
   $(CLIENT_TARGET)
   nul
   $(LIBS)
   $(CLIENT_TARGET).def
+  $(CLIENT_TARGET).res
 !
-          brc32 -K $(CLIENT_TARGET).res
 
 client.obj:     client.cpp
 
-$(CLIENT_TARGET).res :      $(CLIENT_TARGET).rc $(WXDIR)\include\msw\wx.rc
-    brc32 -r /i$(BCCDIR)\include /i$(WXDIR)\include\msw /i$(WXDIR)\contrib\fafa $(CLIENT_TARGET)
+$(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).def $(SERVER_TARGET).res
+$(SERVER_TARGET).exe:   $(SERVER_OBJECTS) $(SERVER_TARGET).res
   tlink32 $(LINKFLAGS) @&&!
   c0w32.obj $(SERVER_OBJECTS)
   $(SERVER_TARGET)
   nul
   $(LIBS)
   $(SERVER_TARGET).def
+  $(SERVER_TARGET).res
 !
-        brc32 -K $(SERVER_TARGET).res
 
 server.obj:     server.cpp
 
-$(SERVER_TARGET).res:   $(SERVER_TARGET).rc $(WXDIR)\include\msw\wx.rc
-    brc32 -r /i$(BCCDIR)\include /i$(WXDIR)\include\msw /i$(WXDIR)\contrib\fafa $(SERVER_TARGET)
+$(SERVER_TARGET).res:   $(SERVER_TARGET).rc $(WXDIR)\include\wx\msw\wx.rc
+    brc32 -r /i$(BCCDIR)\include /i$(WXDIR)\include $(SERVER_TARGET)
 
 clean:
         -erase *.obj