From: Guillermo Rodriguez Garcia <guille@iies.es>
Date: Tue, 14 Mar 2000 01:05:54 +0000 (+0000)
Subject: Removed the PREEXTRALIBS hack - no longer needed
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/711df835d34672eef54d922844b69fb0cab0a1fc?hp=672186efa8a6f6a2f6d38acea4efaf3849cbcf93

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 6ce1cd82c8..9c8a7efe29 100644
--- 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 6ce1cd82c8..9c8a7efe29 100644
--- 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 96f2088a80..f10eae21fa 100644
--- 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)