Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

...

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6038 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Guillermo Rodriguez Garcia
2000-02-15 15:17:31 +00:00
parent 1171c29741
commit 29ff35bc63
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
samples/sockets/makefile.b32
View File

@@ -12,13 +12,14 @@
WXDIR = $(WXWIN) WXDIR = $(WXWIN)
ZLIB = $(WXDIR)\lib\zlib.lib ZLIB = $(WXDIR)\lib\zlib.lib
XPMLIB = $(WXDIR)\lib\xpm.lib
!include $(WXDIR)\src\makeb32.env !include $(WXDIR)\src\makeb32.env
WXLIBDIR = $(WXDIR)\lib WXLIBDIR = $(WXDIR)\lib
WXINC = $(WXDIR)\include\msw WXINC = $(WXDIR)\include\msw
WXLIB = $(WXLIBDIR)\wx32.lib WXLIB = $(WXLIBDIR)\wx32.lib
LIBS=$(WXLIB) $(ZLIB) cw32 import32 ole2w32 LIBS=$(WXLIB) $(ZLIB) $(XPMLIB) cw32 import32 ole2w32
!if "$(FINAL)" == "0" !if "$(FINAL)" == "0"
LINKFLAGS=/v /Tpe /L$(WXLIBDIR);$(BCCDIR)\lib LINKFLAGS=/v /Tpe /L$(WXLIBDIR);$(BCCDIR)\lib

6
src/xpm/makefile.vc
View File

@@ -47,7 +47,7 @@ $(LIBTARGET): $(OBJECTS)
$(OBJECTS) $(PERIPH_LIBS) $(OBJECTS) $(PERIPH_LIBS)
<< <<
$(XPMDIR)\crbuffri.obj: $(XPMDIR)\attrib.c $(XPMDIR)\attrib.obj: $(XPMDIR)\attrib.c
cl @<< cl @<<
$(CPPFLAGS2) /c $*.c /Fo$@ $(CPPFLAGS2) /c $*.c /Fo$@
<< <<
@@ -82,12 +82,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 @<< cl @<<
$(CPPFLAGS2) /c $*.c /Fo$@ $(CPPFLAGS2) /c $*.c /Fo$@
<< <<
$(XPMDIR)\data.obj: $(XPMDIR)\info.c $(XPMDIR)\info.obj: $(XPMDIR)\info.c
cl @<< cl @<<
$(CPPFLAGS2) /c $*.c /Fo$@ $(CPPFLAGS2) /c $*.c /Fo$@
<< <<