From a8b1894628fc0182ae2676db0eac61ca60fd0303 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Mon, 15 Feb 2016 01:28:45 +0100 Subject: [PATCH] Add wx/osx/core/colour.h back to the list of installed headers This file was accidentally removed by 602ea921431c0fe802dbe6d2f2adcb78fcfe0933. Closes #17374. --- Makefile.in | 16 +++++++++++----- build/bakefiles/files.bkl | 1 + build/files | 1 + 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/Makefile.in b/Makefile.in index 7766c33d1d..fa2b09effe 100644 --- a/Makefile.in +++ b/Makefile.in @@ -2400,6 +2400,7 @@ COND_TOOLKIT_OSX_COCOA_BASE_OSX_HDR = \ wx/osx/core/objcid.h \ wx/osx/core/private.h \ wx/osx/core/stdpaths.h \ + wx/osx/core/colour.h \ wx/unix/app.h \ wx/unix/apptbase.h \ wx/unix/apptrait.h \ @@ -2431,7 +2432,8 @@ COND_TOOLKIT_COCOA_BASE_OSX_HDR = \ wx/osx/core/evtloop.h \ wx/osx/core/objcid.h \ wx/osx/core/private.h \ - wx/osx/core/stdpaths.h + wx/osx/core/stdpaths.h \ + wx/osx/core/colour.h @COND_TOOLKIT_COCOA@BASE_OSX_HDR = $(COND_TOOLKIT_COCOA_BASE_OSX_HDR) COND_TOOLKIT_GTK_BASE_OSX_HDR = \ wx/unix/app.h \ @@ -2452,7 +2454,8 @@ COND_TOOLKIT_GTK_BASE_OSX_HDR = \ wx/osx/core/evtloop.h \ wx/osx/core/objcid.h \ wx/osx/core/private.h \ - wx/osx/core/stdpaths.h + wx/osx/core/stdpaths.h \ + wx/osx/core/colour.h @COND_TOOLKIT_GTK@BASE_OSX_HDR = $(COND_TOOLKIT_GTK_BASE_OSX_HDR) COND_TOOLKIT_X11_BASE_OSX_HDR = \ wx/unix/app.h \ @@ -2473,7 +2476,8 @@ COND_TOOLKIT_X11_BASE_OSX_HDR = \ wx/osx/core/evtloop.h \ wx/osx/core/objcid.h \ wx/osx/core/private.h \ - wx/osx/core/stdpaths.h + wx/osx/core/stdpaths.h \ + wx/osx/core/colour.h @COND_TOOLKIT_X11@BASE_OSX_HDR = $(COND_TOOLKIT_X11_BASE_OSX_HDR) COND_TOOLKIT_MOTIF_BASE_OSX_HDR = \ wx/unix/app.h \ @@ -2494,7 +2498,8 @@ COND_TOOLKIT_MOTIF_BASE_OSX_HDR = \ wx/osx/core/evtloop.h \ wx/osx/core/objcid.h \ wx/osx/core/private.h \ - wx/osx/core/stdpaths.h + wx/osx/core/stdpaths.h \ + wx/osx/core/colour.h @COND_TOOLKIT_MOTIF@BASE_OSX_HDR = $(COND_TOOLKIT_MOTIF_BASE_OSX_HDR) COND_TOOLKIT__BASE_OSX_HDR = \ wx/unix/app.h \ @@ -2515,7 +2520,8 @@ COND_TOOLKIT__BASE_OSX_HDR = \ wx/osx/core/evtloop.h \ wx/osx/core/objcid.h \ wx/osx/core/private.h \ - wx/osx/core/stdpaths.h + wx/osx/core/stdpaths.h \ + wx/osx/core/colour.h @COND_TOOLKIT_@BASE_OSX_HDR = $(COND_TOOLKIT__BASE_OSX_HDR) @COND_PLATFORM_MACOSX_1@BASE_PLATFORM_HDR = $(BASE_OSX_HDR) COND_PLATFORM_UNIX_1_BASE_PLATFORM_HDR = \ diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl index 19056a2f24..2dc17a155d 100644 --- a/build/bakefiles/files.bkl +++ b/build/bakefiles/files.bkl @@ -194,6 +194,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! wx/osx/core/objcid.h wx/osx/core/private.h wx/osx/core/stdpaths.h + wx/osx/core/colour.h diff --git a/build/files b/build/files index 3e14453ccb..bb330ce31b 100644 --- a/build/files +++ b/build/files @@ -142,6 +142,7 @@ BASE_COREFOUNDATION_HDR = wx/osx/core/cfdataref.h wx/osx/core/cfref.h wx/osx/core/cfstring.h + wx/osx/core/colour.h wx/osx/core/hid.h wx/osx/core/evtloop.h wx/osx/core/objcid.h