X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/84b46c356ebc657a292ebe616eb51c821772da8f..11765138636bade99a104fa6a72ef5ced752b22d:/setup/maketmpl.in

diff --git a/setup/maketmpl.in b/setup/maketmpl.in
index 2f8913b548..de91877e83 100644
--- a/setup/maketmpl.in
+++ b/setup/maketmpl.in
@@ -84,9 +84,7 @@ GUI_TK_INCLUDE = @GUI_TK_INCLUDE@
 GUI_TK_LIBRARY = @GUI_TK_LIBRARY@
 GUI_TK_LINK = @GUI_TK_LINK@
 
-OPENGL_INCLUDE = @OPENGL_INCLUDE@
-OPENGL_LIBRARY = @OPENGL_LIBRARY@
-OPENGL_LINK = @OPENGL_LINK@
+WX_LINK = @WX_LINK@
 
 THREADS_LINK = @THREADS_LINK@
 EXTRA_LINK = @EXTRA_LINK@
@@ -94,22 +92,14 @@ EXTRA_LINK = @EXTRA_LINK@
 # INCLUDES
 WX_INCLUDES = \
 $(TOOLKIT_DEF) \
--I. \
--I.. \
 -I$(WXBASEDIR)/include \
+-I. \
+$(GUI_TK_INCLUDE) \
 -I$(WXBASEDIR)/src/zlib \
 -I$(WXBASEDIR)/src/iodbc \
-$(GUI_TK_INCLUDE) \
-$(OPENGL_INCLUDE) \
 $(X_CFLAGS)
 
-# -I$(WXBASEDIR)/src/png \
-# -I$(WXBASEDIR)/src/zlib \
-# -I$(WXBASEDIR)/src/gdk_imlib \
-
-WX_LIBS = -L$(GLOBAL_LIB_DIR) -lwx_gtk
-
-OPENGL_LIBS = $(OPENGL_LIBRARY) $(OPENGL_LINK)
+WX_LIBS = -L$(GLOBAL_LIB_DIR) $(WX_LINK)
 
 GUI_TK_LIBS = $(GUI_TK_LIBRARY) $(GUI_TK_LINK) @DL_LIBRARY@