From: David Elliott Date: Tue, 28 Dec 2004 18:15:11 +0000 (+0000) Subject: Rebaked (Bakefile 0.1.4). Corresponds to dialogs.bkl,1.7,1.8 X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/9fc97a71c5da9cad5b473d079a1df4e95cdc3138 Rebaked (Bakefile 0.1.4). Corresponds to dialogs.bkl,1.7,1.8 git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31169 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/samples/dialogs/Makefile.in b/samples/dialogs/Makefile.in index 824bbd0ed1..e3bdc511e9 100644 --- a/samples/dialogs/Makefile.in +++ b/samples/dialogs/Makefile.in @@ -46,7 +46,7 @@ DIALOGS_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \ DIALOGS_OBJECTS = \ $(__dialogs_os2_lib_res) \ dialogs_dialogs.o \ - $(__GENERIC_FILES_OBJECTS) \ + $(__GENERIC_DIALOGS_IN_NATIVE_BUILDS_OBJECTS) \ $(__dialogs___win32rc) ### Conditionally set variables: ### @@ -85,13 +85,13 @@ COND_PLATFORM_OS2_1___dialogs___os2_emxbindcmd = $(NM) dialogs$(EXEEXT) | if \ @COND_TOOLKIT_COCOA@ dialogs.app/Contents/PkgInfo @COND_TOOLKIT_MAC@____dialogs_BUNDLE_TGT_REF_DEP = \ @COND_TOOLKIT_MAC@ dialogs.app/Contents/PkgInfo -@COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0@__GENERIC_FILES_OBJECTS \ +@COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0@__GENERIC_DIALOGS_IN_NATIVE_BUILDS_OBJECTS \ @COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0@ = dialogs_colrdlgg.o dialogs_dirdlgg.o \ @COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0@ dialogs_filedlgg.o dialogs_fontdlgg.o -@COND_SHARED_0_TOOLKIT_MAC_WXUNIV_0@__GENERIC_FILES_OBJECTS \ +@COND_SHARED_0_TOOLKIT_MAC_WXUNIV_0@__GENERIC_DIALOGS_IN_NATIVE_BUILDS_OBJECTS \ @COND_SHARED_0_TOOLKIT_MAC_WXUNIV_0@ = dialogs_colrdlgg.o dialogs_dirdlgg.o \ @COND_SHARED_0_TOOLKIT_MAC_WXUNIV_0@ dialogs_filedlgg.o -@COND_SHARED_0_TOOLKIT_PM_WXUNIV_0@__GENERIC_FILES_OBJECTS \ +@COND_SHARED_0_TOOLKIT_PM_WXUNIV_0@__GENERIC_DIALOGS_IN_NATIVE_BUILDS_OBJECTS \ @COND_SHARED_0_TOOLKIT_PM_WXUNIV_0@ = dialogs_fontdlgg.o dialogs_filedlgg.o COND_MONOLITHIC_0___WXLIB_ADV_p = \ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX)