Moved utils.i back into the core since it imports it anyway.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14039 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -323,8 +323,7 @@ if not GL_ONLY:
|
||||
'misc.i', 'misc2.i', 'gdi.i', 'mdi.i', 'controls.i',
|
||||
'controls2.i', 'cmndlgs.i', 'stattool.i', 'frames.i', 'image.i',
|
||||
'printfw.i', 'sizers.i', 'clip_dnd.i',
|
||||
'filesys.i', 'streams.i',
|
||||
##'grid.i', 'html.i', 'htmlhelp.i', 'calendar.i', 'utils.i',
|
||||
'filesys.i', 'streams.i', 'utils.i'
|
||||
]
|
||||
|
||||
swig_sources = run_swig(swig_files, 'src', GENDIR, PKGDIR,
|
||||
@@ -390,20 +389,6 @@ if not GL_ONLY:
|
||||
wxpExtensions.append(ext)
|
||||
|
||||
|
||||
# Extension for the utils module
|
||||
swig_sources = run_swig(['utils.i'], 'src', GENDIR, PKGDIR,
|
||||
USE_SWIG, swig_force, swig_args, swig_deps)
|
||||
ext = Extension('utilsc', swig_sources,
|
||||
include_dirs = includes,
|
||||
define_macros = defines,
|
||||
library_dirs = libdirs,
|
||||
libraries = libs,
|
||||
extra_compile_args = cflags,
|
||||
extra_link_args = lflags,
|
||||
)
|
||||
wxpExtensions.append(ext)
|
||||
|
||||
|
||||
# Extension for the calendar module
|
||||
swig_sources = run_swig(['calendar.i'], 'src', GENDIR, PKGDIR,
|
||||
USE_SWIG, swig_force, swig_args, swig_deps)
|
||||
|
@@ -629,6 +629,7 @@ extern "C" SWIGEXPORT(void) initsizersc();
|
||||
extern "C" SWIGEXPORT(void) initclip_dndc();
|
||||
extern "C" SWIGEXPORT(void) initstreamsc();
|
||||
extern "C" SWIGEXPORT(void) initfilesysc();
|
||||
extern "C" SWIGEXPORT(void) initutilsc();
|
||||
|
||||
|
||||
|
||||
@@ -2686,6 +2687,7 @@ SWIGEXPORT(void) initwxc() {
|
||||
initclip_dndc();
|
||||
initstreamsc();
|
||||
initfilesysc();
|
||||
initutilsc();
|
||||
|
||||
|
||||
PyDict_SetItemString(d,"wxMAJOR_VERSION", PyInt_FromLong((long)wxMAJOR_VERSION ));
|
||||
|
@@ -50,6 +50,7 @@
|
||||
%import sizers.i
|
||||
%import streams.i
|
||||
%import filesys.i
|
||||
%import utils.i
|
||||
|
||||
%native(_wxStart) __wxStart;
|
||||
%native(_wxSetDictionary) __wxSetDictionary;
|
||||
@@ -152,6 +153,7 @@ extern "C" SWIGEXPORT(void) initsizersc();
|
||||
extern "C" SWIGEXPORT(void) initclip_dndc();
|
||||
extern "C" SWIGEXPORT(void) initstreamsc();
|
||||
extern "C" SWIGEXPORT(void) initfilesysc();
|
||||
extern "C" SWIGEXPORT(void) initutilsc();
|
||||
|
||||
|
||||
|
||||
@@ -241,6 +243,7 @@ static wxPyCoreAPI API = {
|
||||
initclip_dndc();
|
||||
initstreamsc();
|
||||
initfilesysc();
|
||||
initutilsc();
|
||||
|
||||
|
||||
PyDict_SetItemString(d,"wxMAJOR_VERSION", PyInt_FromLong((long)wxMAJOR_VERSION ));
|
||||
|
Reference in New Issue
Block a user