Modelling setup.h modification on osx along msw, having a separate file
Note that for update-setup-h to work properly on osx, gnu-sed is needed
This commit is contained in:
@@ -84,6 +84,12 @@ update_msw_setup_h()
|
||||
update_single_setup_h MSW include/wx/msw/setup_inc.h $1
|
||||
}
|
||||
|
||||
# wrapper for update_single_setup_h which only updates the OSX options
|
||||
update_osx_setup_h()
|
||||
{
|
||||
update_single_setup_h OSX include/wx/osx/setup_inc.h $1
|
||||
}
|
||||
|
||||
# entry point
|
||||
if [ ! -f wxwin.m4 ]; then
|
||||
error "$0: must be ran from root wx directory"
|
||||
@@ -102,6 +108,9 @@ update_msw_setup_h include/wx/msw/setup0.h
|
||||
update_msw_setup_h include/wx/gtk/setup0.h
|
||||
update_msw_setup_h setup.h.in
|
||||
|
||||
update_osx_setup_h include/wx/osx/setup0.h
|
||||
update_msw_setup_h setup.h.in
|
||||
|
||||
update_single_setup_h wxUniv include/wx/univ/setup_inc.h include/wx/univ/setup0.h
|
||||
|
||||
exit $rc
|
||||
|
@@ -1543,6 +1543,7 @@
|
||||
|
||||
/* --- end common options --- */
|
||||
|
||||
/* --- start OSX options --- */
|
||||
// ----------------------------------------------------------------------------
|
||||
// Unix-specific options settings
|
||||
// ----------------------------------------------------------------------------
|
||||
@@ -1555,10 +1556,10 @@
|
||||
|
||||
/*
|
||||
Use GStreamer for Unix.
|
||||
|
||||
|
||||
Default is 0 as this requires a lot of dependencies which might not be
|
||||
available.
|
||||
|
||||
|
||||
Recommended setting: 1 (wxMediaCtrl won't work by default without it).
|
||||
*/
|
||||
#define wxUSE_GSTREAMER 0
|
||||
@@ -1595,7 +1596,7 @@
|
||||
// make sure we have the proper dispatcher for the console event loop
|
||||
#define wxUSE_SELECT_DISPATCHER 1
|
||||
#define wxUSE_EPOLL_DISPATCHER 0
|
||||
|
||||
/* --- end OSX options --- */
|
||||
|
||||
#endif
|
||||
// _WX_SETUP_H_
|
||||
|
62
include/wx/osx/setup_inc.h
Normal file
62
include/wx/osx/setup_inc.h
Normal file
@@ -0,0 +1,62 @@
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
// Name: wx/osx/setup_inc.h
|
||||
// Purpose: OSX-specific setup.h options
|
||||
// Author: Stefan Csomor
|
||||
// Modified by: Stefan Csomor
|
||||
// Created: 2017-11-09
|
||||
// Copyright: (c) Stefan Csomor
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// Unix-specific options settings
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
// use wxSelectDispatcher class
|
||||
#define wxUSE_SELECT_DISPATCHER 1
|
||||
|
||||
// use wxEpollDispatcher class (Linux only)
|
||||
#define wxUSE_EPOLL_DISPATCHER 0
|
||||
|
||||
/*
|
||||
Use GStreamer for Unix.
|
||||
|
||||
Default is 0 as this requires a lot of dependencies which might not be
|
||||
available.
|
||||
|
||||
Recommended setting: 1 (wxMediaCtrl won't work by default without it).
|
||||
*/
|
||||
#define wxUSE_GSTREAMER 0
|
||||
|
||||
// This is only used under Unix, but needs to be defined here as it's checked
|
||||
// by wx/unix/chkconf.h.
|
||||
#define wxUSE_XTEST 0
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// Mac-specific settings
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
#undef wxUSE_GRAPHICS_CONTEXT
|
||||
#define wxUSE_GRAPHICS_CONTEXT 1
|
||||
|
||||
|
||||
// things not implemented under Mac
|
||||
|
||||
#undef wxUSE_STACKWALKER
|
||||
#define wxUSE_STACKWALKER 0
|
||||
|
||||
// wxWebKit is a wrapper for Apple's WebKit framework, use it if you want to
|
||||
// embed the Safari browser control
|
||||
// 0 by default because of Jaguar compatibility problems
|
||||
#define wxUSE_WEBKIT 1
|
||||
|
||||
|
||||
// Set to 0 for no libmspack
|
||||
#define wxUSE_LIBMSPACK 0
|
||||
|
||||
// native toolbar does support embedding controls, but not complex panels, please test
|
||||
#define wxOSX_USE_NATIVE_TOOLBAR 1
|
||||
|
||||
// make sure we have the proper dispatcher for the console event loop
|
||||
#define wxUSE_SELECT_DISPATCHER 1
|
||||
#define wxUSE_EPOLL_DISPATCHER 0
|
Reference in New Issue
Block a user