revert removal of gtk1 code from common file

[wxWidgets.git] / src / makelib.b32

diff --git a/src/makelib.b32 b/src/makelib.b32
index cf2732bfd3c91729bad48a2949ec01f1effb1f1f..1ebba24158e82d9f9ef7ab14fc80f0e3a422179b 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.
 
 # 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:
 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 -n$(OBJ_PATH) {$< }

 
 

+.c.obj:
+    bcc32 $(CPPFLAGS) -P- -c -n$(OBJ_PATH) {$< }