Changeset 2937 for libpipi/trunk


Ignore:
Timestamp:
Oct 12, 2008, 4:04:00 PM (12 years ago)
Author:
Sam Hocevar
Message:

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

Location:
libpipi/trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • libpipi/trunk/ThePimp/Makefile.am

    r2933 r2937  
    77        ErrorWindow.cs \
    88        MainWindow.cs \
     9        NewFile.cs \
    910        OpenFile.cs \
    10         NewFile.cs \
    1111        PictureView.cs \
    1212        SaveFile.cs \
     
    1616        gtk-gui/ThePimp.ErrorWindow.cs \
    1717        gtk-gui/ThePimp.MainWindow.cs \
     18        gtk-gui/ThePimp.NewFile.cs \
    1819        gtk-gui/ThePimp.OpenFile.cs \
    19         gtk-gui/ThePimp.NewFile.cs \
    2020        gtk-gui/ThePimp.PictureView.cs \
    2121        gtk-gui/ThePimp.SaveFile.cs \
     
    3131
    3232if USE_CSHARP
    33 if USE_GTKSHARP
    3433bin_SCRIPTS = ThePimp.exe
    3534endif
     35
     36if USE_GTKSHARP
     37pimp_flags = -pkg:gtk-sharp-2.0 -r:Mono.Posix
     38else
     39pimp_flags = \
     40        -r:$(top_srcdir)/win32/assembly/pango-sharp.dll \
     41        -r:$(top_srcdir)/win32/assembly/atk-sharp.dll \
     42        -r:$(top_srcdir)/win32/assembly/gdk-sharp.dll \
     43        -r:$(top_srcdir)/win32/assembly/gtk-sharp.dll \
     44        -r:$(top_srcdir)/win32/assembly/glib-sharp.dll
    3645endif
    3746
     
    3948
    4049ThePimp.exe: ../pipi-sharp/pipi-sharp.dll $(pimp_sources) $(pimp_resources)
     50        $(GMCS) -debug -codepage:utf8 -out:$@ $(pimp_flags) -lib:./ \
     51          $(addprefix $(srcdir)/, $(pimp_sources)) \
     52          $(foreach x, $(pimp_resources), \
     53                       -resource:$(srcdir)/$x,ThePimp.$(subst /,.,$x)) \
     54          -r:pipi-sharp.dll
    4155        cp ../pipi-sharp/pipi-sharp.dll .
    4256        cp ../pipi-sharp/pipi-sharp.dll.config .
    4357        cp ../pipi-sharp/pipi-sharp.dll.mdb .
    44         $(GMCS) -debug -codepage:utf8 -out:$@ -lib:./ \
    45           $(addprefix $(srcdir)/, $(pimp_sources)) \
    46           $(foreach x, $(pimp_resources), \
    47                        -resource:$(srcdir)/$x,ThePimp.$(subst /,.,$x)) \
    48           -pkg:gtk-sharp-2.0 -r:Mono.Posix -r:pipi-sharp.dll
    4958
    5059clean-local:
  • libpipi/trunk/build-win32

    r2863 r2937  
    2828rm -Rf "${BUILDDIR}"
    2929
    30 mv "${INSTALLDIR}/bin/"* "${INSTALLDIR}/"
    31 mv "${INSTALLDIR}/lib/"* "${INSTALLDIR}/"
    32 i586-mingw32msvc-strip "${INSTALLDIR}/"*.exe || true
    33 i586-mingw32msvc-strip "${INSTALLDIR}/"*.dll || true
    34 rmdir "${INSTALLDIR}/bin"
    35 rmdir "${INSTALLDIR}/lib"
     30i586-mingw32msvc-strip "${INSTALLDIR}/bin/"*.exe || true
     31i586-mingw32msvc-strip "${INSTALLDIR}/lib/"*.dll || true
     32
     33# Install gtk-sharp
     34cp -r "win32/dist/"* "${INSTALLDIR}/"
     35cp -r "win32/assembly/"* "${INSTALLDIR}/bin/"
     36
     37# Install pipi-sharp
     38mv "${INSTALLDIR}/lib/pipi-sharp/"* "${INSTALLDIR}/bin/"
     39rm -Rf "${INSTALLDIR}/lib/pipi-sharp"
    3640
    3741mkdir "${INSTALLDIR}/doc"
     
    4044/' < "${SRCDIR}/${f}" > "${INSTALLDIR}/doc/${f}.txt"
    4145done
    42 rm -Rf "${INSTALLDIR}/share"
    43 rm -Rf "${INSTALLDIR}/man"
    44 rm -Rf "${INSTALLDIR}/include"
    45 rm -Rf "${INSTALLDIR}/pkg-config"
    46 rm -f "${INSTALLDIR}/"*.a
    47 rm -f "${INSTALLDIR}/"*.la
     46rm -f "${INSTALLDIR}/lib/"*.a
     47rm -f "${INSTALLDIR}/lib/"*.la
    4848
    4949# Pack the directory
  • libpipi/trunk/configure.ac

    r2912 r2937  
    4545
    4646AC_MSG_CHECKING(for library suffix)
    47 LT_SUFFIX="`./libtool -n --mode=link gcc -o libTEST.la -no-undefined -version-number 123:666:999 -rpath / | xargs -n 1 | sed -ne 's/.*libTEST\(@<:@^, ()0-9@:>@*\)123\(@<:@^, ()0-9@:>@*\).*/\1'$LT_MAJOR'\2/p' | grep -v '\.$' | head -n 1`"
     47LT_SUFFIX="`./libtool -n --tag CC --mode=link gcc -o libTEST.la -no-undefined -version-number 123:666:999 -rpath / | xargs -n 1 | sed -ne 's/.*libTEST\(@<:@^, ()0-9@:>@*\)123\(@<:@^, ()0-9@:>@*\).*/\1'$LT_MAJOR'\2/p' | grep -v '\.$' | head -n 1`"
    4848if test "$LT_SUFFIX" = ""; then
    4949  LT_SUFFIX=".so.$LT_MAJOR"
Note: See TracChangeset for help on using the changeset viewer.