...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6038 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/samples/sockets/makefile.b32 b/samples/sockets/makefile.b32
index 94a0ed2b5b7a1a05d1eb19c906f5afacccc3d569..47c572e8a2b2a16d108be65a17dade5caf8f2085 100644 (file)
--- a/samples/sockets/makefile.b32
+++ b/samples/sockets/makefile.b32
@@ -12,13 +12,14 @@
 WXDIR = $(WXWIN)
 
 ZLIB = $(WXDIR)\lib\zlib.lib
+XPMLIB = $(WXDIR)\lib\xpm.lib
 
 !include $(WXDIR)\src\makeb32.env
 
 WXLIBDIR = $(WXDIR)\lib
 WXINC = $(WXDIR)\include\msw
 WXLIB = $(WXLIBDIR)\wx32.lib
-LIBS=$(WXLIB) $(ZLIB) cw32 import32 ole2w32
+LIBS=$(WXLIB) $(ZLIB) $(XPMLIB) cw32 import32 ole2w32
 
 !if "$(FINAL)" == "0"
 LINKFLAGS=/v /Tpe /L$(WXLIBDIR);$(BCCDIR)\lib

diff --git a/src/xpm/makefile.vc b/src/xpm/makefile.vc
index 007a2fee6f7e6ae4f35265632b57bc9e51209b69..7d0949b0764b0c215e42b30a44e5bb2f8303ae5e 100644 (file)
--- a/src/xpm/makefile.vc
+++ b/src/xpm/makefile.vc
@@ -47,7 +47,7 @@ $(LIBTARGET):      $(OBJECTS)
 $(OBJECTS) $(PERIPH_LIBS)
 <<
 
-$(XPMDIR)\crbuffri.obj: $(XPMDIR)\attrib.c
+$(XPMDIR)\attrib.obj: $(XPMDIR)\attrib.c
                cl @<<
 $(CPPFLAGS2) /c $*.c /Fo$@
 <<
@@ -82,12 +82,12 @@ $(XPMDIR)\data.obj: $(XPMDIR)\data.c
 $(CPPFLAGS2) /c $*.c /Fo$@
 <<
 
-$(XPMDIR)\data.obj: $(XPMDIR)\image.c
+$(XPMDIR)\image.obj: $(XPMDIR)\image.c
                cl @<<
 $(CPPFLAGS2) /c $*.c /Fo$@
 <<
 
-$(XPMDIR)\data.obj: $(XPMDIR)\info.c
+$(XPMDIR)\info.obj: $(XPMDIR)\info.c
                cl @<<
 $(CPPFLAGS2) /c $*.c /Fo$@
 <<