X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c801d85f158c4cba50b588807daabdcbd0ed3853..2f2aa6287bd281037a8c329c65219324f81c613c:/src/gtk1/setup/maketmpl.in?ds=sidebyside diff --git a/src/gtk1/setup/maketmpl.in b/src/gtk1/setup/maketmpl.in index 961c31d281..2bdb97d831 100644 --- a/src/gtk1/setup/maketmpl.in +++ b/src/gtk1/setup/maketmpl.in @@ -27,7 +27,7 @@ TOOLKIT_DEF = -D@TOOLKIT_DEF@ # general compiler stuff OPTIMISE = @OPTIMISE@ PROFILE = @PROFILE@ -DEBUG = @DEBUG@ +DEBUG = @WXDEBUG@ @WXDEBUG_DEFINE@ # c-compiler stuff CC = @CC@ @@ -95,29 +95,32 @@ $(TOOLKIT_DEF) \ -I. \ -I.. \ -I$(WXBASEDIR)/include \ --I$(WXBASEDIR)/src/png \ -I$(WXBASEDIR)/src/zlib \ --I$(WXBASEDIR)/src/gdk_imlib \ $(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) -GUI_TK_LIBS = $(GUI_TK_LIBRARY) $(GUI_TK_LINK) +GUI_TK_LIBS = $(GUI_TK_LIBRARY) $(GUI_TK_LINK) -ldl LINK = $(CXX) -o $@ LINK_LIBS= \ $(WX_LIBS) \ $(GUI_TK_LIBS) \ $(X_EXTRA_LIBS) \ - $(X_PRE_LIBS) + $(X_PRE_LIBS) \ + $(THREADS_LINK) # $(X_LIBS) -lX11 -lXext -lm gtk-config does this for me -# Don't include $(OPENGL_LIBS) or $(THREADS_LINK) in LINK_LIBS; they +# Don't include $(OPENGL_LIBS) in LINK_LIBS; they # can be conveniently added to BIN_LINK in Makefile.in. #### End of system configuration section. ####