From 0cf38d660cd4e4817149816f70f952116be11312 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Wed, 2 Nov 2005 01:48:03 +0000 Subject: [PATCH] *** empty log message *** --- ChangeLog | 9 +++++++++ lily/main.cc | 6 ++++++ python/GNUmakefile | 1 + python/midi.c | 4 ++-- 4 files changed, 18 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index bffe5238de..718bc05d7b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2005-11-01 Jan Nieuwenhuizen + + * lily/main.cc (setup_paths)[!__MINGW32__]: Bugfix: if argv0 is + not absolute, make it absolute using PATH. + +2005-10-28 Jan Nieuwenhuizen + + * python/midi.c (initmidi): Fix type for mingw. + 2005-10-27 Jan Nieuwenhuizen * stepmake/stepmake/compile-vars.make (SHARED_FLAGS): Support mingw. diff --git a/lily/main.cc b/lily/main.cc index f75b458f4a..a89edb1844 100644 --- a/lily/main.cc +++ b/lily/main.cc @@ -320,7 +320,13 @@ setup_paths (char const* argv0) if (getenv ("LILYPOND_VERBOSE")) be_verbose_global = true; +#ifndef __MINGW32__ + File_path p; + p.parse_path (getenv ("PATH")); + String bindir = dir_name (p.find (argv0)); +#else /* __MINGW32__ */ String bindir = dir_name (argv0); +#endif String argv0_prefix = dir_name (bindir); if (argv0_prefix != dir_name (dir_name (dir_name (prefix_directory)))) { diff --git a/python/GNUmakefile b/python/GNUmakefile index 400828d53f..360bc29756 100644 --- a/python/GNUmakefile +++ b/python/GNUmakefile @@ -4,6 +4,7 @@ STEPMAKE_TEMPLATES=c python-module install-out po include $(depth)/make/stepmake.make +CFLAGS += -DPy_BUILD_CORE # unset al guile stuff from configure USER_LDFLAGS= diff --git a/python/midi.c b/python/midi.c index 5d5e7fba47..4570cbfba5 100644 --- a/python/midi.c +++ b/python/midi.c @@ -399,8 +399,8 @@ static PyMethodDef MidiMethods[] = {0, 0} /* Sentinel */ }; -void -initmidi () +PyMODINIT_FUNC +initmidi (void) { PyObject *m, *d; m = Py_InitModule ("midi", MidiMethods); -- 2.39.5