FYI. I do not have the mailinglist address on my debian section :-( so I guessed wrong. --- Adib Taraben <theadib@...36...> wrote:

Date: Mon, 26 Sep 2005 14:33:31 -0700 (PDT) From: Adib Taraben <theadib@...36...> Subject: [ 1245838 ] Win32: Problem building Inkscape 0.42 To: inkscape-devel@...34...

FYI,

Hello release warden,

attached there is a patch against the latest cvs.

This should solve the issues building a win32 exe from the source.tgz published on sf.

I only made the necessary changes for building the .exe and did not added needed stuff for the win32 installer.

I would like to bring the nsis installer stuff for the first .rc Or during the string freeze. When is this estimated ? (still almost no feedback for this)

Thx,

theAdib.

__________________________________ Yahoo! Mail - PC Magazine Editors' Choice 2005 http://mail.yahoo.com%3E ? inkscape-0.42+devel.zip ? makewin32.diff ? src/test-all.cpp ? src/dom/makefile ? src/svg/test-svg-main.cpp ? src/svg/test-svg.cpp Index: Makefile.am

===================================================================

RCS file: /cvsroot/inkscape/inkscape/Makefile.am,v retrieving revision 1.36 diff -u -4 -r1.36 Makefile.am --- Makefile.am 15 Sep 2005 13:21:06 -0000 1.36 +++ Makefile.am 26 Sep 2005 20:58:45 -0000 @@ -38,15 +38,14 @@ inkscape.spec \ Info.plist.in \ Info.plist \ inkscape.nsi \

• Makefile.mingw \
• Makefile.mingw.common \

• config.h.mingw Makefile.mingw

Makefile.mingw.common mingwenv.bat \ README README.ca.txt README.de.txt README.fr.txt README.it.txt \ HACKING.txt HACKING.de.txt HACKING.fr.txt HACKING.it.txt \ TRANSLATORS \ inkscape.png \

• inkscape.ico inkscape16.ico inkscape32.ico

inkscape64.ico \

• inkscape.ico inkscape16.ico inkscape32-16.ico

inkscape32.ico inkscape64.ico \ cxxtest/cxxtestgen.pl \ cxxtest/cxxtestgen.py \ cxxtest/cxxtest/Descriptions.cpp \ cxxtest/cxxtest/Descriptions.h \ @@ -93,9 +92,12 @@ debian/inkscape.menu \ debian/inkscape.xpm \ debian/mime \ debian/rules \

• packaging/autopackage/default.apspec.in

• packaging/autopackage/default.apspec.in \
• po/Makefile.mingw \
• src/Makefile.mingw src/inkscape_version.h.mingw

src/inkscape.rc src/makedef.pl \

• src/helper/sp-marshal.h.mingw

src/helper/sp-marshal.cpp.mingw

# Note: it isn't clear that debian/* belongs in the tar file: # tarfile users should be able to use the official Debian packages. # They were added to EXTRA_DIST in v1.5, in response to a message on Index: Makefile.mingw

===================================================================

RCS file: /cvsroot/inkscape/inkscape/Makefile.mingw,v retrieving revision 1.46 diff -u -4 -r1.46 Makefile.mingw --- Makefile.mingw 19 Aug 2005 17:16:28 -0000 1.46 +++ Makefile.mingw 26 Sep 2005 20:58:46 -0000 @@ -126,9 +126,9 @@ $(MAKE) -C po -f Makefile.mingw clean

minimal: $(MAKE) -C src -f Makefile.mingw

• $(RM) inkscape$(S)inkscape.exe

• -$(RM) inkscape$(S)inkscape.exe $(CP) src$(S)inkscape.exe inkscape @echo "##################### D O N E

####################"

Index: src/Makefile.mingw

===================================================================

RCS file: /cvsroot/inkscape/inkscape/src/Makefile.mingw,v retrieving revision 1.28 diff -u -4 -r1.28 Makefile.mingw --- src/Makefile.mingw 10 Jun 2005 22:14:31 -0000 1.28 +++ src/Makefile.mingw 26 Sep 2005 20:58:46 -0000 @@ -42,9 +42,9 @@ ################################### # O U T P U T S ###################################

-outputs: inkscape.exe +outputs: inkscape.exe inkview.exe

RES=inkres.o

@@ -56,11 +56,16 @@ #inkscape.exe: inkscape.dll main.o winmain.o $(RES)

# $(CXX) -o inkscape.exe main.o winmain.o $(RES) inkscape.la $(LIBS) # strip inkscape.exe

-inkview.exe: inkscape.dll inkview.o $(RES)

• $(CXX) -o inkview.exe inkview.o $(RES)

libinkscapedll.a $(LIBS)

• strip inkview.exe

+inkview.exe: libinkscape.a inkview.o $(RES)

• $(CXX) -o inkview.exe inkview.o $(RES)

libinkscape.a $(LIBS) +# strip inkview.exe

+# DLL version. we need to make this work +# inkview.exe: inkscape.dll inkview.o $(RES) +# $(CXX) -o inkview.exe inkview.o $(RES) libinkscapedll.a $(LIBS) +# strip inkview.exe

inkres.o: inkscape.rc $(WINDRES) inkscape.rc $(RES)

@@ -72,9 +77,9 @@ inkscape.def: libinkscape.a perl makedef.pl

libinkscape.a: $(OBJ)

• $(RM) libinkscape.a

• -$(RM) libinkscape.a ar crv libinkscape.a $(OBJ) $(RANLIB) libinkscape.a

inkscape.la: inkscape.dll @@ -106,13 +111,13 @@ ###################################

clean: $(foreach a, $(OBJ), $(shell $(RM) $(subst /,$(S), $(a))))

• $(RM) main.o winmain.o inkview.o
• $(RM) *.a
• $(RM) *.la
• $(RM) inkscape.def
• $(RM) *.dll
• $(RM) extension$(S)plugin$(S)*.o
• $(RM) extension$(S)plugin$(S)*.dll

• -$(RM) main.o winmain.o inkview.o
• -$(RM) *.a
• -$(RM) *.la
• -$(RM) inkscape.def
• -$(RM) *.dll
• -$(RM) extension$(S)plugin$(S)*.o
• -$(RM) extension$(S)plugin$(S)*.dll

__________________________________ Yahoo! Mail - PC Magazine Editors' Choice 2005 http://mail.yahoo.com

? inkscape-0.42+devel.zip ? makewin32.diff ? src/test-all.cpp ? src/dom/makefile ? src/svg/test-svg-main.cpp ? src/svg/test-svg.cpp Index: Makefile.am =================================================================== RCS file: /cvsroot/inkscape/inkscape/Makefile.am,v retrieving revision 1.36 diff -u -4 -r1.36 Makefile.am --- Makefile.am 15 Sep 2005 13:21:06 -0000 1.36 +++ Makefile.am 26 Sep 2005 20:58:45 -0000 @@ -38,15 +38,14 @@ inkscape.spec \ Info.plist.in \ Info.plist \ inkscape.nsi \ - Makefile.mingw \ - Makefile.mingw.common \ + config.h.mingw Makefile.mingw Makefile.mingw.common mingwenv.bat \ README README.ca.txt README.de.txt README.fr.txt README.it.txt \ HACKING.txt HACKING.de.txt HACKING.fr.txt HACKING.it.txt \ TRANSLATORS \ inkscape.png \ - inkscape.ico inkscape16.ico inkscape32.ico inkscape64.ico \ + inkscape.ico inkscape16.ico inkscape32-16.ico inkscape32.ico inkscape64.ico \ cxxtest/cxxtestgen.pl \ cxxtest/cxxtestgen.py \ cxxtest/cxxtest/Descriptions.cpp \ cxxtest/cxxtest/Descriptions.h \ @@ -93,9 +92,12 @@ debian/inkscape.menu \ debian/inkscape.xpm \ debian/mime \ debian/rules \ - packaging/autopackage/default.apspec.in + packaging/autopackage/default.apspec.in \ + po/Makefile.mingw \ + src/Makefile.mingw src/inkscape_version.h.mingw src/inkscape.rc src/makedef.pl \ + src/helper/sp-marshal.h.mingw src/helper/sp-marshal.cpp.mingw

# Note: it isn't clear that debian/* belongs in the tar file: # tarfile users should be able to use the official Debian packages. # They were added to EXTRA_DIST in v1.5, in response to a message on Index: Makefile.mingw =================================================================== RCS file: /cvsroot/inkscape/inkscape/Makefile.mingw,v retrieving revision 1.46 diff -u -4 -r1.46 Makefile.mingw --- Makefile.mingw 19 Aug 2005 17:16:28 -0000 1.46 +++ Makefile.mingw 26 Sep 2005 20:58:46 -0000 @@ -126,9 +126,9 @@ $(MAKE) -C po -f Makefile.mingw clean

minimal: $(MAKE) -C src -f Makefile.mingw - $(RM) inkscape$(S)inkscape.exe + -$(RM) inkscape$(S)inkscape.exe $(CP) src$(S)inkscape.exe inkscape @echo "##################### D O N E ####################"

Index: src/Makefile.mingw =================================================================== RCS file: /cvsroot/inkscape/inkscape/src/Makefile.mingw,v retrieving revision 1.28 diff -u -4 -r1.28 Makefile.mingw --- src/Makefile.mingw 10 Jun 2005 22:14:31 -0000 1.28 +++ src/Makefile.mingw 26 Sep 2005 20:58:46 -0000 @@ -42,9 +42,9 @@ ################################### # O U T P U T S ###################################

-outputs: inkscape.exe +outputs: inkscape.exe inkview.exe

RES=inkres.o

@@ -56,11 +56,16 @@ #inkscape.exe: inkscape.dll main.o winmain.o $(RES) # $(CXX) -o inkscape.exe main.o winmain.o $(RES) inkscape.la $(LIBS) # strip inkscape.exe

-inkview.exe: inkscape.dll inkview.o $(RES) - $(CXX) -o inkview.exe inkview.o $(RES) libinkscapedll.a $(LIBS) - strip inkview.exe +inkview.exe: libinkscape.a inkview.o $(RES) + $(CXX) -o inkview.exe inkview.o $(RES) libinkscape.a $(LIBS) +# strip inkview.exe + +# DLL version. we need to make this work +# inkview.exe: inkscape.dll inkview.o $(RES) +# $(CXX) -o inkview.exe inkview.o $(RES) libinkscapedll.a $(LIBS) +# strip inkview.exe

inkres.o: inkscape.rc $(WINDRES) inkscape.rc $(RES)

@@ -72,9 +77,9 @@ inkscape.def: libinkscape.a perl makedef.pl libinkscape.a: $(OBJ) - $(RM) libinkscape.a + -$(RM) libinkscape.a ar crv libinkscape.a $(OBJ) $(RANLIB) libinkscape.a

inkscape.la: inkscape.dll @@ -106,13 +111,13 @@ ###################################

clean: $(foreach a, $(OBJ), $(shell $(RM) $(subst /,$(S), $(a)))) - $(RM) main.o winmain.o inkview.o - $(RM) *.a - $(RM) *.la - $(RM) inkscape.def - $(RM) *.dll - $(RM) extension$(S)plugin$(S)*.o - $(RM) extension$(S)plugin$(S)*.dll + -$(RM) main.o winmain.o inkview.o + -$(RM) *.a + -$(RM) *.la + -$(RM) inkscape.def + -$(RM) *.dll + -$(RM) extension$(S)plugin$(S)*.o + -$(RM) extension$(S)plugin$(S)*.dll