X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2e0bceb668d2f3908d96ab9074b6ae293fde1bbb..57bff99cf406cace309b47d406b7307bc7ef1f3a:/setup/maketmpl.in?ds=sidebyside diff --git a/setup/maketmpl.in b/setup/maketmpl.in index 69556cc603..a97349e8a5 100644 --- a/setup/maketmpl.in +++ b/setup/maketmpl.in @@ -55,7 +55,8 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ AWK = @AWK@ LN_S = @LN_S@ -CJPEG_PROG = +STRIP = @STRIP@ +CJPEG_PROG = CONVERT_PATH = /usr/bin/X11 CONVERT_PROG = /usr/bin/X11/convert DJPEG_PROG = @@ -89,14 +90,17 @@ WX_LINK = @WX_LINK@ THREADS_LINK = @THREADS_LINK@ EXTRA_LINK = @EXTRA_LINK@ JPEG_LINK = @JPEG_LINK@ +POSIX4_LINK=@POSIX4_LINK@ # INCLUDES WX_INCLUDES = \ +-I$(WXBASEDIR)/src/zlib \ +-I$(WXBASEDIR)/src/png \ +-I$(WXBASEDIR)/src/jpeg \ $(TOOLKIT_DEF) \ -I$(WXBASEDIR)/include \ -I. \ $(GUI_TK_INCLUDE) \ --I$(WXBASEDIR)/src/zlib \ -I$(WXBASEDIR)/src/iodbc \ $(X_CFLAGS) @@ -111,6 +115,7 @@ LINK_LIBS= \ $(X_EXTRA_LIBS) \ $(X_PRE_LIBS) \ $(THREADS_LINK) \ + $(POSIX4_LINK) \ $(EXTRA_LINK) \ $(JPEG_LINK)