X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7da8bfe30de8f632127e96735b6bfd55a489a21c..cd15bcaf50ead53ccf9d50965312f0dc754affb4:/build/bakefiles/wx.bkl diff --git a/build/bakefiles/wx.bkl b/build/bakefiles/wx.bkl index 529096d4f7..11a5aa23fe 100644 --- a/build/bakefiles/wx.bkl +++ b/build/bakefiles/wx.bkl @@ -24,7 +24,7 @@ - + $(MSVC6PRJ_MERGED_TARGETS_MULTILIB) $(MSVC6PRJ_MERGED_TARGETS_MONOLIB) @@ -40,7 +40,7 @@ no samples - ../../samples + ../../samples @@ -87,7 +87,7 @@ $(SRCDIR)/build/bakefiles/wxpresets/presets - wx.bkl wx_unix.bkl wx_win32.bkl wx_xrc.bkl + wx.bkl wx_unix.bkl wx_win32.bkl wx_xrc.bkl wx_presets.py $(DATADIR)/bakefile/presets @@ -97,10 +97,16 @@ $(INSTALL_DIR) $(DESTDIR)$(BINDIR) $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)/wx/config $(INSTALL_PROGRAM) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(LIBDIR)/wx/config - (cd $(DESTDIR)$(BINDIR) && rm -f wx-config && $(LN_S) $(LIBDIR)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config) + (cd $(DESTDIR)$(BINDIR) && rm -f wx-config && $(LN_S) ../`basename $(LIBDIR)`/wx/config/$(TOOLCHAIN_FULLNAME) wx-config) + + + $(DYLIB_RPATH_INSTALL) + + + msw/rcdefs.h @@ -118,10 +124,8 @@ - - - is it time to use per-target <headers> now? - + $(SRCDIR)/include $(ALL_HEADERS) @@ -173,8 +177,8 @@ - - + + $(LIBDIRNAME) @@ -190,8 +194,8 @@ univ - $(TOOLKIT_LOWERCASE) - os2 + $(TOOLKIT_LOWERCASE) + os2 @@ -204,12 +208,11 @@ $(SRCDIR)/include/wx/$(SETUP_H_SUBDIR)/setup.h $(SETUPHDIR)/wx/setup.h - - + libdir_setup_wx @@ -251,7 +254,7 @@ @echo " wxWidgets comes with no guarantees and doesn't claim" @echo " to be suitable for any purpose." @echo " " -@echo " Read the wxWidgets Licence on licencing conditions." +@echo " Read the wxWindows Licence on licencing conditions." @echo " " @echo " ------------------------------------------------------" @echo " "