Changeset 4881


Ignore:
Timestamp:
Jun 13, 2014, 9:23:18 AM (3 years ago)
Author:
Sam Hocevar
Message:

build: a few Win32 build fixes.

Location:
libpipi/trunk
Files:
2 edited

Legend:

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

    r4880 r4881  
    11# $Id: $
    22
    3 mypkglibdir = $(libdir)/ThePimp
     3pimplibdir = $(libdir)/ThePimp
    44
    55pimp_sources = \
     
    3333
    3434if USE_CSHARP
    35 mypkglib_DATA = ThePimp.exe
     35pimplib_DATA = ThePimp.exe
    3636bin_SCRIPTS = pimp
    3737endif
  • libpipi/trunk/build-win32

    r3146 r4881  
    2828cd "${BUILDDIR}"
    2929# Build for win32
    30 "${SRCDIR}/configure" --host=i586-mingw32msvc --prefix=/ --bindir=/bin --libdir=/lib CPPFLAGS="-I${SRCDIR}/win32/gdiplus/include" LIBS="-L${SRCDIR}/win32/gdiplus/lib" "$@"
     30"${SRCDIR}/configure" --host=i686-w64-mingw32 --prefix=/ --bindir=/bin --libdir=/lib CPPFLAGS="-I${SRCDIR}/win32/gdiplus/include" LIBS="-L${SRCDIR}/win32/gdiplus/lib" "$@"
    3131make pkglibdir=/lib pkgdatadir=/data bindir=/bin
    3232# Install into our private directory
     
    3636rm -Rf "${BUILDDIR}"
    3737
    38 #i586-mingw32msvc-strip "${INSTALLDIR}/bin/"*.exe || true
    39 #i586-mingw32msvc-strip "${INSTALLDIR}/lib/"*.dll || true
     38#i686-w64-mingw32-strip "${INSTALLDIR}/bin/"*.exe || true
     39#i686-w64-mingw32-strip "${INSTALLDIR}/lib/"*.dll || true
    4040
    4141# Install pipi.exe
    4242echo 'int main(int argc, char *argv[], char *envp[]) { argv[0] = ".\\bin\\pipi.exe"; execve(argv[0], argv, envp); return 0; }' > run.c
    43 i586-mingw32msvc-gcc run.c -mwindows -o "${INSTALLDIR}/pipi.exe"
    44 i586-mingw32msvc-strip "${INSTALLDIR}/pipi.exe"
     43i686-w64-mingw32-gcc run.c -mwindows -o "${INSTALLDIR}/pipi.exe"
     44i686-w64-mingw32-strip "${INSTALLDIR}/pipi.exe"
    4545
    4646# Install gtk-sharp
     
    5555mv "${INSTALLDIR}/lib/ThePimp.exe" "${INSTALLDIR}/bin/"
    5656echo 'int main(int argc, char *argv[], char *envp[]) { argv[0] = ".\\bin\\ThePimp.exe"; execve(argv[0], argv, envp); return 0; }' > run.c
    57 i586-mingw32msvc-gcc run.c -mwindows -o "${INSTALLDIR}/ThePimp.exe"
    58 i586-mingw32msvc-strip "${INSTALLDIR}/ThePimp.exe"
     57i686-w64-mingw32-gcc run.c -mwindows -o "${INSTALLDIR}/ThePimp.exe"
     58i686-w64-mingw32-strip "${INSTALLDIR}/ThePimp.exe"
    5959
    6060# Install documentation
Note: See TracChangeset for help on using the changeset viewer.