Removed the PREEXTRALIBS hack - no longer needed

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6668 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/contrib/samples/stc/makefile.g95 b/contrib/samples/stc/makefile.g95
index 6ce1cd82c8b8b74f5d99696e52163d42825b7b3b..9c8a7efe294c55988df7effc3cd74498dcf7605a 100644 (file)
--- a/contrib/samples/stc/makefile.g95
+++ b/contrib/samples/stc/makefile.g95
@@ -8,7 +8,7 @@ WXDIR = ../../..
 TARGET = stctest
 OBJECTS = $(TARGET).o
 EXTRAINC = -I$(WXDIR)/contrib/include
-PREEXTRALIBS = -lstc
+EXTRALIBS = -lstc
 
 include $(WXDIR)/src/makeprog.g95
 

diff --git a/samples/stc/makefile.g95 b/samples/stc/makefile.g95
index 6ce1cd82c8b8b74f5d99696e52163d42825b7b3b..9c8a7efe294c55988df7effc3cd74498dcf7605a 100644 (file)
--- a/samples/stc/makefile.g95
+++ b/samples/stc/makefile.g95
@@ -8,7 +8,7 @@ WXDIR = ../../..
 TARGET = stctest
 OBJECTS = $(TARGET).o
 EXTRAINC = -I$(WXDIR)/contrib/include
-PREEXTRALIBS = -lstc
+EXTRALIBS = -lstc
 
 include $(WXDIR)/src/makeprog.g95
 

diff --git a/src/makeg95.env b/src/makeg95.env
index 96f2088a8019775829e989dee2aa600e5a44f429..f10eae21fac6313a05a2945f056f339f114a1404 100644 (file)
--- a/src/makeg95.env
+++ b/src/makeg95.env
@@ -180,14 +180,11 @@ 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 = $(PREEXTRALIBS) $(WXLIB) $(WINLIBS) $(COMPLIBS) $(EXTRALIBS)
+  LIBS = $(EXTRALIBS) $(WXLIB) $(WINLIBS) $(COMPLIBS)
 else
-  LIBS = $(PREEXTRALIBS) $(WXLIB) -lpng -ljpeg -lzlib -lxpm -ltiff $(WINLIBS) $(COMPLIBS) $(EXTRALIBS)
+  LIBS = $(EXTRALIBS) $(WXLIB) -lpng -ljpeg -lzlib -lxpm -ltiff $(WINLIBS) $(COMPLIBS)
 endif
 
 WINFLAGS=-D_X86_=1 -DWIN32 -D_WIN32 $(WINVERSION)