Applied patch [ 649157 ] wxDisplay for Unix

[wxWidgets.git] / src / makelib.b32

diff --git a/src/makelib.b32 b/src/makelib.b32
index 446525555e4192c1f5d58e55b41980c5e6fadb0b..2804b89c6eb9ee69f27bf87e52d0e12fec19f7c5 100644 (file)
--- a/src/makelib.b32
+++ b/src/makelib.b32
@@ -8,30 +8,25 @@
 # Include file for libraries. Set LIBTARGET and OBJECTS
 # before including this file.
 
-# WXWIN and BCCDIR are set by parent make
 
-WXDIR = $(WXWIN)
-
-!include $(WXDIR)\src\makeb32.env
-
-$(LIBTARGET): $(OBJECTS)
-        -erase $(LIBTARGET)
-       tlib $(LIBTARGET) /P512 @&&!
--+$(OBJECTS:.obj =.obj -+)
+lib: $(LIBTARGET)
+   
+$(LIBTARGET): $(OBJECTS) 
+   -if exist $(LIBTARGET) $(RM) $(LIBTARGET)
+   echo making $(LIBTARGET)
+   tlib "$(LIBTARGET)" /P512 @&&!
++$(OBJECTS:.obj =.obj +)
 !
 
-.$(SRCSUFF).obj:
-       bcc32 $(CPPFLAGS) -c {$< }
-
-.c.obj:
-       bcc32 $(CPPFLAGS) -P- -c {$< }
-
 clean:
-        -erase *.obj
-        -erase *.exe
-        -erase *.res
-        -erase *.map
-        -erase *.rws
-        -erase $(LIBTARGET)
+##        -if exist $(OBJ_PATH)\*.obj $(RM) $(OBJ_PATH)\*.obj
+        -if exist *.res $(RM) *.res
+        -if exist *.map $(RM) *.map
+        -if exist *.rws $(RM) *.rws
+        -if exist $(LIBTARGET) $(RM) $(LIBTARGET)
 
+.$(SRCSUFF).obj:
+    bcc32 $(CPPFLAGS) -c -o$(OBJ_PATH)\$(<B).obj {$< }
 
+.c.obj:
+    bcc32 $(CPPFLAGS) -P- -c -o$(OBJ_PATH)\$(<B).obj {$< }