Fixed duplicate symbol link error

[wxWidgets.git] / src / makelib.vc

diff --git a/src/makelib.vc b/src/makelib.vc
index f4ce264a9da71e0bb46564805b346f5b2e84e96a..2c4b8b9b5ade67acd36085aa5090b0ce1480386d 100644 (file)
--- a/src/makelib.vc
+++ b/src/makelib.vc
@@ -2,19 +2,26 @@
 # File:                makelib.vc
 # Author:      Julian Smart
 # Created:     1999
-# Updated:     
+# Updated:
 # Copyright:   (c) Julian Smart
 #
 # Makefile : Builds a library for a utility
 # Use FINAL=1 argument to nmake to build final version with no debugging
 # info
 
-# Set WXDIR for your system
-WXDIR = j:\dev\wx2\wxWindows
+# Set WXDIR for your system (hint, set an environment variable named WXWIN)
+WXDIR = $(WXWIN)
 
 !include $(WXDIR)\src\makevc.env
 
-all:    $(LIBTARGET)
+!if "$(RM)" == ""
+RM= erase
+!endif
+
+all:    $(D) $(EXTRATARGETS) $(LIBTARGET)
+
+$(D) :
+       mkdir $(D)
 
 wx:
         cd $(WXDIR)\src\msw
@@ -25,7 +32,7 @@ wxclean:
         nmake -f makefile.vc clean
 
 $(LIBTARGET): $(OBJECTS)
-       -erase $(LIBTARGET)
+       -$(RM) $(LIBTARGET)
        $(implib) @<<
 -out:$(LIBTARGET)
 -machine:$(CPU)
@@ -33,10 +40,10 @@ $(OBJECTS)
 <<
 
 clean:
-        -erase $(LIBTARGET)
-        -erase $(OBJECTS)
-        -erase *.exe
-        -erase *.res
-        -erase *.map
-        -erase *.sbr
-        -erase *.pdb
+        -$(RM) $(LIBTARGET)
+        -$(RM) $(OBJECTS)
+        -$(RM) *.exe
+        -$(RM) *.res
+        -$(RM) *.map
+        -$(RM) *.sbr
+        -$(RM) *.pdb