Committing in .

[wxWidgets.git] / src / xpm / makefile.vc

diff --git a/src/xpm/makefile.vc b/src/xpm/makefile.vc
index 007a2fee6f7e6ae4f35265632b57bc9e51209b69..0336b1eb829274eac4310fe7cca042cd641e1ecd 100644 (file)
--- a/src/xpm/makefile.vc
+++ b/src/xpm/makefile.vc
@@ -1,5 +1,5 @@
 #
 #

-# File:                makefile.nt
+# File:                makefile.vc

 # Author:      Julian Smart
 # Created:     1997
 # Updated:
 # Author:      Julian Smart
 # Created:     1997
 # Updated:


@@ -13,7 +13,11 @@
 
 THISDIR=$(WXWIN)\src\xpm
 
 
 THISDIR=$(WXWIN)\src\xpm
 

+!if "$(FINAL)" == "1"

 LIBTARGET=$(WXDIR)\lib\xpm.lib
 LIBTARGET=$(WXDIR)\lib\xpm.lib

+!else
+LIBTARGET=$(WXDIR)\lib\xpmd.lib
+!endif

 
 XPMDIR=$(WXDIR)\src\xpm
 
 
 XPMDIR=$(WXDIR)\src\xpm
 


@@ -47,7 +51,7 @@ $(LIBTARGET):      $(OBJECTS)
 $(OBJECTS) $(PERIPH_LIBS)
 <<
 
 $(OBJECTS) $(PERIPH_LIBS)
 <<
 

-$(XPMDIR)\crbuffri.obj: $(XPMDIR)\attrib.c
+$(XPMDIR)\attrib.obj: $(XPMDIR)\attrib.c

                cl @<<
 $(CPPFLAGS2) /c $*.c /Fo$@
 <<
                cl @<<
 $(CPPFLAGS2) /c $*.c /Fo$@
 <<


@@ -82,12 +86,12 @@ $(XPMDIR)\data.obj: $(XPMDIR)\data.c
 $(CPPFLAGS2) /c $*.c /Fo$@
 <<
 
 $(CPPFLAGS2) /c $*.c /Fo$@
 <<
 

-$(XPMDIR)\data.obj: $(XPMDIR)\image.c
+$(XPMDIR)\image.obj: $(XPMDIR)\image.c

                cl @<<
 $(CPPFLAGS2) /c $*.c /Fo$@
 <<
 
                cl @<<
 $(CPPFLAGS2) /c $*.c /Fo$@
 <<
 

-$(XPMDIR)\data.obj: $(XPMDIR)\info.c
+$(XPMDIR)\info.obj: $(XPMDIR)\info.c

                cl @<<
 $(CPPFLAGS2) /c $*.c /Fo$@
 <<
                cl @<<
 $(CPPFLAGS2) /c $*.c /Fo$@
 <<