Amebis/wxWidgets
0
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

11
src/makeg95.env
View File

@@ -16,7 +16,7 @@ MINGW32VERSION=2.95
RM=rm -f
# Set to the appropriate copy command
COPY=cp
COPY=copy
########################## Compiler ##################################
@@ -60,7 +60,8 @@ RESFLAGS=$(RCINCSWITCH) $(WXDIR)/include $(RCDEFSWITCH) __WIN32__ $(RCDEFSWITCH)
########################## Compiler flags #############################
# Miscellaneous compiler options
OPTIONS= -DSTRICT # -D__MINGW32__
# GRG: the __MINGW32__ option is not needed anymore
OPTIONS = -DSTRICT # -D__MINGW32__
# Debugging information
DEBUGFLAGS = -D__WXDEBUG__
@@ -141,15 +142,15 @@ ifeq ($(MINGW32),1)
endif
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
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
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) -lpng -ljpeg -lzlib $(WINLIBS) $(COMPLIBS) $(EXTRALIBS)
LIBS = $(WXLIB) -lpng -ljpeg -lzlib -lxpm $(WINLIBS) $(COMPLIBS) $(EXTRALIBS)
WINFLAGS=-D_X86_=1 -DWIN32 -D_WIN32 $(WINVERSION)