From 29ff35bc63b05ff493c32c9561715f2c6d06d701 Mon Sep 17 00:00:00 2001 From: Guillermo Rodriguez Garcia Date: Tue, 15 Feb 2000 15:17:31 +0000 Subject: [PATCH] ... git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6038 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- samples/sockets/makefile.b32 | 3 ++- src/xpm/makefile.vc | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/samples/sockets/makefile.b32 b/samples/sockets/makefile.b32 index 94a0ed2b5b..47c572e8a2 100644 --- 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 007a2fee6f..7d0949b076 100644 --- 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$@ << -- 2.47.2