2:15 p.m.
I get:
../../src/extension/implementation/script.cpp:30:26: error:
registrytool.h: No such file or directory
Now, rwst has finally beaten it into my head that this message means I
need to add something to a Makefile*something*.
First question is which one? Am I correct that autogen.sh uses
Makefile.am (including Makefile_insert) to generate Makefile.in which is
used by configure to create Makefile? So I should add registrytool.* to
Makefile_insert. Next question is where in that file should it go? There
are a number of different groups of files.
I should also ask. registrytool.h was most recently included in
src/extension/implementation/script.cpp by ishmal in revision 12129. But
it was originally added to the source in rev 10506 with the comment "new
files for win32 only". Is this file now being used on other platforms?
Thanks in advance for the education. :-)
Aaron Spike
5:32 p.m.
Aaron Spike wrote:
I get:
../../src/extension/implementation/script.cpp:30:26: error:
registrytool.h: No such file or directory
Now, rwst has finally beaten it into my head that this message means I
need to add something to a Makefile*something*.
First question is which one? Am I correct that autogen.sh uses
Makefile.am (including Makefile_insert) to generate Makefile.in which is
used by configure to create Makefile? So I should add registrytool.* to
Makefile_insert. Next question is where in that file should it go? There
are a number of different groups of files.
I should also ask. registrytool.h was most recently included in
src/extension/implementation/script.cpp by ishmal in revision 12129. But
it was originally added to the source in rev 10506 with the comment "new
files for win32 only". Is this file now being used on other platforms?
Thanks in advance for the education. :-)
Aaron Spike
Just move that #include to inside the #ifdef WIN32 switch.
bob
6:05 p.m.
On Thu, Jun 01, 2006 at 09:15:21AM -0500, Aaron Spike wrote:
Am I correct that autogen.sh uses
Makefile.am (including Makefile_insert) to generate Makefile.in which is
used by configure to create Makefile?
That's correct. Makefile_insert is an inkscape-specific thing we did in
order to allow those same Makefile fragments to be reused for other
build systems (i.e., Win43).
I don't know how things are handled with Win32-only files. registry*
sounds like a windows-ism, so might not actually belong there...
Maybe there's some other way to handle windows files?
So I should add registrytool.* to
Makefile_insert. Next question is where in that file should it go? There
are a number of different groups of files.
I would just be guessing, but one approach could be to look for files
that are related to registrytool.*, and see where they're located. It's
almost certainly going to be either libinkpre_a_SOURCES or
libinkpost_a_SOURCES. It may not matter which one you use; I'd probably
try it on the first, and if there was a problem, try moving it to the
other.
Bryce
8:29 a.m.
Aaron wrote
../../src/extension/implementation/script.cpp:30:26: error:
registrytool.h: No such file or directory
Now, rwst has finally beaten it into my head that this message means I
need to add something to a Makefile*something*.
First question is which one? Am I correct that autogen.sh uses
Makefile.am (including Makefile_insert) to generate Makefile.in which is
used by configure to create Makefile? So I should add registrytool.* to
Makefile_insert.
Yes!
Next question is where in that file should it go? There
are a number of different groups of files.
I should also ask. registrytool.h was most recently included in
src/extension/implementation/script.cpp by ishmal in revision 12129. But
it was originally added to the source in rev 10506 with the comment "new
files for win32 only". Is this file now being used on other platforms?
Since make distcheck is done on Linux, but we want to distribute also
the Win32 files, even if Win32 binaries appear to be built from svn, we
have to both include the two filenames with the variable win32_sources
AND, as Bob says, make compilation of registrytool.cpp conditional on
the WIN32 macro. Below the patch:
However, this would normally be the task of who introduces such files.
ralf
Index: src/registrytool.cpp
===================================================================
--- src/registrytool.cpp (revision 12157)
+++ src/registrytool.cpp (working copy)
@@ -25,6 +25,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#ifdef WIN32
+
#include <windows.h>
#include <string>
@@ -206,6 +208,8 @@
#endif /* TESTREG */
+#endif /* WIN32 */
+
//########################################################################
//# E N D O F F I L E
//########################################################################
6323
days inactive
6324
days old
inkscape-devel@lists.inkscape.org
3 comments
4 participants
participants (4)
-
Aaron Spike -
Bob Jamison -
Bryce Harrington -
Ralf Stephan