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

Added PREEXTRALIBS and .cxx rule

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6664 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Guillermo Rodriguez Garcia 2000-03-14 00:09:00 +00:00
parent d29e95a922
commit e828e4f7f1
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/makeg95.env
View File

@ -180,11 +180,14 @@ 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"
# GRG, Mar/2000 - introduced PREEXTRALIBS for libs that use libwx
# themselves (needed for the Scintilla editor)
ifdef WXUSINGDLL ifdef WXUSINGDLL
# png, jpeg, etc are exported from wx dll, so skip and save on link time. # png, jpeg, etc are exported from wx dll, so skip and save on link time.
LIBS = $(WXLIB) $(WINLIBS) $(COMPLIBS) $(EXTRALIBS) LIBS = $(PREEXTRALIBS) $(WXLIB) $(WINLIBS) $(COMPLIBS) $(EXTRALIBS)
else else
LIBS = $(WXLIB) -lpng -ljpeg -lzlib -lxpm -ltiff $(WINLIBS) $(COMPLIBS) $(EXTRALIBS) LIBS = $(PREEXTRALIBS) $(WXLIB) -lpng -ljpeg -lzlib -lxpm -ltiff $(WINLIBS) $(COMPLIBS) $(EXTRALIBS)
endif endif
WINFLAGS=-D_X86_=1 -DWIN32 -D_WIN32 $(WINVERSION) WINFLAGS=-D_X86_=1 -DWIN32 -D_WIN32 $(WINVERSION)
@ -215,13 +218,16 @@ CFLAGS = $(XINCLUDE) $(INC) $(OPTIONS) $(GUI) $(DEBUGFLAGS) $(WARN) $(OPT) $(EXT
WINDOWSLDFLAGS=-Wl,--subsystem,windows -mwindows WINDOWSLDFLAGS=-Wl,--subsystem,windows -mwindows
LDFLAGS = $(WINDOWSLDFLAGS) -L$(WXDIR)/lib -L$(WXDIR)/contrib/lib $(EXTRALDFLAGS) LDFLAGS = $(WINDOWSLDFLAGS) -L$(WXDIR)/lib -L$(WXDIR)/contrib/lib $(EXTRALDFLAGS)
.SUFFIXES: .rc .$(RESSUFF) .$(RSCSUFF) .cpp .c .SUFFIXES: .rc .$(RESSUFF) .$(RSCSUFF) .cpp .cxx .c
.c.o: .c.o:
$(CC) -c $(CFLAGS) -o $@ $*.c $(CC) -c $(CFLAGS) -o $@ $*.c
.cxx.o:
$(CC) -c $(CPPFLAGS) -o $@ $*.cxx
.$(SRCSUFF).$(OBJSUFF): .$(SRCSUFF).$(OBJSUFF):
$(CC) -c $(CPPFLAGS) -o $@ $*.$(SRCSUFF) $(CC) -c $(CPPFLAGS) -o $@ $*.$(SRCSUFF)