Changeset 2937 for libpipi/trunk/ThePimp/Makefile.amTweet

Timestamp:

Oct 12, 2008, 4:04:00 PM (14 years ago)

Author:

Sam Hocevar

Message:

Improve the Win32 cross-build script. Still doesn't work well.

File:

• libpipi/trunk/ThePimp/Makefile.am (modified) (4 diffs)

libpipi/trunk/ThePimp/Makefile.am

@@ -7 +7 @@
         ErrorWindow.cs \
         MainWindow.cs \
+        NewFile.cs \
         OpenFile.cs \
-        NewFile.cs \
         PictureView.cs \
         SaveFile.cs \
@@ -16 +16 @@
         gtk-gui/ThePimp.ErrorWindow.cs \
         gtk-gui/ThePimp.MainWindow.cs \
+        gtk-gui/ThePimp.NewFile.cs \
         gtk-gui/ThePimp.OpenFile.cs \
-        gtk-gui/ThePimp.NewFile.cs \
         gtk-gui/ThePimp.PictureView.cs \
         gtk-gui/ThePimp.SaveFile.cs \
@@ -31 +31 @@
 
 if USE_CSHARP
-if USE_GTKSHARP
 bin_SCRIPTS = ThePimp.exe
 endif
+
+if USE_GTKSHARP
+pimp_flags = -pkg:gtk-sharp-2.0 -r:Mono.Posix
+else
+pimp_flags = \
+        -r:$(top_srcdir)/win32/assembly/pango-sharp.dll \
+        -r:$(top_srcdir)/win32/assembly/atk-sharp.dll \
+        -r:$(top_srcdir)/win32/assembly/gdk-sharp.dll \
+        -r:$(top_srcdir)/win32/assembly/gtk-sharp.dll \
+        -r:$(top_srcdir)/win32/assembly/glib-sharp.dll
 endif
 
@@ -39 +48 @@
 
 ThePimp.exe: ../pipi-sharp/pipi-sharp.dll $(pimp_sources) $(pimp_resources)
+        $(GMCS) -debug -codepage:utf8 -out:$@ $(pimp_flags) -lib:./ \
+          $(addprefix $(srcdir)/, $(pimp_sources)) \
+          $(foreach x, $(pimp_resources), \
+                       -resource:$(srcdir)/$x,ThePimp.$(subst /,.,$x)) \
+          -r:pipi-sharp.dll
         cp ../pipi-sharp/pipi-sharp.dll .
         cp ../pipi-sharp/pipi-sharp.dll.config .
         cp ../pipi-sharp/pipi-sharp.dll.mdb .
-        $(GMCS) -debug -codepage:utf8 -out:$@ -lib:./ \
-          $(addprefix $(srcdir)/, $(pimp_sources)) \
-          $(foreach x, $(pimp_resources), \
-                       -resource:$(srcdir)/$x,ThePimp.$(subst /,.,$x)) \
-          -pkg:gtk-sharp-2.0 -r:Mono.Posix -r:pipi-sharp.dll
 
 clean-local: