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

Removed the PREEXTRALIBS hack - no longer needed

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6668 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Guillermo Rodriguez Garcia
2000-03-14 01:05:54 +00:00
parent 672186efa8
commit 711df835d3
3 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/samples/stc/makefile.g95
View File

@@ -8,7 +8,7 @@ WXDIR = ../../..
TARGET = stctest TARGET = stctest
OBJECTS = $(TARGET).o OBJECTS = $(TARGET).o
EXTRAINC = -I$(WXDIR)/contrib/include EXTRAINC = -I$(WXDIR)/contrib/include
PREEXTRALIBS = -lstc EXTRALIBS = -lstc
include $(WXDIR)/src/makeprog.g95 include $(WXDIR)/src/makeprog.g95

2
samples/stc/makefile.g95
View File

@@ -8,7 +8,7 @@ WXDIR = ../../..
TARGET = stctest TARGET = stctest
OBJECTS = $(TARGET).o OBJECTS = $(TARGET).o
EXTRAINC = -I$(WXDIR)/contrib/include EXTRAINC = -I$(WXDIR)/contrib/include
PREEXTRALIBS = -lstc EXTRALIBS = -lstc
include $(WXDIR)/src/makeprog.g95 include $(WXDIR)/src/makeprog.g95

7
src/makeg95.env
View File

@@ -180,14 +180,11 @@ 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 = $(PREEXTRALIBS) $(WXLIB) $(WINLIBS) $(COMPLIBS) $(EXTRALIBS) LIBS = $(EXTRALIBS) $(WXLIB) $(WINLIBS) $(COMPLIBS)
else else
LIBS = $(PREEXTRALIBS) $(WXLIB) -lpng -ljpeg -lzlib -lxpm -ltiff $(WINLIBS) $(COMPLIBS) $(EXTRALIBS) LIBS = $(EXTRALIBS) $(WXLIB) -lpng -ljpeg -lzlib -lxpm -ltiff $(WINLIBS) $(COMPLIBS)
endif endif
WINFLAGS=-D_X86_=1 -DWIN32 -D_WIN32 $(WINVERSION) WINFLAGS=-D_X86_=1 -DWIN32 -D_WIN32 $(WINVERSION)