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

Added libxpm

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5292 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Guillermo Rodriguez Garcia
2000-01-07 16:23:39 +00:00
parent 5a2155efdb
commit 172fde4fbe
2 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
distrib/msw/tmake/g95.t
View File

@@ -103,6 +103,7 @@ ZLIBDIR = $(WXDIR)/src/zlib
OLEDIR = $(WXDIR)/src/msw/ole OLEDIR = $(WXDIR)/src/msw/ole
MSWDIR = $(WXDIR)/src/msw MSWDIR = $(WXDIR)/src/msw
XPMLIB = $(WXDIR)/lib/libxpm.a
PNGLIB = $(WXDIR)/lib/libpng.a PNGLIB = $(WXDIR)/lib/libpng.a
ZLIBLIB = $(WXDIR)/lib/libzlib.a ZLIBLIB = $(WXDIR)/lib/libzlib.a
JPEGLIB = $(WXDIR)/lib/libjpeg.a JPEGLIB = $(WXDIR)/lib/libjpeg.a
@@ -219,7 +220,7 @@ JPEGOBJS = \
$(JPEGDIR)/jquant2.$(OBJSUFF) \ $(JPEGDIR)/jquant2.$(OBJSUFF) \
$(JPEGDIR)/jdmerge.$(OBJSUFF) $(JPEGDIR)/jdmerge.$(OBJSUFF)
XPMOBJECTS = $(XPMDIR)/crbuffri.o\ XPMOBJS = $(XPMDIR)/crbuffri.o\
$(XPMDIR)/crdatfri.o\ $(XPMDIR)/crdatfri.o\
$(XPMDIR)/create.o $(XPMDIR)/crifrbuf.o\ $(XPMDIR)/create.o $(XPMDIR)/crifrbuf.o\
$(XPMDIR)/crifrdat.o\ $(XPMDIR)/crifrdat.o\
@@ -233,15 +234,15 @@ XPMOBJECTS = $(XPMDIR)/crbuffri.o\
ifeq ($(MINGW32),1) ifeq ($(MINGW32),1)
ifeq ($(MINGW32VERSION),2.95) ifeq ($(MINGW32VERSION),2.95)
OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) $(DIRDLGOBJ) $(ADVANCEDOBJS) # $(XPMOBJECTS) OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) $(DIRDLGOBJ) $(ADVANCEDOBJS)
else else
OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) $(DIRDLGOBJ) # $(XPMOBJECTS) OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) $(DIRDLGOBJ)
endif endif
else else
OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) $(DIRDLGOBJ) # $(XPMOBJECTS) OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) $(DIRDLGOBJ)
endif endif
all: $(OBJECTS) $(WXLIB) $(ZLIBLIB) $(JPEGLIB) $(PNGLIB) all: $(OBJECTS) $(WXLIB) $(ZLIBLIB) $(JPEGLIB) $(PNGLIB) $(XPMLIB)
$(WXLIB): $(OBJECTS) $(EXTRAOBJS) $(WXLIB): $(OBJECTS) $(EXTRAOBJS)
ar $(AROPTIONS) $@ $(EXTRAOBJS) $(OBJECTS) ar $(AROPTIONS) $@ $(EXTRAOBJS) $(OBJECTS)
@@ -259,6 +260,10 @@ $(JPEGLIB): $(JPEGOBJS)
ar $(AROPTIONS) $@ $(JPEGOBJS) ar $(AROPTIONS) $@ $(JPEGOBJS)
$(RANLIB) $@ $(RANLIB) $@
$(XPMLIB): $(XPMOBJS)
ar $(AROPTIONS) $@ $(XPMOBJS)
$(RANLIB) $@
$(OBJECTS): $(WXINC)/wx/defs.h $(WXINC)/wx/object.h $(WXINC)/wx/setup.h $(OBJECTS): $(WXINC)/wx/defs.h $(WXINC)/wx/object.h $(WXINC)/wx/setup.h
$(COMMDIR)/y_tab.$(OBJSUFF): $(COMMDIR)/y_tab.c $(COMMDIR)/lex_yy.c $(COMMDIR)/y_tab.$(OBJSUFF): $(COMMDIR)/y_tab.c $(COMMDIR)/lex_yy.c
@@ -317,6 +322,9 @@ clean:
-$(RM) ../zlib/*.o -$(RM) ../zlib/*.o
-$(RM) ../zlib/*.bak -$(RM) ../zlib/*.bak
-$(RM) ../jpeg/*.o -$(RM) ../jpeg/*.o
-$(RM) ../jpeg/*.bak
-$(RM) ../xpm/*.o
-$(RM) ../xpm/*.bak
-$(RM) ../../lib/libwx.a -$(RM) ../../lib/libwx.a
cleanall: clean cleanall: clean

11
src/makeg95.env
View File

@@ -16,7 +16,7 @@ MINGW32VERSION=2.95
RM=rm -f RM=rm -f
# Set to the appropriate copy command # Set to the appropriate copy command
COPY=cp COPY=copy
########################## Compiler ################################## ########################## Compiler ##################################
@@ -60,7 +60,8 @@ RESFLAGS=$(RCINCSWITCH) $(WXDIR)/include $(RCDEFSWITCH) __WIN32__ $(RCDEFSWITCH)
########################## Compiler flags ############################# ########################## Compiler flags #############################
# Miscellaneous compiler options # Miscellaneous compiler options
OPTIONS= -DSTRICT # -D__MINGW32__ # GRG: the __MINGW32__ option is not needed anymore
OPTIONS = -DSTRICT # -D__MINGW32__
# Debugging information # Debugging information
DEBUGFLAGS = -D__WXDEBUG__ DEBUGFLAGS = -D__WXDEBUG__
@@ -141,15 +142,15 @@ ifeq ($(MINGW32),1)
endif endif
ifeq ($(MINGW32),1) ifeq ($(MINGW32),1)
INC = -I$(WXINC) -I$(WXDIR)/src/png -I$(WXDIR)/src/jpeg -I$(WXDIR)/src/zlib $(EXTRAINC) $(COMPPATHS) INC = -I$(WXINC) -I$(WXDIR)/src/png -I$(WXDIR)/src/jpeg -I$(WXDIR)/src/zlib -I$(WXDIR)/src/xpm $(EXTRAINC) $(COMPPATHS)
else else
INC = -I$(WXINC) -I$(WXDIR)/src/png -I$(WXDIR)/src/jpeg -I$(WXDIR)/src/zlib $(EXTRAINC) $(COMPPATHS) -I$(WXDIR)/include/wx/msw/gnuwin32 INC = -I$(WXINC) -I$(WXDIR)/src/png -I$(WXDIR)/src/jpeg -I$(WXDIR)/src/zlib -I$(WXDIR)/src/xpm $(EXTRAINC) $(COMPPATHS) -I$(WXDIR)/include/wx/msw/gnuwin32
endif endif
RCLFLAGS=-cpp "cpp -lang-c++ -DWIN32 -D_WIN32 -DRCL_INVOKED -I$(WXWIN)/include" RCLFLAGS=-cpp "cpp -lang-c++ -DWIN32 -D_WIN32 -DRCL_INVOKED -I$(WXWIN)/include"
#LIBS = $(WXLIB) $(WXDIR)/lib/libzlib.a $(WXDIR)/lib/libpng.a $(WXDIR)/lib/libjpeg.a $(WINLIBS) $(COMPLIBS) $(EXTRALIBS) #LIBS = $(WXLIB) $(WXDIR)/lib/libzlib.a $(WXDIR)/lib/libpng.a $(WXDIR)/lib/libjpeg.a $(WINLIBS) $(COMPLIBS) $(EXTRALIBS)
LIBS = $(WXLIB) -lpng -ljpeg -lzlib $(WINLIBS) $(COMPLIBS) $(EXTRALIBS) LIBS = $(WXLIB) -lpng -ljpeg -lzlib -lxpm $(WINLIBS) $(COMPLIBS) $(EXTRALIBS)
WINFLAGS=-D_X86_=1 -DWIN32 -D_WIN32 $(WINVERSION) WINFLAGS=-D_X86_=1 -DWIN32 -D_WIN32 $(WINVERSION)