From e828e4f7f10ae3ce6c4575011564c457b02e57c3 Mon Sep 17 00:00:00 2001 From: Guillermo Rodriguez Garcia Date: Tue, 14 Mar 2000 00:09:00 +0000 Subject: [PATCH] Added PREEXTRALIBS and .cxx rule git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6664 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/makeg95.env | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/makeg95.env b/src/makeg95.env index ee90e2a380..96f2088a80 100644 --- a/src/makeg95.env +++ b/src/makeg95.env @@ -180,11 +180,14 @@ endif 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 # 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 - LIBS = $(WXLIB) -lpng -ljpeg -lzlib -lxpm -ltiff $(WINLIBS) $(COMPLIBS) $(EXTRALIBS) + LIBS = $(PREEXTRALIBS) $(WXLIB) -lpng -ljpeg -lzlib -lxpm -ltiff $(WINLIBS) $(COMPLIBS) $(EXTRALIBS) endif 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 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: $(CC) -c $(CFLAGS) -o $@ $*.c +.cxx.o: + $(CC) -c $(CPPFLAGS) -o $@ $*.cxx + .$(SRCSUFF).$(OBJSUFF): $(CC) -c $(CPPFLAGS) -o $@ $*.$(SRCSUFF) +