Changeset 4881 for libpipi/trunk/build-win32Tweet

Timestamp:

Jun 13, 2014, 9:23:18 AM (9 years ago)

Author:

Sam Hocevar

Message:

build: a few Win32 build fixes.

File:

• libpipi/trunk/build-win32 (modified) (3 diffs)

libpipi/trunk/build-win32

@@ -28 +28 @@
 cd "${BUILDDIR}"
 # Build for win32
-"${SRCDIR}/configure" --host=i586-mingw32msvc --prefix=/ --bindir=/bin --libdir=/lib CPPFLAGS="-I${SRCDIR}/win32/gdiplus/include" LIBS="-L${SRCDIR}/win32/gdiplus/lib" "$@"
+"${SRCDIR}/configure" --host=i686-w64-mingw32 --prefix=/ --bindir=/bin --libdir=/lib CPPFLAGS="-I${SRCDIR}/win32/gdiplus/include" LIBS="-L${SRCDIR}/win32/gdiplus/lib" "$@"
 make pkglibdir=/lib pkgdatadir=/data bindir=/bin
 # Install into our private directory
@@ -36 +36 @@
 rm -Rf "${BUILDDIR}"
 
-#i586-mingw32msvc-strip "${INSTALLDIR}/bin/"*.exe || true
-#i586-mingw32msvc-strip "${INSTALLDIR}/lib/"*.dll || true
+#i686-w64-mingw32-strip "${INSTALLDIR}/bin/"*.exe || true
+#i686-w64-mingw32-strip "${INSTALLDIR}/lib/"*.dll || true
 
 # Install pipi.exe
 echo 'int main(int argc, char *argv[], char *envp[]) { argv[0] = ".\\bin\\pipi.exe"; execve(argv[0], argv, envp); return 0; }' > run.c
-i586-mingw32msvc-gcc run.c -mwindows -o "${INSTALLDIR}/pipi.exe"
-i586-mingw32msvc-strip "${INSTALLDIR}/pipi.exe"
+i686-w64-mingw32-gcc run.c -mwindows -o "${INSTALLDIR}/pipi.exe"
+i686-w64-mingw32-strip "${INSTALLDIR}/pipi.exe"
 
 # Install gtk-sharp
@@ -55 +55 @@
 mv "${INSTALLDIR}/lib/ThePimp.exe" "${INSTALLDIR}/bin/"
 echo 'int main(int argc, char *argv[], char *envp[]) { argv[0] = ".\\bin\\ThePimp.exe"; execve(argv[0], argv, envp); return 0; }' > run.c
-i586-mingw32msvc-gcc run.c -mwindows -o "${INSTALLDIR}/ThePimp.exe"
-i586-mingw32msvc-strip "${INSTALLDIR}/ThePimp.exe"
+i686-w64-mingw32-gcc run.c -mwindows -o "${INSTALLDIR}/ThePimp.exe"
+i686-w64-mingw32-strip "${INSTALLDIR}/ThePimp.exe"
 
 # Install documentation