X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ac57418f39e9671c18b99942180563146625d3ae..41ca191f4b76957735a885b620d54c5f51524522:/setup/maketmpl.in diff --git a/setup/maketmpl.in b/setup/maketmpl.in index 9526467f1b..507dc7b6be 100644 --- a/setup/maketmpl.in +++ b/setup/maketmpl.in @@ -33,11 +33,11 @@ DEBUG = @WXDEBUG@ @WXDEBUG_DEFINE@ CC = @CC@ CPP = @CPP@ CPPFLAGS=@CPPFLAGS@ -CFLAGS = @CFLAGS@ $(CPPFLAGS) $(OPTIMISE) $(PROFILE) $(DEBUG) -D_REENTRANT +CFLAGS = @CFLAGS@ $(CPPFLAGS) $(OPTIMISE) $(PROFILE) $(DEBUG) # c++-compiler stuff CXX = @CXX@ -CXXFLAGS = @CXXFLAGS@ $(CPPFLAGS) $(OPTIMISE) $(PROFILE) $(DEBUG) -D_REENTRANT +CXXFLAGS = @CXXFLAGS@ $(CPPFLAGS) $(OPTIMISE) $(PROFILE) $(DEBUG) CXXCPP = @CXXCPP@ # shared compile stuff @@ -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 = @@ -88,6 +89,8 @@ WX_LINK = @WX_LINK@ THREADS_LINK = @THREADS_LINK@ EXTRA_LINK = @EXTRA_LINK@ +JPEG_LINK = @JPEG_LINK@ +POSIX4_LINK=@POSIX4_LINK@ # INCLUDES WX_INCLUDES = \ @@ -110,8 +113,10 @@ LINK_LIBS= \ $(X_EXTRA_LIBS) \ $(X_PRE_LIBS) \ $(THREADS_LINK) \ - $(EXTRA_LINK) - + $(POSIX4_LINK) \ + $(EXTRA_LINK) \ + $(JPEG_LINK) + # Don't include $(OPENGL_LIBS) in LINK_LIBS; they # can be conveniently added to BIN_LINK in Makefile.in.