Mercurial > mxe-octave
changeset 3031:951da75fd09c
improve handling of cross tool prefix
line wrap: on
line diff
--- a/Makefile Sat Jun 08 20:53:29 2013 -0400 +++ b/Makefile Sun Jun 09 09:48:08 2013 -0400 @@ -123,11 +123,15 @@ CONFIGURE_LDFLAGS := LDFLAGS='-L$(HOST_PREFIX)/lib' ifeq ($(MXE_NATIVE_BUILD),yes) + MXE_TOOL_PREFIX := MXE_AR := ar MXE_RANLIB := ranlib MXE_CC := gcc MXE_CXX := g++ MXE_F77 := gfortran + MXE_DLLTOOL := dlltool + MXE_NM := nm + MXE_STRIP := strip ifeq ($(MXE_SYSTEM),mingw) MXE_WINDRES := windres else @@ -136,18 +140,22 @@ MXE_PKG_CONFIG := pkg-config MXE_QMAKE := qmake else - MXE_AR := '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-ar' - MXE_RANLIB := '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-ranlib' - MXE_CC := '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-gcc' - MXE_CXX := '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-g++' - MXE_F77 := '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-gfortran' + MXE_TOOL_PREFIX := $(TARGET)- + MXE_AR := '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)ar' + MXE_RANLIB := '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)ranlib' + MXE_CC := '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)gcc' + MXE_CXX := '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)g++' + MXE_F77 := '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)gfortran' + MXE_DLLTOOL := '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)dlltool' + MXE_NM := '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)nm' + MXE_STRIP := '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)strip' ifeq ($(MXE_SYSTEM),mingw) - MXE_WINDRES := '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-windres' + MXE_WINDRES := '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)windres' else MXE_WINDRES := true endif - MXE_PKG_CONFIG := '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-pkg-config' - MXE_QMAKE := '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-qmake' + MXE_PKG_CONFIG := '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)pkg-config' + MXE_QMAKE := '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)qmake' endif ifeq ($(MXE_SYSTEM),mingw)
--- a/src/apr-util.mk Sat Jun 08 20:53:29 2013 -0400 +++ b/src/apr-util.mk Sun Jun 09 09:48:08 2013 -0400 @@ -27,5 +27,5 @@ --with-apr='$(HOST_PREFIX)' \ CFLAGS=-D_WIN32_WINNT=0x0500 $(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= man_MANS= - $(LN_SF) '$(HOST_BINDIR)/apu-1-config' '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-apu-1-config' + $(LN_SF) '$(HOST_BINDIR)/apu-1-config' '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)apu-1-config' endef
--- a/src/apr.mk Sat Jun 08 20:53:29 2013 -0400 +++ b/src/apr.mk Sun Jun 09 09:48:08 2013 -0400 @@ -27,5 +27,5 @@ ac_cv_sizeof_ssize_t=4 \ CFLAGS=-D_WIN32_WINNT=0x0500 $(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= man_MANS= - $(LN_SF) '$(HOST_BINDIR)/apr-1-config' '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-apr-1-config' + $(LN_SF) '$(HOST_BINDIR)/apr-1-config' '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)apr-1-config' endef
--- a/src/armadillo.mk Sat Jun 08 20:53:29 2013 -0400 +++ b/src/armadillo.mk Sun Jun 09 09:48:08 2013 -0400 @@ -21,7 +21,7 @@ $(MAKE) -C '$(1)' -j '$(JOBS)' install VERBOSE=1 # note: don't use -Werror with GCC 4.7.0 and .1 - '$(TARGET)-g++' \ + '$(MXE_CXX)' \ -W -Wall \ '$(2).cpp' -o '$(HOST_BINDIR)/test-armadillo.exe' \ -larmadillo -llapack -lblas -lgfortran
--- a/src/boost.mk Sat Jun 08 20:53:29 2013 -0400 +++ b/src/boost.mk Sun Jun 09 09:48:08 2013 -0400 @@ -21,7 +21,7 @@ rm -r '$(1)/libs/context' # old version appears to interfere rm -rf '$(HOST_INCDIR)/boost' - echo 'using gcc : : $(TARGET)-g++ : <rc>$(TARGET)-windres <archiver>$(TARGET)-ar ;' > '$(1)/user-config.jam' + echo 'using gcc : : $(MXE_CXX) : <rc>$(MXE_WINDRES) <archiver>$(MXE_AR) ;' > '$(1)/user-config.jam' # compile boost jam cd '$(1)/tools/build/v2/engine' && ./build.sh cd '$(1)' && tools/build/v2/engine/bin.*/bjam \ @@ -43,7 +43,7 @@ -sEXPAT_LIBPATH='$(HOST_LIBDIR)' \ stage install - '$(TARGET)-g++' \ + '$(MXE_CXX)' \ -W -Wall -Werror -ansi -U__STRICT_ANSI__ -pedantic \ '$(2).cpp' -o '$(HOST_BINDIR)/test-boost.exe' \ -DBOOST_THREAD_USE_LIB \
--- a/src/bzip2.mk Sat Jun 08 20:53:29 2013 -0400 +++ b/src/bzip2.mk Sun Jun 09 09:48:08 2013 -0400 @@ -29,7 +29,7 @@ $(INSTALL) -m644 '$(1)/bzlib.h' '$(HOST_INCDIR)' if [ $(BUILD_SHARED) = yes ]; then \ - $(MAKE_SHARED_FROM_STATIC) --ar '$(TARGET)-ar' --ld '$(TARGET)-gcc' '$(1)/libbz2.a' --install '$(INSTALL)' --libdir '$(HOST_LIBDIR)' --bindir '$(HOST_BINDIR)'; \ + $(MAKE_SHARED_FROM_STATIC) --ar '$(MXE_AR)' --ld '$(MXE_CC)' '$(1)/libbz2.a' --install '$(INSTALL)' --libdir '$(HOST_LIBDIR)' --bindir '$(HOST_BINDIR)'; \ fi if [ $(BUILD_STATIC) = yes ]; then \
--- a/src/cairo.mk Sat Jun 08 20:53:29 2013 -0400 +++ b/src/cairo.mk Sun Jun 09 09:48:08 2013 -0400 @@ -44,6 +44,6 @@ --enable-svg \ --disable-pthread \ CFLAGS="$(CFLAGS) -DCAIRO_WIN32_STATIC_BUILD" \ - LIBS="-lmsimg32 -lgdi32 `$(TARGET)-pkg-config pixman-1 --libs`" + LIBS="-lmsimg32 -lgdi32 `$(MXE_PKG_CONFIG) pixman-1 --libs`" $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= endef
--- a/src/cblas.mk Sat Jun 08 20:53:29 2013 -0400 +++ b/src/cblas.mk Sun Jun 09 09:48:08 2013 -0400 @@ -17,13 +17,13 @@ define $(PKG)_BUILD cp '$(1)/Makefile.LINUX' '$(1)/Makefile.MINGW32' $(SED) -i 's,CBDIR =.*,CBDIR = $(1),g' '$(1)/Makefile.MINGW32' - $(SED) -i 's,FC =.*,FC = $(TARGET)-gfortran,g' '$(1)/Makefile.MINGW32' + $(SED) -i 's,FC =.*,FC = $(MXE_CXX)fortran,g' '$(1)/Makefile.MINGW32' $(SED) -i 's, make , $(MAKE) ,g' '$(1)/Makefile' rm '$(1)/Makefile.in' $(LN_SF) '$(1)/Makefile.MINGW32' '$(1)/Makefile.in' mkdir '$(1)/MINGW32' $(MAKE) -C '$(1)' -j '$(JOBS)' alllib - cd '$(1)' && $(TARGET)-ar cr libcblas.a src/*.o + cd '$(1)' && $(MXE_AR) cr libcblas.a src/*.o $(INSTALL) -d '$(HOST_LIBDIR)' $(INSTALL) -m644 '$(1)/libcblas.a' '$(HOST_LIBDIR)'
--- a/src/curl.mk Sat Jun 08 20:53:29 2013 -0400 +++ b/src/curl.mk Sun Jun 09 09:48:08 2013 -0400 @@ -28,9 +28,9 @@ --with-libssh2 $(MAKE) -C '$(1)' -j '$(JOBS)' install -## '$(TARGET)-gcc' \ +## '$(MXE_CC)' \ ## -W -Wall -Werror -ansi -pedantic \ ## '$(2).c' -o '$(HOST_BINDIR)/test-curl.exe' \ -## `'$(TARGET)-pkg-config' libcurl --cflags --libs` +## `'$(MXE_PKG_CONFIG)' libcurl --cflags --libs` endef
--- a/src/dcmtk.mk Sat Jun 08 20:53:29 2013 -0400 +++ b/src/dcmtk.mk Sun Jun 09 09:48:08 2013 -0400 @@ -27,9 +27,9 @@ --with-libxmlinc='$(HOST_PREFIX)' \ --with-zlib \ --without-libwrap \ - CXX='$(TARGET)-g++' \ - RANLIB='$(TARGET)-ranlib' \ - AR='$(TARGET)-ar' \ + CXX='$(MXE_CXX)' \ + RANLIB='$(MXE_RANLIB)' \ + AR='$(MXE_AR)' \ ARFLAGS=cru \ LIBTOOL=$(LIBTOOL) \ ac_cv_my_c_rightshift_unsigned=no
--- a/src/ffmpeg.mk Sat Jun 08 20:53:29 2013 -0400 +++ b/src/ffmpeg.mk Sun Jun 09 09:48:08 2013 -0400 @@ -17,9 +17,9 @@ endef define $(PKG)_BUILD - '$(SED)' -i "s^[-]lvpx^`'$(TARGET)'-pkg-config --libs-only-l vpx`^g;" $(1)/configure + '$(SED)' -i "s^[-]lvpx^`'$(MXE_PKG_CONFIG)' --libs-only-l vpx`^g;" $(1)/configure cd '$(1)' && ./configure \ - --cross-prefix='$(TARGET)'- \ + --cross-prefix='$(MXE_TOOL_PREFIX)' \ --enable-cross-compile \ --arch=i686 \ --target-os=mingw32 \
--- a/src/file.mk Sat Jun 08 20:53:29 2013 -0400 +++ b/src/file.mk Sun Jun 09 09:48:08 2013 -0400 @@ -33,7 +33,7 @@ $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= man_MANS= FILE_COMPILE='$(1).native/src/file' $(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= man_MANS= - '$(TARGET)-gcc' \ + '$(MXE_CC)' \ -W -Wall -Werror -ansi -pedantic \ '$(2).c' -o '$(HOST_BINDIR)/test-file.exe' \ -lmagic -lgnurx -lshlwapi
--- a/src/fltk.mk Sat Jun 08 20:53:29 2013 -0400 +++ b/src/fltk.mk Sun Jun 09 09:48:08 2013 -0400 @@ -34,5 +34,5 @@ # enable exceptions, because disabling them doesn't make any sense on PCs $(SED) -i 's,-fno-exceptions,,' '$(1)/makeinclude' $(MAKE) -C '$(1)' -j '$(JOBS)' install DIRS=src LIBCOMMAND='$(MXE_AR) cr' - $(LN_SF) '$(HOST_BINDIR)/fltk-config' '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-fltk-config' + $(LN_SF) '$(HOST_BINDIR)/fltk-config' '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)fltk-config' endef
--- a/src/freeglut.mk Sat Jun 08 20:53:29 2013 -0400 +++ b/src/freeglut.mk Sun Jun 09 09:48:08 2013 -0400 @@ -27,8 +27,8 @@ --without-x $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= EXPORT_FLAGS='-DFREEGLUT_STATIC' - '$(TARGET)-gcc' \ + '$(MXE_CC)' \ -W -Wall -Werror -ansi -pedantic \ '$(2).c' -o '$(HOST_BINDIR)/test-freeglut.exe' \ - `'$(TARGET)-pkg-config' glut --cflags --libs` + `'$(MXE_PKG_CONFIG)' glut --cflags --libs` endef
--- a/src/freeimage.mk Sat Jun 08 20:53:29 2013 -0400 +++ b/src/freeimage.mk Sun Jun 09 09:48:08 2013 -0400 @@ -19,16 +19,16 @@ $(SED) -i 's,install ,$(INSTALL) ,' '$(1)'/Makefile.gnu $(MAKE) -C '$(1)' -j '$(JOBS)' -f Makefile.gnu \ - CXX='$(TARGET)-g++' \ - CC='$(TARGET)-gcc' \ - AR='$(TARGET)-ar' \ + CXX='$(MXE_CXX)' \ + CC='$(MXE_CC)' \ + AR='$(MXE_AR)' \ INCDIR='$(HOST_INCDIR)' \ INSTALLDIR='$(HOST_LIBDIR)' $(MAKE) -C '$(1)' -j '$(JOBS)' -f Makefile.gnu install \ - CXX='$(TARGET)-g++' \ - CC='$(TARGET)-gcc' \ - AR='$(TARGET)-ar' \ + CXX='$(MXE_CXX)' \ + CC='$(MXE_CC)' \ + AR='$(MXE_AR)' \ INCDIR='$(HOST_INCDIR)' \ INSTALLDIR='$(HOST_LIBDIR)' endef
--- a/src/gcc.mk Sat Jun 08 20:53:29 2013 -0400 +++ b/src/gcc.mk Sun Jun 09 09:48:08 2013 -0400 @@ -101,8 +101,8 @@ # create pkg-config script (echo '#!/bin/sh'; \ echo 'PKG_CONFIG_PATH="$$PKG_CONFIG_PATH_$(subst -,_,$(TARGET))" PKG_CONFIG_LIBDIR='\''$(HOST_LIBDIR)/pkgconfig'\'' exec pkg-config $($(PKG)_STATIC_FLAG) "$$@"') \ - > '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-pkg-config' - chmod 0755 '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-pkg-config' + > '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)pkg-config' + chmod 0755 '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)pkg-config' # create the CMake toolchain file [ -d '$(dir $(CMAKE_TOOLCHAIN_FILE))' ] || mkdir -p '$(dir $(CMAKE_TOOLCHAIN_FILE))' @@ -123,12 +123,12 @@ echo 'set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)'; \ echo 'set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)'; \ echo 'set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)'; \ - echo 'set(CMAKE_C_COMPILER $(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-gcc)'; \ - echo 'set(CMAKE_CXX_COMPILER $(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-g++)'; \ - echo 'set(CMAKE_Fortran_COMPILER $(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-gfortran)'; \ - echo 'set(CMAKE_RC_COMPILER $(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-windres)'; \ - echo 'set(PKG_CONFIG_EXECUTABLE $(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-pkg-config)'; \ - echo 'set(QT_QMAKE_EXECUTABLE $(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-qmake)'; \ + echo 'set(CMAKE_C_COMPILER $(MXE_CC))'; \ + echo 'set(CMAKE_CXX_COMPILER $(MXE_CXX))'; \ + echo 'set(CMAKE_Fortran_COMPILER $(MXE_F77))'; \ + echo 'set(CMAKE_RC_COMPILER $(MXE_WINDRES))'; \ + echo 'set(PKG_CONFIG_EXECUTABLE $(MXE_PKG_CONFIG))'; \ + echo 'set(QT_QMAKE_EXECUTABLE $(MXE_QMAKE))'; \ echo 'set(CMAKE_INSTALL_PREFIX $(HOST_PREFIX) CACHE PATH "Installation Prefix")'; \ echo 'set(CMAKE_BUILD_TYPE Release CACHE STRING "Debug|Release|RelWithDebInfo|MinSizeRel")') \ > '$(CMAKE_TOOLCHAIN_FILE)'
--- a/src/gd.mk Sat Jun 08 20:53:29 2013 -0400 +++ b/src/gd.mk Sun Jun 09 09:48:08 2013 -0400 @@ -38,7 +38,7 @@ LIBS="`$(HOST_BINDIR)/xml2-config --libs`" $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= - '$(TARGET)-gcc' \ + '$(MXE_CC)' \ -W -Wall -Werror -ansi -pedantic \ '$(2).c' -o '$(HOST_BINDIR)/test-gd.exe' \ `'$(HOST_BINDIR)/gdlib-config' --cflags` \
--- a/src/gdal.mk Sat Jun 08 20:53:29 2013 -0400 +++ b/src/gdal.mk Sun Jun 09 09:48:08 2013 -0400 @@ -39,7 +39,7 @@ --with-sqlite3='$(HOST_PREFIX)' \ --with-curl='$(HOST_BINDIR)/curl-config' \ --with-geos='$(HOST_BINDIR)/geos-config' \ - --with-pg='$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-pg_config' \ + --with-pg='$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)pg_config' \ --with-gta='$(HOST_PREFIX)' \ --without-odbc \ --without-static-proj4 \ @@ -72,7 +72,7 @@ --without-php \ --without-ruby \ --without-python \ - LIBS="-ljpeg -lsecur32 `'$(TARGET)-pkg-config' --libs openssl libtiff-4`" + LIBS="-ljpeg -lsecur32 `'$(MXE_PKG_CONFIG)' --libs openssl libtiff-4`" $(MAKE) -C '$(1)' -j 1 lib-target $(MAKE) -C '$(1)' -j 1 install-lib $(MAKE) -C '$(1)/port' -j 1 install @@ -81,5 +81,5 @@ $(MAKE) -C '$(1)/alg' -j 1 install $(MAKE) -C '$(1)/ogr' -j 1 install OGR_ENABLED= $(MAKE) -C '$(1)/apps' -j 1 install BIN_LIST= - $(LN_SF) '$(HOST_BINDIR)/gdal-config' '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-gdal-config' + $(LN_SF) '$(HOST_BINDIR)/gdal-config' '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)gdal-config' endef
--- a/src/gdk-pixbuf.mk Sat Jun 08 20:53:29 2013 -0400 +++ b/src/gdk-pixbuf.mk Sun Jun 09 09:48:08 2013 -0400 @@ -25,6 +25,6 @@ --disable-modules \ --with-included-loaders \ --without-gdiplus \ - LIBS="`'$(TARGET)-pkg-config' --libs libtiff-4`" + LIBS="`'$(MXE_PKG_CONFIG)' --libs libtiff-4`" $(MAKE) -C '$(1)' -j '$(JOBS)' install endef
--- a/src/geos.mk Sat Jun 08 20:53:29 2013 -0400 +++ b/src/geos.mk Sun Jun 09 09:48:08 2013 -0400 @@ -23,7 +23,7 @@ --prefix='$(HOST_PREFIX)' $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= - '$(TARGET)-gcc' \ + '$(MXE_CC)' \ -W -Wall -Werror -ansi -pedantic \ '$(2).c' -o '$(HOST_BINDIR)/test-geos.exe' \ -lgeos_c `'$(HOST_BINDIR)/geos-config' --cflags --libs` -lstdc++
--- a/src/glew.mk Sat Jun 08 20:53:29 2013 -0400 +++ b/src/glew.mk Sun Jun 09 09:48:08 2013 -0400 @@ -17,9 +17,9 @@ define $(PKG)_BUILD # Build libGLEW - cd '$(1)' && $(TARGET)-gcc -O2 -DGLEW_STATIC -Iinclude -c -o glew.o src/glew.c - cd '$(1)' && $(TARGET)-ar cr libGLEW.a glew.o - $(TARGET)-ranlib '$(1)/libGLEW.a' + cd '$(1)' && $(MXE_CC) -O2 -DGLEW_STATIC -Iinclude -c -o glew.o src/glew.c + cd '$(1)' && $(MXE_AR) cr libGLEW.a glew.o + $(MXE_RANLIB) '$(1)/libGLEW.a' $(SED) \ -e "s|@prefix@|$(HOST_PREFIX)|g" \ -e "s|@libdir@|$(HOST_LIBDIR)|g" \ @@ -31,9 +31,9 @@ < '$(1)'/glew.pc.in > '$(1)'/glew.pc # Build libGLEWmx - cd '$(1)' && $(TARGET)-gcc -O2 -DGLEW_STATIC -DGLEW_MX -Iinclude -c -o glewmx.o src/glew.c - cd '$(1)' && $(TARGET)-ar cr libGLEWmx.a glewmx.o - $(TARGET)-ranlib '$(1)/libGLEWmx.a' + cd '$(1)' && $(MXE_CC) -O2 -DGLEW_STATIC -DGLEW_MX -Iinclude -c -o glewmx.o src/glew.c + cd '$(1)' && $(MXE_AR) cr libGLEWmx.a glewmx.o + $(MXE_RANLIB) '$(1)/libGLEWmx.a' $(SED) \ -e "s|@prefix@|$(HOST_PREFIX)|g" \ -e "s|@libdir@|$(HOST_LIBDIR)|g" \ @@ -57,12 +57,12 @@ $(INSTALL) -m644 '$(1)/include/GL/glew.h' '$(1)/include/GL/wglew.h' '$(HOST_INCDIR)/GL/' # Test - '$(TARGET)-gcc' \ + '$(MXE_CC)' \ -W -Wall -Werror -ansi -pedantic \ '$(2).c' -o '$(HOST_BINDIR)/test-glew.exe' \ - `'$(TARGET)-pkg-config' glew --cflags --libs` - '$(TARGET)-gcc' \ + `'$(MXE_PKG_CONFIG)' glew --cflags --libs` + '$(MXE_CC)' \ -W -Wall -Werror -ansi -pedantic \ '$(2).c' -o '$(HOST_BINDIR)/test-glewmx.exe' \ - `'$(TARGET)-pkg-config' glewmx --cflags --libs` + `'$(MXE_PKG_CONFIG)' glewmx --cflags --libs` endef
--- a/src/glib.mk Sat Jun 08 20:53:29 2013 -0400 +++ b/src/glib.mk Sun Jun 09 09:48:08 2013 -0400 @@ -76,8 +76,8 @@ --with-pcre=system \ --with-libiconv=gnu \ --disable-inotify \ - CXX='$(TARGET)-c++' \ - PKG_CONFIG='$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-pkg-config' \ + CXX='$(MXE_CXX)' \ + PKG_CONFIG='$(MXE_PKG_CONFIG)' \ GLIB_GENMARSHAL='$(HOST_BINDIR)/glib-genmarshal' \ GLIB_COMPILE_SCHEMAS='$(HOST_BINDIR)/glib-compile-schemas' \ GLIB_COMPILE_RESOURCES='$(HOST_BINDIR)/glib-compile-resources'
--- a/src/glibmm.mk Sat Jun 08 20:53:29 2013 -0400 +++ b/src/glibmm.mk Sun Jun 09 09:48:08 2013 -0400 @@ -21,8 +21,8 @@ $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(HOST_PREFIX)' \ - CXX='$(TARGET)-c++' \ - PKG_CONFIG='$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-pkg-config' \ + CXX='$(MXE_CXX)' \ + PKG_CONFIG='$(MXE_PKG_CONFIG)' \ GLIB_COMPILE_SCHEMAS='$(HOST_BINDIR)/glib-compile-schemas' \ MAKE=$(MAKE) $(MAKE) -C '$(1)/gio/src' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= MISC_STUFF=
--- a/src/gsl.mk Sat Jun 08 20:53:29 2013 -0400 +++ b/src/gsl.mk Sun Jun 09 09:48:08 2013 -0400 @@ -24,7 +24,7 @@ $(MAKE) -C '$(1)' -j '$(JOBS)' $(MAKE) -C '$(1)' -j 1 install - '$(TARGET)-gcc' \ + '$(MXE_CC)' \ -W -Wall -Werror -ansi -pedantic \ '$(2).c' -o '$(HOST_BINDIR)/test-gsl.exe' \ -lgsl
--- a/src/gsoap.mk Sat Jun 08 20:53:29 2013 -0400 +++ b/src/gsoap.mk Sun Jun 09 09:48:08 2013 -0400 @@ -27,13 +27,13 @@ $(MAKE) -C '$(1)'/gsoap -j '$(JOBS)' # Install the native tools manually - $(INSTALL) -m755 '$(1)'/gsoap/wsdl/wsdl2h '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-wsdl2h' - $(INSTALL) -m755 '$(1)'/gsoap/src/soapcpp2 '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-soapcpp2' + $(INSTALL) -m755 '$(1)'/gsoap/wsdl/wsdl2h '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)wsdl2h' + $(INSTALL) -m755 '$(1)'/gsoap/src/soapcpp2 '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)soapcpp2' $(MAKE) -C '$(1)' -j '$(JOBS)' clean # fix hard-coded gnutls dependencies - $(SED) -i "s/-lgnutls/`'$(TARGET)-pkg-config' --libs-only-l gnutls`/g;" '$(1)/configure' + $(SED) -i "s/-lgnutls/`'$(MXE_PKG_CONFIG)' --libs-only-l gnutls`/g;" '$(1)/configure' # Build for mingw. Static by default. # Prevent undefined reference to _rpl_malloc. @@ -45,11 +45,11 @@ CPPFLAGS='-DWITH_NTLM' # Building for mingw requires native soapcpp2 - $(LN_SF) '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-soapcpp2' '$(1)/gsoap/src/soapcpp2' + $(LN_SF) '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)soapcpp2' '$(1)/gsoap/src/soapcpp2' # Work around parallel build problem - $(MAKE) -C '$(1)'/gsoap/src -j '$(JOBS)' soapcpp2_yacc.h AR='$(TARGET)-ar' - $(MAKE) -C '$(1)' -j '$(JOBS)' AR='$(TARGET)-ar' + $(MAKE) -C '$(1)'/gsoap/src -j '$(JOBS)' soapcpp2_yacc.h AR='$(MXE_AR)' + $(MAKE) -C '$(1)' -j '$(JOBS)' AR='$(MXE_AR)' $(MAKE) -C '$(1)' -j '$(JOBS)' install # Apparently there is a tradition of compiling gsoap source files into applications.
--- a/src/gta.mk Sat Jun 08 20:53:29 2013 -0400 +++ b/src/gta.mk Sun Jun 09 09:48:08 2013 -0400 @@ -25,8 +25,8 @@ $(MAKE) -C '$(1)' -j '$(JOBS)' $(MAKE) -C '$(1)' -j 1 install dist_doc_DATA= - '$(TARGET)-gcc' \ + '$(MXE_CC)' \ -W -Wall -Werror -ansi -pedantic \ '$(2).c' -o '$(HOST_BINDIR)/test-gta.exe' \ - `'$(TARGET)-pkg-config' gta --cflags --libs` + `'$(MXE_PKG_CONFIG)' gta --cflags --libs` endef
--- a/src/gtk2.mk Sat Jun 08 20:53:29 2013 -0400 +++ b/src/gtk2.mk Sun Jun 09 09:48:08 2013 -0400 @@ -34,8 +34,8 @@ --without-x $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= - '$(TARGET)-gcc' \ + '$(MXE_CC)' \ -W -Wall -Werror -ansi -pedantic \ '$(2).c' -o '$(HOST_BINDIR)/test-gtk2.exe' \ - `'$(TARGET)-pkg-config' gtk+-2.0 --cflags --libs` + `'$(MXE_PKG_CONFIG)' gtk+-2.0 --cflags --libs` endef
--- a/src/gtkglext.mk Sat Jun 08 20:53:29 2013 -0400 +++ b/src/gtkglext.mk Sun Jun 09 09:48:08 2013 -0400 @@ -33,11 +33,11 @@ sbin_PROGRAMS= \ noinst_PROGRAMS= \ INFO_DEPS= \ - GDKGLEXT_DEP_CFLAGS='`'$(TARGET)-pkg-config' gtk+-2.0 --cflags`' \ - GTKGLEXT_DEP_CFLAGS='`'$(TARGET)-pkg-config' gtk+-2.0 --cflags`' + GDKGLEXT_DEP_CFLAGS='`'$(MXE_PKG_CONFIG)' gtk+-2.0 --cflags`' \ + GTKGLEXT_DEP_CFLAGS='`'$(MXE_PKG_CONFIG)' gtk+-2.0 --cflags`' - '$(TARGET)-gcc' \ + '$(MXE_CC)' \ -W -Wall -ansi -pedantic \ '$(2).c' -o '$(HOST_BINDIR)/test-gtkglext.exe' \ - `'$(TARGET)-pkg-config' gtkglext-1.0 --cflags --libs` + `'$(MXE_PKG_CONFIG)' gtkglext-1.0 --cflags --libs` endef
--- a/src/gtkglextmm.mk Sat Jun 08 20:53:29 2013 -0400 +++ b/src/gtkglextmm.mk Sun Jun 09 09:48:08 2013 -0400 @@ -28,8 +28,8 @@ noinst_PROGRAMS= \ INFO_DEPS= - '$(TARGET)-g++' \ + '$(MXE_CXX)' \ -W -Wall -Werror -pedantic -std=c++0x \ '$(2).cpp' -o '$(HOST_BINDIR)/test-gtkglextmm.exe' \ - `'$(TARGET)-pkg-config' gtkglextmm-1.2 --cflags --libs` + `'$(MXE_PKG_CONFIG)' gtkglextmm-1.2 --cflags --libs` endef
--- a/src/gtkmm2.mk Sat Jun 08 20:53:29 2013 -0400 +++ b/src/gtkmm2.mk Sun Jun 09 09:48:08 2013 -0400 @@ -27,8 +27,8 @@ $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= $(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= doc_install='# DISABLED: doc-install.pl' - '$(TARGET)-g++' \ + '$(MXE_CXX)' \ -W -Wall -Werror -pedantic -std=c++0x \ '$(2).cpp' -o '$(HOST_BINDIR)/test-gtkmm2.exe' \ - `'$(TARGET)-pkg-config' gtkmm-2.4 --cflags --libs` + `'$(MXE_PKG_CONFIG)' gtkmm-2.4 --cflags --libs` endef
--- a/src/guile.mk Sat Jun 08 20:53:29 2013 -0400 +++ b/src/guile.mk Sun Jun 09 09:48:08 2013 -0400 @@ -31,8 +31,8 @@ $(MAKE) -C '$(1)' -j '$(JOBS)' schemelib_DATA= $(MAKE) -C '$(1)' -j 1 install schemelib_DATA= - '$(TARGET)-gcc' \ + '$(MXE_CC)' \ -W -Wall -Werror -ansi -pedantic \ '$(2).c' -o '$(HOST_BINDIR)/test-guile.exe' \ - `'$(TARGET)-pkg-config' guile-1.8 --cflags --libs` + `'$(MXE_PKG_CONFIG)' guile-1.8 --cflags --libs` endef
--- a/src/hunspell.mk Sat Jun 08 20:53:29 2013 -0400 +++ b/src/hunspell.mk Sun Jun 09 09:48:08 2013 -0400 @@ -28,8 +28,8 @@ # Test - '$(TARGET)-g++' \ + '$(MXE_CXX)' \ -W -Wall -Werror -ansi -pedantic \ '$(2).cpp' -o '$(HOST_BINDIR)/test-hunspell.exe' \ - `'$(TARGET)-pkg-config' hunspell --cflags --libs` + `'$(MXE_PKG_CONFIG)' hunspell --cflags --libs` endef
--- a/src/json-c.mk Sat Jun 08 20:53:29 2013 -0400 +++ b/src/json-c.mk Sun Jun 09 09:48:08 2013 -0400 @@ -24,8 +24,8 @@ CFLAGS=-Wno-error $(MAKE) -C '$(1)' -j '$(JOBS)' install - '$(TARGET)-gcc' \ + '$(MXE_CC)' \ -W -Wall -Werror -ansi -pedantic \ '$(2).c' -o '$(HOST_BINDIR)/test-json-c.exe' \ - `'$(TARGET)-pkg-config' json --cflags --libs` + `'$(MXE_PKG_CONFIG)' json --cflags --libs` endef
--- a/src/levmar.mk Sat Jun 08 20:53:29 2013 -0400 +++ b/src/levmar.mk Sun Jun 09 09:48:08 2013 -0400 @@ -17,9 +17,9 @@ define $(PKG)_BUILD $(MAKE) -C '$(1)' -j '$(JOBS)' liblevmar.a \ - CC=$(TARGET)-gcc \ - AR=$(TARGET)-ar \ - RANLIB=$(TARGET)-ranlib + CC=$(MXE_CC) \ + AR=$(MXE_AR) \ + RANLIB=$(MXE_RANLIB) $(INSTALL) -m644 '$(1)/levmar.h' '$(HOST_INCDIR)' $(INSTALL) -m644 '$(1)/liblevmar.a' '$(HOST_LIBDIR)' endef
--- a/src/libarchive.mk Sat Jun 08 20:53:29 2013 -0400 +++ b/src/libarchive.mk Sun Jun 09 09:48:08 2013 -0400 @@ -28,8 +28,8 @@ $(MAKE) -C '$(1)' -j '$(JOBS)' man_MANS= $(MAKE) -C '$(1)' -j 1 install man_MANS= - '$(TARGET)-gcc' \ + '$(MXE_CC)' \ -W -Wall -Werror -ansi -pedantic \ '$(2).c' -o '$(HOST_BINDIR)/test-libarchive.exe' \ - `'$(TARGET)-pkg-config' --libs-only-l libarchive` + `'$(MXE_PKG_CONFIG)' --libs-only-l libarchive` endef
--- a/src/libass.mk Sat Jun 08 20:53:29 2013 -0400 +++ b/src/libass.mk Sun Jun 09 09:48:08 2013 -0400 @@ -25,8 +25,8 @@ $(MAKE) -C '$(1)' -j '$(JOBS)' $(MAKE) -C '$(1)' -j 1 install - '$(TARGET)-gcc' \ + '$(MXE_CC)' \ -W -Wall -Werror -ansi -pedantic \ '$(2).c' -o '$(HOST_BINDIR)/test-libass.exe' \ - `'$(TARGET)-pkg-config' libass --cflags --libs` + `'$(MXE_PKG_CONFIG)' libass --cflags --libs` endef
--- a/src/libf2c.mk Sat Jun 08 20:53:29 2013 -0400 +++ b/src/libf2c.mk Sun Jun 09 09:48:08 2013 -0400 @@ -15,10 +15,10 @@ define $(PKG)_BUILD $(MAKE) -C '$(1)' -j '$(JOBS)' -f makefile.u \ - CC=$(TARGET)-gcc \ - AR=$(TARGET)-ar \ - LD=$(TARGET)-ld \ - RANLIB=$(TARGET)-ranlib \ + CC=$(MXE_CC) \ + AR=$(MXE_AR) \ + LD=$(MXE_LD) \ + RANLIB=$(MXE_RANLIB) \ CFLAGS='-O -DUSE_CLOCK' $(INSTALL) -m644 '$(1)/libf2c.a' '$(HOST_LIBDIR)' $(INSTALL) -m644 '$(1)/f2c.h' '$(HOST_INCDIR)'
--- a/src/libffi.mk Sat Jun 08 20:53:29 2013 -0400 +++ b/src/libffi.mk Sun Jun 09 09:48:08 2013 -0400 @@ -24,8 +24,8 @@ $(MAKE) -C '$(1)/$(TARGET)' -j '$(JOBS)' $(MAKE) -C '$(1)/$(TARGET)' -j 1 install - '$(TARGET)-gcc' \ + '$(MXE_CC)' \ -W -Wall -Werror -std=c99 -pedantic \ '$(2).c' -o '$(HOST_BINDIR)/test-libffi.exe' \ - `'$(TARGET)-pkg-config' libffi --cflags --libs` + `'$(MXE_PKG_CONFIG)' libffi --cflags --libs` endef
--- a/src/libgcrypt.mk Sat Jun 08 20:53:29 2013 -0400 +++ b/src/libgcrypt.mk Sun Jun 09 09:48:08 2013 -0400 @@ -28,5 +28,5 @@ $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(HOST_PREFIX)' $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= - $(LN_SF) '$(HOST_BINDIR)/libgcrypt-config' '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-libgcrypt-config' + $(LN_SF) '$(HOST_BINDIR)/libgcrypt-config' '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)libgcrypt-config' endef
--- a/src/libgdamm.mk Sat Jun 08 20:53:29 2013 -0400 +++ b/src/libgdamm.mk Sun Jun 09 09:48:08 2013 -0400 @@ -20,8 +20,8 @@ $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(HOST_PREFIX)' \ - CXX='$(TARGET)-c++' \ - PKG_CONFIG='$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-pkg-config' \ + CXX='$(MXE_CXX)' \ + PKG_CONFIG='$(MXE_PKG_CONFIG)' \ MAKE=$(MAKE) $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= endef
--- a/src/libgeotiff.mk Sat Jun 08 20:53:29 2013 -0400 +++ b/src/libgeotiff.mk Sun Jun 09 09:48:08 2013 -0400 @@ -23,7 +23,7 @@ $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(HOST_PREFIX)' \ - LIBS="`'$(TARGET)-pkg-config' --libs libtiff-4` -ljpeg -lz" + LIBS="`'$(MXE_PKG_CONFIG)' --libs libtiff-4` -ljpeg -lz" $(MAKE) -C '$(1)' -j 1 all install EXEEXT=.remove-me MAKE='$(MAKE)' rm -fv '$(HOST_BINDIR)'/*.remove-me endef
--- a/src/libglade.mk Sat Jun 08 20:53:29 2013 -0400 +++ b/src/libglade.mk Sun Jun 09 09:48:08 2013 -0400 @@ -20,7 +20,7 @@ $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(HOST_PREFIX)' \ - PKG_CONFIG='$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-pkg-config' + PKG_CONFIG='$(MXE_PKG_CONFIG)' $(MAKE) -C '$(1)' -j '$(JOBS)' $(MAKE) -C '$(1)' -j 1 install-exec endef
--- a/src/libgomp.mk Sat Jun 08 20:53:29 2013 -0400 +++ b/src/libgomp.mk Sun Jun 09 09:48:08 2013 -0400 @@ -26,7 +26,7 @@ LIBS='-lws2_32' $(MAKE) -C '$(1)/build/$(TARGET)/libgomp' -j '$(JOBS)' install - '$(TARGET)-gcc' \ + '$(MXE_CC)' \ -W -Wall -Werror -ansi -pedantic \ '$(2).c' -o '$(HOST_BINDIR)/test-libgomp.exe' \ -fopenmp
--- a/src/libgpg_error.mk Sat Jun 08 20:53:29 2013 -0400 +++ b/src/libgpg_error.mk Sun Jun 09 09:48:08 2013 -0400 @@ -25,5 +25,5 @@ --disable-languages $(MAKE) -C '$(1)/src' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= $(MAKE) -C '$(1)/src' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= - $(LN_SF) '$(HOST_BINDIR)/gpg-error-config' '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-gpg-error-config' + $(LN_SF) '$(HOST_BINDIR)/gpg-error-config' '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)gpg-error-config' endef
--- a/src/libgsasl.mk Sat Jun 08 20:53:29 2013 -0400 +++ b/src/libgsasl.mk Sun Jun 09 09:48:08 2013 -0400 @@ -28,8 +28,8 @@ --with-libntlm-prefix='$(HOST_PREFIX)' $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= - '$(TARGET)-gcc' \ + '$(MXE_CC)' \ -W -Wall -Werror -ansi -pedantic \ '$(2).c' -o '$(HOST_BINDIR)/test-libgsasl.exe' \ - `'$(TARGET)-pkg-config' libgsasl --cflags --libs` + `'$(MXE_PKG_CONFIG)' libgsasl --cflags --libs` endef
--- a/src/libgsf.mk Sat Jun 08 20:53:29 2013 -0400 +++ b/src/libgsf.mk Sun Jun 09 09:48:08 2013 -0400 @@ -30,7 +30,7 @@ --with-zlib \ --with-bz2 \ --with-gio \ - PKG_CONFIG='$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-pkg-config' + PKG_CONFIG='$(MXE_PKG_CONFIG)' $(MAKE) -C '$(1)' -j '$(JOBS)' install-pkgconfigDATA $(MAKE) -C '$(1)/gsf' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= endef
--- a/src/libiberty.mk Sat Jun 08 20:53:29 2013 -0400 +++ b/src/libiberty.mk Sun Jun 09 09:48:08 2013 -0400 @@ -23,7 +23,7 @@ $(MAKE) -C '$(1)' -j '$(JOBS)' $(MAKE) -C '$(1)' -j 1 install target_header_dir=libiberty - '$(TARGET)-gcc' \ + '$(MXE_CC)' \ -W -Wall -Werror -ansi -pedantic \ '$(2).c' -o '$(HOST_BINDIR)/test-libiberty.exe' \ -I$(HOST_INCDIR)/libiberty -liberty
--- a/src/libical.mk Sat Jun 08 20:53:29 2013 -0400 +++ b/src/libical.mk Sun Jun 09 09:48:08 2013 -0400 @@ -25,8 +25,8 @@ $(MAKE) -C '$(1)/build' -j '$(JOBS)' $(MAKE) -C '$(1)/build' -j 1 install - '$(TARGET)-gcc' \ + '$(MXE_CC)' \ -W -Wall -Werror -ansi -pedantic \ '$(2).c' -o '$(HOST_BINDIR)/test-libical.exe' \ - `'$(TARGET)-pkg-config' libical --cflags --libs` + `'$(MXE_PKG_CONFIG)' libical --cflags --libs` endef
--- a/src/libircclient.mk Sat Jun 08 20:53:29 2013 -0400 +++ b/src/libircclient.mk Sun Jun 09 09:48:08 2013 -0400 @@ -33,7 +33,7 @@ $(INSTALL) -m644 '$(1)/include/libirc_rfcnumeric.h' '$(HOST_INCDIR)/libircclient' $(INSTALL) -m644 '$(1)/include/libirc_options.h' '$(HOST_INCDIR)/libircclient' - '$(TARGET)-g++' \ + '$(MXE_CXX)' \ -W -Wall -Werror -ansi -pedantic \ '$(2).cpp' -o '$(HOST_BINDIR)/test-libircclient.exe' \ -lircclient -lws2_32
--- a/src/libmikmod.mk Sat Jun 08 20:53:29 2013 -0400 +++ b/src/libmikmod.mk Sun Jun 09 09:48:08 2013 -0400 @@ -19,10 +19,10 @@ $(SED) -i 's,-Dunix,,' '$(1)/libmikmod/Makefile.in' $(SED) -i 's,`uname`,MinGW,g' '$(1)/configure' cd '$(1)' && \ - CC='$(TARGET)-gcc' \ - NM='$(TARGET)-nm' \ - RANLIB='$(TARGET)-ranlib' \ - STRIP='$(TARGET)-strip' \ + CC='$(MXE_CC)' \ + NM='$(MXE_NM)' \ + RANLIB='$(MXE_RANLIB)' \ + STRIP='$(MXE_STRIP)' \ ./configure \ $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(HOST_PREFIX)' \ @@ -30,7 +30,7 @@ --disable-esd $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= - '$(TARGET)-gcc' \ + '$(MXE_CC)' \ -W -Wall -Werror -std=c99 -pedantic \ '$(2).c' -o '$(HOST_BINDIR)/test-libmikmod.exe' \ `'$(HOST_BINDIR)/libmikmod-config' --cflags --libs`
--- a/src/libmodplug.mk Sat Jun 08 20:53:29 2013 -0400 +++ b/src/libmodplug.mk Sun Jun 09 09:48:08 2013 -0400 @@ -23,8 +23,8 @@ --prefix='$(HOST_PREFIX)' $(MAKE) -C '$(1)' -j '$(JOBS)' install - '$(TARGET)-gcc' \ + '$(MXE_CC)' \ -W -Wall -ansi -pedantic \ '$(2).c' -o '$(HOST_BINDIR)/test-libmodplug.exe' \ - `'$(TARGET)-pkg-config' libmodplug --cflags --libs` + `'$(MXE_PKG_CONFIG)' libmodplug --cflags --libs` endef
--- a/src/liboauth.mk Sat Jun 08 20:53:29 2013 -0400 +++ b/src/liboauth.mk Sun Jun 09 09:48:08 2013 -0400 @@ -24,8 +24,8 @@ $(MAKE) -C '$(1)' -j '$(JOBS)' $(MAKE) -C '$(1)' -j 1 install - '$(TARGET)-gcc' \ + '$(MXE_CC)' \ -W -Wall -Werror -ansi -pedantic \ '$(2).c' -o '$(HOST_BINDIR)/test-liboauth.exe' \ - `'$(TARGET)-pkg-config' oauth --cflags --libs` + `'$(MXE_PKG_CONFIG)' oauth --cflags --libs` endef
--- a/src/libpano13.mk Sat Jun 08 20:53:29 2013 -0400 +++ b/src/libpano13.mk Sun Jun 09 09:48:08 2013 -0400 @@ -17,7 +17,7 @@ define $(PKG)_BUILD $(SED) -i 's,WINDOWSX\.H,windowsx.h,' '$(1)/sys_win.h' - $(SED) -i 's,\$${WINDRES-windres},$(TARGET)-windres,' '$(1)/build/win32/compile-resource' + $(SED) -i 's,\$${WINDRES-windres},$(MXE_WINDRES),' '$(1)/build/win32/compile-resource' $(SED) -i 's,m4 -DBUILDNUMBER=\$$buildnumber,$(SED) "s/BUILDNUMBER/\$$buildnumber/g",' '$(1)/build/win32/compile-resource' $(SED) -i 's,\(@HAVE_MINGW_TRUE@am__objects_4 = .*\),\1 ppm.lo,' '$(1)/Makefile.in' $(SED) -i 's,\(@HAVE_MINGW_TRUE@WIN_SRC = .*\),\1 ppm.c,' '$(1)/Makefile.in' @@ -30,6 +30,6 @@ --with-tiff='$(HOST_LIBDIR)' \ --with-png='$(HOST_LIBDIR)' \ --with-zlib='$(HOST_LIBDIR)' \ - LIBS="`'$(TARGET)-pkg-config' --libs libtiff-4`" + LIBS="`'$(MXE_PKG_CONFIG)' --libs libtiff-4`" $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= man_MANS= endef
--- a/src/librsvg.mk Sat Jun 08 20:53:29 2013 -0400 +++ b/src/librsvg.mk Sun Jun 09 09:48:08 2013 -0400 @@ -26,8 +26,8 @@ --enable-introspection=no $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= - '$(TARGET)-gcc' \ + '$(MXE_CC)' \ -W -Wall -Werror -ansi -pedantic \ '$(2).c' -o '$(HOST_BINDIR)/test-librsvg.exe' \ - `'$(TARGET)-pkg-config' librsvg-2.0 --cflags --libs` + `'$(MXE_PKG_CONFIG)' librsvg-2.0 --cflags --libs` endef
--- a/src/librtmp.mk Sat Jun 08 20:53:29 2013 -0400 +++ b/src/librtmp.mk Sun Jun 09 09:48:08 2013 -0400 @@ -16,7 +16,7 @@ define $(PKG)_BUILD $(MAKE) -C '$(1)' \ - CROSS_COMPILE='$(TARGET)-' \ + CROSS_COMPILE='$(MXE_TOOL_PREFIX)' \ prefix='$(HOST_PREFIX)' \ SYS=mingw \ CRYPTO=GNUTLS \
--- a/src/libsigc++.mk Sat Jun 08 20:53:29 2013 -0400 +++ b/src/libsigc++.mk Sun Jun 09 09:48:08 2013 -0400 @@ -21,8 +21,8 @@ $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(HOST_PREFIX)' \ - CXX='$(TARGET)-c++' \ - PKG_CONFIG='$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-pkg-config' \ + CXX='$(MXE_CXX)' \ + PKG_CONFIG='$(MXE_PKG_CONFIG)' \ MAKE=$(MAKE) $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= endef
--- a/src/libssh2.mk Sat Jun 08 20:53:29 2013 -0400 +++ b/src/libssh2.mk Sun Jun 09 09:48:08 2013 -0400 @@ -25,12 +25,12 @@ --prefix='$(HOST_PREFIX)' \ --without-openssl \ --with-libgcrypt \ - PKG_CONFIG='$(TARGET)-pkg-config' + PKG_CONFIG='$(MXE_PKG_CONFIG)' $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= html_DATA= -## '$(TARGET)-gcc' \ +## '$(MXE_CC)' \ ## -W -Wall -Werror -ansi -pedantic \ ## '$(2).c' -o '$(HOST_BINDIR)/test-libssh2.exe' \ -## `'$(TARGET)-pkg-config' --cflags --libs libssh2` +## `'$(MXE_PKG_CONFIG)' --cflags --libs libssh2` endef
--- a/src/libusb.mk Sat Jun 08 20:53:29 2013 -0400 +++ b/src/libusb.mk Sun Jun 09 09:48:08 2013 -0400 @@ -22,7 +22,7 @@ # don't actually build the library (DLL file), # just create the DLL import stubs $(MAKE) -C '$(1)' -j '$(JOBS)' host_prefix=$(TARGET) libusbd.a - cd '$(1)' && $(TARGET)-dlltool \ + cd '$(1)' && $(MXE_DLLTOOL) \ --dllname libusb0.dll \ --kill-at \ --add-stdcall-underscore \
--- a/src/libvpx.mk Sat Jun 08 20:53:29 2013 -0400 +++ b/src/libvpx.mk Sun Jun 09 09:48:08 2013 -0400 @@ -17,7 +17,7 @@ define $(PKG)_BUILD cd '$(1)' && \ - CROSS='$(TARGET)-' \ + CROSS='$(MXE_TOOL_PREFIX)' \ ./configure \ --prefix='$(HOST_PREFIX)' \ --target=x86-win32-gcc \ @@ -25,5 +25,5 @@ --disable-install-docs $(MAKE) -C '$(1)' -j '$(JOBS)' $(MAKE) -C '$(1)' -j 1 install - $(TARGET)-ranlib $(HOST_LIBDIR)/libvpx.a + $(MXE_RANLIB) $(HOST_LIBDIR)/libvpx.a endef
--- a/src/libxml++.mk Sat Jun 08 20:53:29 2013 -0400 +++ b/src/libxml++.mk Sun Jun 09 09:48:08 2013 -0400 @@ -17,7 +17,7 @@ endef define $(PKG)_BUILD - cd '$(1)' && CXX="$(TARGET)-g++ -mthreads" ./configure \ + cd '$(1)' && CXX="$(MXE_CXX) -mthreads" ./configure \ $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(HOST_PREFIX)' \
--- a/src/llvm.mk Sat Jun 08 20:53:29 2013 -0400 +++ b/src/llvm.mk Sun Jun 09 09:48:08 2013 -0400 @@ -29,7 +29,7 @@ --prefix='$(HOST_PREFIX)' PATH='$(HOST_BINDIR):$(PATH)' $(MAKE) -C '$(1)/build' -j $(JOBS) install - $(LN_SF) '$(HOST_BINDIR)/llvm-config' '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-llvm-config' + $(LN_SF) '$(HOST_BINDIR)/llvm-config' '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)llvm-config' endef else define $(PKG)_BUILD @@ -42,6 +42,6 @@ $(MAKE) -C '$(1)/build' -j $(JOBS) llvm-tblgen $(MAKE) -C '$(1)/build' -j $(JOBS) intrinsics_gen $(MAKE) -C '$(1)/build' -j $(JOBS) install - $(LN_SF) '$(HOST_BINDIR)/llvm-config' '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-llvm-config' + $(LN_SF) '$(HOST_BINDIR)/llvm-config' '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)llvm-config' endef endif
--- a/src/log4cxx.mk Sat Jun 08 20:53:29 2013 -0400 +++ b/src/log4cxx.mk Sun Jun 09 09:48:08 2013 -0400 @@ -29,8 +29,8 @@ mkdir -p '$(HOST_PREFIX)/share/cmake/log4cxx' cp '$(1)/log4cxx-config.cmake' '$(HOST_PREFIX)/share/cmake/log4cxx/log4cxx-config.cmake' - '$(TARGET)-g++' \ + '$(MXE_CXX)' \ -W -Wall -Werror -ansi -pedantic \ '$(2).cpp' -o '$(HOST_BINDIR)/test-log4cxx.exe' \ - `$(TARGET)-pkg-config liblog4cxx --libs` + `$(MXE_PKG_CONFIG) liblog4cxx --libs` endef
--- a/src/lua.mk Sat Jun 08 20:53:29 2013 -0400 +++ b/src/lua.mk Sun Jun 09 09:48:08 2013 -0400 @@ -18,9 +18,9 @@ define $(PKG)_BUILD $(MAKE) -C '$(1)/src' -j '$(JOBS)' \ INSTALL_TOP='$(HOST_PREFIX)' \ - CC='$(TARGET)-gcc' \ - AR='$(TARGET)-ar rcu' \ - RANLIB='$(TARGET)-ranlib' \ + CC='$(MXE_CC)' \ + AR='$(MXE_AR) rcu' \ + RANLIB='$(MXE_RANLIB)' \ a $(MAKE) -C '$(1)' -j 1 \ INSTALL_TOP='$(HOST_PREFIX)' \ @@ -30,7 +30,7 @@ INSTALL='$(INSTALL)' \ install - '$(TARGET)-gcc' \ + '$(MXE_CC)' \ -W -Wall -Werror -ansi -pedantic \ '$(2).c' -o '$(HOST_BINDIR)/test-lua.exe' \ -llua
--- a/src/mdbtools.mk Sat Jun 08 20:53:29 2013 -0400 +++ b/src/mdbtools.mk Sun Jun 09 09:48:08 2013 -0400 @@ -24,6 +24,6 @@ $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(HOST_PREFIX)' \ - PKG_CONFIG='$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-pkg-config' + PKG_CONFIG='$(MXE_PKG_CONFIG)' $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= html_DATA= endef
--- a/src/mingw-utils.mk Sat Jun 08 20:53:29 2013 -0400 +++ b/src/mingw-utils.mk Sun Jun 09 09:48:08 2013 -0400 @@ -22,7 +22,7 @@ $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(BUILD_TOOLS_PREFIX)' $(MAKE) -C '$(1).native/reimp' -j '$(JOBS)' - $(INSTALL) -m755 '$(1).native/reimp/reimp' '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-reimp' + $(INSTALL) -m755 '$(1).native/reimp/reimp' '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)reimp' # cross build cd '$(1)' && ./configure \
--- a/src/mxml.mk Sat Jun 08 20:53:29 2013 -0400 +++ b/src/mxml.mk Sun Jun 09 09:48:08 2013 -0400 @@ -28,8 +28,8 @@ $(INSTALL) -d '$(HOST_LIBDIR)/pkgconfig' $(INSTALL) -m644 '$(1)/mxml.pc' '$(HOST_LIBDIR)/pkgconfig' - '$(TARGET)-gcc' \ + '$(MXE_CC)' \ -W -Wall -Werror -ansi -pedantic \ '$(2).c' -o '$(HOST_BINDIR)/test-mxml.exe' \ - `'$(TARGET)-pkg-config' mxml --cflags --libs` + `'$(MXE_PKG_CONFIG)' mxml --cflags --libs` endef
--- a/src/native-gcc.mk Sat Jun 08 20:53:29 2013 -0400 +++ b/src/native-gcc.mk Sun Jun 09 09:48:08 2013 -0400 @@ -59,8 +59,8 @@ # # create pkg-config script # (echo '#!/bin/sh'; \ # echo 'PKG_CONFIG_PATH="$$PKG_CONFIG_PATH_$(subst -,_,$(TARGET))" PKG_CONFIG_LIBDIR='\''$(HOST_LIBDIR)/pkgconfig'\'' exec pkg-config $($(PKG)_STATIC_FLAG) "$$@"') \ - # > '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-pkg-config' - # chmod 0755 '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-pkg-config' + # > '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)pkg-config' + # chmod 0755 '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)pkg-config' # # create the CMake toolchain file # [ -d '$(dir $(CMAKE_TOOLCHAIN_FILE))' ] || mkdir -p '$(dir $(CMAKE_TOOLCHAIN_FILE))' @@ -81,12 +81,12 @@ # echo 'set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)'; \ # echo 'set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)'; \ # echo 'set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)'; \ - # echo 'set(CMAKE_C_COMPILER $(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-gcc)'; \ - # echo 'set(CMAKE_CXX_COMPILER $(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-g++)'; \ - # echo 'set(CMAKE_Fortran_COMPILER $(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-gfortran)'; \ - # echo 'set(CMAKE_RC_COMPILER $(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-windres)'; \ - # echo 'set(PKG_CONFIG_EXECUTABLE $(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-pkg-config)'; \ - # echo 'set(QT_QMAKE_EXECUTABLE $(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-qmake)'; \ + # echo 'set(CMAKE_C_COMPILER $(MXE_CC))'; \ + # echo 'set(CMAKE_CXX_COMPILER $(MXE_CXX))'; \ + # echo 'set(CMAKE_Fortran_COMPILER $(MXE_F77))'; \ + # echo 'set(CMAKE_RC_COMPILER $(MXE_WINDRES))'; \ + # echo 'set(PKG_CONFIG_EXECUTABLE $(MXE_PKG_CONFIG))'; \ + # echo 'set(QT_QMAKE_EXECUTABLE $(MXE_QMAKE))'; \ # echo 'set(CMAKE_INSTALL_PREFIX $(HOST_PREFIX) CACHE PATH "Installation Prefix")'; \ # echo 'set(CMAKE_BUILD_TYPE Release CACHE STRING "Debug|Release|RelWithDebInfo|MinSizeRel")') \ # > '$(CMAKE_TOOLCHAIN_FILE)'
--- a/src/nsis.mk Sat Jun 08 20:53:29 2013 -0400 +++ b/src/nsis.mk Sun Jun 09 09:48:08 2013 -0400 @@ -18,11 +18,11 @@ define $(PKG)_BUILD cd '$(1)' && scons VERBOSE=1 \ - MINGW_CROSS_PREFIX='$(TARGET)-' \ + MINGW_CROSS_PREFIX='$(MXE_TOOL_PREFIX)' \ PREFIX='$(HOST_PREFIX)' \ `[ -d /usr/local/include ] && echo APPEND_CPPPATH=/usr/local/include` \ `[ -d /usr/local/lib ] && echo APPEND_LIBPATH=/usr/local/lib` \ SKIPUTILS='NSIS Menu' \ install - $(INSTALL) -m755 '$(HOST_BINDIR)/makensis' '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-makensis' + $(INSTALL) -m755 '$(HOST_BINDIR)/makensis' '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)makensis' endef
--- a/src/ocaml-core.mk Sat Jun 08 20:53:29 2013 -0400 +++ b/src/ocaml-core.mk Sun Jun 09 09:48:08 2013 -0400 @@ -113,16 +113,16 @@ $(MAKE) -C '$(1)' installopt # Rename all the binaries to target-binary for f in ocamlc ocamlcp ocamlrun ocamldep ocamlmklib ocamlmktop ocamlopt ocamlprof camlp4prof camlp4boot camlp4 camlp4oof camlp4of camlp4o camlp4rf camlp4r camlp4orf ocamldoc ; do \ - cp -f $(HOST_BINDIR)/$$f $(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-$$f; \ + cp -f $(HOST_BINDIR)/$$f $(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)$$f; \ done # test ocamlopt cp '$(2).ml' '$(1)/test.ml' - cd '$(1)' && '$(TARGET)-ocamlopt' test.ml + cd '$(1)' && '$(MXE_TOOL_PREFIX)ocamlopt' test.ml # test ocamlbuild mkdir '$(1)/tmp' && cp '$(2).ml' '$(1)/tmp/test.ml' - cd '$(1)/tmp' && $(TARGET)-ocamlbuild test.native + cd '$(1)/tmp' && $(MXE_TOOL_PREFIX)ocamlbuild test.native # test cp '$(2).ml' '$(1)/test.ml' - cd '$(1)' && '$(TARGET)-ocamlopt' test.ml + cd '$(1)' && '$(MXE_TOOL_PREFIX)ocamlopt' test.ml endef
--- a/src/ocaml-flexdll.mk Sat Jun 08 20:53:29 2013 -0400 +++ b/src/ocaml-flexdll.mk Sun Jun 09 09:48:08 2013 -0400 @@ -33,11 +33,11 @@ cd '$(BUILD_TOOLS_PREFIX)/bin' && $(LN_SF) '$(HOST_LIBDIR)/ocaml/flexdll/flexlink' (echo '#!/bin/sh'; \ echo 'exec flexlink -I $(HOST_LIBDIR) -chain mingw -nocygpath "$$@"') \ - > '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-flexlink' - chmod 0755 '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-flexlink' + > '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)flexlink' + chmod 0755 '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)flexlink' echo "testing flexlink..." - $(MAKE) -C '$(1)/test' -j '$(JOBS)' dump.exe plug1.dll plug2.dll CC=$(TARGET)-gcc O=o FLEXLINK=$(TARGET)-flexlink + $(MAKE) -C '$(1)/test' -j '$(JOBS)' dump.exe plug1.dll plug2.dll CC=$(MXE_CC) O=o FLEXLINK=$(MXE_TOOL_PREFIX)flexlink #works if wine is installed : #cd '$(1)/test' && ./dump.exe plug1.dll plug2.dll endef
--- a/src/ocaml-native.mk Sat Jun 08 20:53:29 2013 -0400 +++ b/src/ocaml-native.mk Sun Jun 09 09:48:08 2013 -0400 @@ -17,7 +17,7 @@ endef define $(PKG)_BUILD - # patched ocaml source to get ocamlbuild use $(TARGET)-ocamlc, $(TARGET)-ocamlfind, ... + # patched ocaml source to get ocamlbuild use $(MXE_TOOL_PREFIX)ocamlc, $(MXE_TOOL_PREFIX)ocamlfind, ... cd '$(1)' && ./configure \ -prefix '$(HOST_PREFIX)' \ -bindir '$(HOST_BINDIR)/ocaml-native' \ @@ -29,12 +29,12 @@ $(SED) -i "s,@target@,$(TARGET),g" $(1)/ocamlbuild/options.ml $(SED) -i "s,@target@,$(TARGET),g" $(1)/ocamlbuild/findlib.ml $(MAKE) -C '$(1)' -j '$(JOBS)' ocamlbuild.native - cp -f '$(1)/_build/ocamlbuild/ocamlbuild.native' $(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-ocamlbuild + cp -f '$(1)/_build/ocamlbuild/ocamlbuild.native' $(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)ocamlbuild $(MAKE) -C '$(1)' install # the following script requires ocamlbuild with option -ocamlfind to work #(echo '#!/bin/sh'; \ - # echo 'exec $(BUILD_TOOLS_PREFIX)/bin/ocamlbuild -use-ocamlfind -ocamlfind $(TARGET)-ocamlfind "$$@"') \ - # > '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-ocamlbuild' - #chmod 0755 '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-ocamlbuild' + # echo 'exec $(BUILD_TOOLS_PREFIX)/bin/ocamlbuild -use-ocamlfind -ocamlfind $(MXE_TOOL_PREFIX)ocamlfind "$$@"') \ + # > '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)ocamlbuild' + #chmod 0755 '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)ocamlbuild' # test will be done once cross ocamlopt is built endef
--- a/src/octave.mk Sat Jun 08 20:53:29 2013 -0400 +++ b/src/octave.mk Sun Jun 09 09:48:08 2013 -0400 @@ -17,7 +17,7 @@ else ifeq ($(MXE_SYSTEM),mingw) $(PKG)_CROSS_CONFIG_OPTIONS := \ - FLTK_CONFIG='$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-fltk-config' \ + FLTK_CONFIG='$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)fltk-config' \ gl_cv_func_gettimeofday_clobber=no ifeq ($(ENABLE_64),yes) $(PKG)_ENABLE_64_CONFIGURE_OPTIONS := --enable-64 ax_blas_f77_func_ok=yes
--- a/src/old.mk Sat Jun 08 20:53:29 2013 -0400 +++ b/src/old.mk Sun Jun 09 09:48:08 2013 -0400 @@ -17,9 +17,9 @@ endef define $(PKG)_BUILD - cd '$(1)' && $(TARGET)-gcc -O3 -Iinclude -c -o libold.o lib/libold.c - cd '$(1)' && $(TARGET)-ar cr libold.a libold.o - $(TARGET)-ranlib '$(1)/libold.a' + cd '$(1)' && $(MXE_CC) -O3 -Iinclude -c -o libold.o lib/libold.c + cd '$(1)' && $(MXE_AR) cr libold.a libold.o + $(MXE_RANLIB) '$(1)/libold.a' $(INSTALL) -d '$(HOST_LIBDIR)' $(INSTALL) -m644 '$(1)/libold.a' '$(HOST_LIBDIR)' $(INSTALL) -d '$(HOST_INCDIR)'
--- a/src/openal.mk Sat Jun 08 20:53:29 2013 -0400 +++ b/src/openal.mk Sun Jun 09 09:48:08 2013 -0400 @@ -22,8 +22,8 @@ -DEXAMPLES=FALSE $(MAKE) -C '$(1)/build' -j '$(JOBS)' install - '$(TARGET)-gcc' \ + '$(MXE_CC)' \ -W -Wall -Werror -ansi -pedantic \ '$(2).c' -o '$(HOST_BINDIR)/test-openal.exe' \ - `'$(TARGET)-pkg-config' openal --cflags --libs` + `'$(MXE_PKG_CONFIG)' openal --cflags --libs` endef
--- a/src/opencsg.mk Sat Jun 08 20:53:29 2013 -0400 +++ b/src/opencsg.mk Sun Jun 09 09:48:08 2013 -0400 @@ -17,12 +17,12 @@ endef define $(PKG)_BUILD - cd '$(1)/src' && '$(TARGET)-qmake' src.pro + cd '$(1)/src' && '$(MXE_QMAKE)' src.pro $(MAKE) -C '$(1)/src' -j '$(JOBS)' $(INSTALL) -m644 '$(1)/include/opencsg.h' '$(HOST_INCDIR)' $(INSTALL) -m644 '$(1)/lib/libopencsg.a' '$(HOST_LIBDIR)' - cd '$(1)/example' && '$(TARGET)-qmake' example.pro + cd '$(1)/example' && '$(MXE_QMAKE)' example.pro $(MAKE) -C '$(1)/example' -j '$(JOBS)' $(INSTALL) -m755 '$(1)/example/release/opencsgexample.exe' '$(HOST_BINDIR)/test-opencsg.exe' endef
--- a/src/openexr.mk Sat Jun 08 20:53:29 2013 -0400 +++ b/src/openexr.mk Sun Jun 09 09:48:08 2013 -0400 @@ -38,7 +38,7 @@ --disable-threading \ --disable-posix-sem \ --disable-ilmbasetest \ - PKG_CONFIG='$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-pkg-config' + PKG_CONFIG='$(MXE_PKG_CONFIG)' # build the code generator manually cd '$(1)/IlmImf' && g++ \ -I'$(1)/ilmbase/include/OpenEXR' \
--- a/src/openssl.mk Sat Jun 08 20:53:29 2013 -0400 +++ b/src/openssl.mk Sun Jun 09 09:48:08 2013 -0400 @@ -14,7 +14,7 @@ $(PKG)_CONFIGURE := ./config else $(PKG)_CONFIGURE := ./Configure $(MXE_SYSTEM) - $(PKG)_CROSS_COMPILE_MAKE_ARG := CROSS_COMPILE='$(TARGET)-' + $(PKG)_CROSS_COMPILE_MAKE_ARG := CROSS_COMPILE='$(MXE_TOOL_PREFIX)' endif define $(PKG)_UPDATE
--- a/src/pango.mk Sat Jun 08 20:53:29 2013 -0400 +++ b/src/pango.mk Sun Jun 09 09:48:08 2013 -0400 @@ -28,6 +28,6 @@ --enable-explicit-deps \ --with-included-modules \ --without-dynamic-modules \ - CXX='$(TARGET)-g++' + CXX='$(MXE_CXX)' $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= endef
--- a/src/pdcurses.mk Sat Jun 08 20:53:29 2013 -0400 +++ b/src/pdcurses.mk Sun Jun 09 09:48:08 2013 -0400 @@ -18,17 +18,17 @@ define $(PKG)_BUILD $(SED) -i 's,copy,cp,' '$(1)/win32/mingwin32.mak' $(MAKE) -C '$(1)' -j '$(JOBS)' libs -f '$(1)/win32/mingwin32.mak' \ - CC='$(TARGET)-gcc' \ - LIBEXE='$(TARGET)-ar' \ + CC='$(MXE_CC)' \ + LIBEXE='$(MXE_AR)' \ DLL=N \ PDCURSES_SRCDIR=. \ WIDE=Y \ UTF8=Y mv '$(1)/pdcurses.a' '$(1)/libcurses.a' - $(TARGET)-ranlib '$(1)/libcurses.a' '$(1)/panel.a' + $(MXE_RANLIB) '$(1)/libcurses.a' '$(1)/panel.a' if [ "$(BUILD_SHARED)" = yes ]; then \ - $(MAKE_SHARED_FROM_STATIC) --ar '$(TARGET)-ar' --ld '$(TARGET)-gcc' '$(1)/libcurses.a' --install '$(INSTALL)' --libdir '$(HOST_LIBDIR)' --bindir '$(HOST_BINDIR)'; \ - $(MAKE_SHARED_FROM_STATIC) --ar '$(TARGET)-ar' --ld '$(TARGET)-gcc' '$(1)/panel.a' --install '$(INSTALL)' --libdir '$(HOST_LIBDIR)' --bindir '$(HOST_BINDIR)'; \ + $(MAKE_SHARED_FROM_STATIC) --ar '$(MXE_AR)' --ld '$(MXE_CC)' '$(1)/libcurses.a' --install '$(INSTALL)' --libdir '$(HOST_LIBDIR)' --bindir '$(HOST_BINDIR)'; \ + $(MAKE_SHARED_FROM_STATIC) --ar '$(MXE_AR)' --ld '$(MXE_CC)' '$(1)/panel.a' --install '$(INSTALL)' --libdir '$(HOST_LIBDIR)' --bindir '$(HOST_BINDIR)'; \ fi if [ "$(BUILD_STATIC)" = yes ]; then \ $(INSTALL) -m644 '$(1)/libcurses.a' '$(HOST_LIBDIR)/libcurses.a'
--- a/src/physfs.mk Sat Jun 08 20:53:29 2013 -0400 +++ b/src/physfs.mk Sun Jun 09 09:48:08 2013 -0400 @@ -24,7 +24,7 @@ -DPHYSFS_BUILD_WX_TEST=FALSE $(MAKE) -C '$(1)' -j '$(JOBS)' install - '$(TARGET)-gcc' \ + '$(MXE_CC)' \ -W -Wall -Werror -ansi -pedantic -std=c99 \ '$(2).c' -o '$(HOST_BINDIR)/test-physfs.exe' \ -lphysfs -lz
--- a/src/poco.mk Sat Jun 08 20:53:29 2013 -0400 +++ b/src/poco.mk Sun Jun 09 09:48:08 2013 -0400 @@ -22,7 +22,7 @@ --prefix='$(HOST_PREFIX)' $(MAKE) -C '$(1)' -j '$(JOBS)' install CROSSENV=$(TARGET) - '$(TARGET)-g++' \ + '$(MXE_CXX)' \ -W -Wall -Werror -ansi -pedantic \ '$(2).cpp' -o '$(HOST_BINDIR)/test-poco.exe' \ -lPocoFoundation
--- a/src/poppler.mk Sat Jun 08 20:53:29 2013 -0400 +++ b/src/poppler.mk Sun Jun 09 09:48:08 2013 -0400 @@ -46,13 +46,13 @@ --disable-gtk-doc-pdf \ --with-font-configuration=win32 \ PKG_CONFIG_PATH_$(subst -,_,$(TARGET))='$(HOST_PREFIX)/qt/lib/pkgconfig' \ - LIBS="`'$(TARGET)-pkg-config' zlib liblzma --libs` -ljpeg" + LIBS="`'$(MXE_PKG_CONFIG)' zlib liblzma --libs` -ljpeg" $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= # Test program - '$(TARGET)-g++' \ + '$(MXE_CXX)' \ -W -Wall -Werror -ansi -pedantic \ '$(2).cxx' -o '$(HOST_BINDIR)/test-poppler.exe' \ - `'$(TARGET)-pkg-config' poppler poppler-cpp --cflags --libs` + `'$(MXE_PKG_CONFIG)' poppler poppler-cpp --cflags --libs` endef
--- a/src/portaudio.mk Sat Jun 08 20:53:29 2013 -0400 +++ b/src/portaudio.mk Sun Jun 09 09:48:08 2013 -0400 @@ -24,12 +24,12 @@ --with-host_os=mingw \ --with-winapi=wmme,directx,wasapi,wdmks \ --with-dxdir=$(HOST_PREFIX) \ - ac_cv_path_AR=$(TARGET)-ar + ac_cv_path_AR=$(MXE_AR) $(MAKE) -C '$(1)' -j '$(JOBS)' SHARED_FLAGS= TESTS= $(MAKE) -C '$(1)' -j 1 install - '$(TARGET)-gcc' \ + '$(MXE_CC)' \ -W -Wall -Werror -ansi -pedantic \ '$(2).c' -o '$(HOST_BINDIR)/test-portaudio.exe' \ - `'$(TARGET)-pkg-config' portaudio-2.0 --cflags --libs` + `'$(MXE_PKG_CONFIG)' portaudio-2.0 --cflags --libs` endef
--- a/src/postgresql.mk Sat Jun 08 20:53:29 2013 -0400 +++ b/src/postgresql.mk Sun Jun 09 09:48:08 2013 -0400 @@ -51,7 +51,7 @@ --without-libxslt \ --with-zlib \ --with-system-tzdata=/dev/null \ - LIBS="$($(PKG)_LIBS) `'$(TARGET)-pkg-config' openssl --libs`" + LIBS="$($(PKG)_LIBS) `'$(MXE_PKG_CONFIG)' openssl --libs`" $(MAKE) -C '$(1)'/src/interfaces/libpq -j '$(JOBS)' install haslibarule= $(MAKE) -C '$(1)'/src/port -j '$(JOBS)' haslibarule= $(MAKE) -C '$(1)'/src/bin/psql -j '$(JOBS)' install haslibarule= @@ -80,5 +80,5 @@ --with-system-tzdata=/dev/null $(MAKE) -C '$(1).native'/src/port -j '$(JOBS)' $(MAKE) -C '$(1).native'/src/bin/pg_config -j '$(JOBS)' install - $(LN_SF) '$(HOST_BINDIR)/pg_config' '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-pg_config' + $(LN_SF) '$(HOST_BINDIR)/pg_config' '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)pg_config' endef
--- a/src/protobuf.mk Sat Jun 08 20:53:29 2013 -0400 +++ b/src/protobuf.mk Sun Jun 09 09:48:08 2013 -0400 @@ -32,8 +32,8 @@ $(MAKE) -C '$(1)' -j '$(JOBS)' $(MAKE) -C '$(1)' -j 1 install - '$(TARGET)-g++' \ + '$(MXE_CXX)' \ -W -Wall -Werror -ansi -pedantic \ '$(2).cpp' -o '$(HOST_BINDIR)/test-protobuf.exe' \ - `'$(TARGET)-pkg-config' protobuf --cflags --libs` + `'$(MXE_PKG_CONFIG)' protobuf --cflags --libs` endef
--- a/src/pthreads.mk Sat Jun 08 20:53:29 2013 -0400 +++ b/src/pthreads.mk Sun Jun 09 09:48:08 2013 -0400 @@ -33,12 +33,12 @@ else ifeq ($(MXE_SYSTEM),mingw) define $(PKG)_BUILD - $(MAKE) -C '$(1)' -j 1 GC-static CROSS='$(TARGET)-' + $(MAKE) -C '$(1)' -j 1 GC-static CROSS='$(MXE_TOOL_PREFIX)' $(INSTALL) -d '$(HOST_LIBDIR)' $(INSTALL) -m644 '$(1)/libpthreadGC2.a' '$(HOST_LIBDIR)/libpthread.a' if [ $(BUILD_SHARED) = yes ]; then \ - $(MAKE_SHARED_FROM_STATIC) --ar '$(TARGET)-ar' --ld '$(TARGET)-gcc' '$(HOST_LIBDIR)/libpthread.a' --install '$(INSTALL)' --libdir '$(HOST_LIBDIR)' --bindir '$(HOST_BINDIR)'; \ + $(MAKE_SHARED_FROM_STATIC) --ar '$(MXE_AR)' --ld '$(MXE_CC)' '$(HOST_LIBDIR)/libpthread.a' --install '$(INSTALL)' --libdir '$(HOST_LIBDIR)' --bindir '$(HOST_BINDIR)'; \ fi $(INSTALL) -d '$(HOST_INCDIR)'
--- a/src/qdbm.mk Sat Jun 08 20:53:29 2013 -0400 +++ b/src/qdbm.mk Sun Jun 09 09:48:08 2013 -0400 @@ -37,8 +37,8 @@ cd '$(1)' && $(INSTALL) -m644 depot.h curia.h relic.h hovel.h \ cabin.h villa.h vista.h odeum.h '$(HOST_INCDIR)' - '$(TARGET)-gcc' \ + '$(MXE_CC)' \ -W -Wall -Werror -ansi -pedantic \ '$(2).c' -o '$(HOST_BINDIR)/test-qdbm.exe' \ - `'$(TARGET)-pkg-config' qdbm --cflags --libs` + `'$(MXE_PKG_CONFIG)' qdbm --cflags --libs` endef
--- a/src/qjson.mk Sat Jun 08 20:53:29 2013 -0400 +++ b/src/qjson.mk Sun Jun 09 09:48:08 2013 -0400 @@ -16,7 +16,7 @@ endef define $(PKG)_BUILD - echo '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-qmake' + echo '$(MXE_QMAKE)' mkdir '$(1)/build' cd '$(1)/build' && cmake .. \ -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \
--- a/src/qt.mk Sat Jun 08 20:53:29 2013 -0400 +++ b/src/qt.mk Sun Jun 09 09:48:08 2013 -0400 @@ -11,9 +11,9 @@ $(PKG)_DEPS := gcc libodbc++ postgresql freetds openssl zlib libpng jpeg libmng tiff sqlite dbus $(PKG)_CONFIGURE_ENV := \ - OPENSSL_LIBS="`'$(TARGET)-pkg-config' --libs-only-l openssl`" \ - PSQL_LIBS="-lpq -lsecur32 `'$(TARGET)-pkg-config' --libs-only-l openssl` -lws2_32" \ - SYBASE_LIBS="-lsybdb `'$(TARGET)-pkg-config' --libs-only-l gnutls` -liconv -lws2_32" + OPENSSL_LIBS="`'$(MXE_PKG_CONFIG)' --libs-only-l openssl`" \ + PSQL_LIBS="-lpq -lsecur32 `'$(MXE_PKG_CONFIG)' --libs-only-l openssl` -lws2_32" \ + SYBASE_LIBS="-lsybdb `'$(MXE_PKG_CONFIG)' --libs-only-l gnutls` -liconv -lws2_32" else $(PKG)_DEPS := gcc postgresql freetds openssl zlib libpng jpeg libmng tiff sqlite dbus @@ -50,8 +50,8 @@ -confirm-license \ -fast \ $($(PKG)_CONFIGURE_PLATFORM_OPTION) \ - -device-option CROSS_COMPILE=$(TARGET)- \ - -device-option PKG_CONFIG='$(TARGET)-pkg-config' \ + -device-option CROSS_COMPILE=$(MXE_TOOL_PREFIX) \ + -device-option PKG_CONFIG='$(MXE_PKG_CONFIG)' \ -force-pkg-config \ -release \ -exceptions \ @@ -87,10 +87,10 @@ $(MAKE) -C '$(1)' -j '$(JOBS)' $(MAKE) -C '$(1)' -j 1 install - $(LN_SF) '$(HOST_BINDIR)/moc' '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-moc' - $(LN_SF) '$(HOST_BINDIR)/rcc' '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-roc' - $(LN_SF) '$(HOST_BINDIR)/uic' '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-uic' - $(LN_SF) '$(HOST_BINDIR)/qmake' '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-qmake' + $(LN_SF) '$(HOST_BINDIR)/moc' '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)moc' + $(LN_SF) '$(HOST_BINDIR)/rcc' '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)roc' + $(LN_SF) '$(HOST_BINDIR)/uic' '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)uic' + $(LN_SF) '$(HOST_BINDIR)/qmake' '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)qmake' # cd '$(1)/tools/assistant' && '$(1)/bin/qmake' assistant.pro # $(MAKE) -C '$(1)/tools/assistant' -j '$(JOBS)' install @@ -104,10 +104,10 @@ # lrelease (from linguist) needed by octave for GUI build $(MAKE) -C '$(1)/tools/linguist/lrelease' -j '$(JOBS)' install - $(LN_SF) '$(HOST_BINDIR)/lrelease' '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-lrelease' + $(LN_SF) '$(HOST_BINDIR)/lrelease' '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)lrelease' # mkdir '$(1)/test-qt' - # cd '$(1)/test-qt' && '$(TARGET)-qmake' '$(PWD)/$(2).pro' + # cd '$(1)/test-qt' && '$(MXE_QMAKE)' '$(PWD)/$(2).pro' # $(MAKE) -C '$(1)/test-qt' -j '$(JOBS)' # $(INSTALL) -m755 '$(1)/test-qt/release/test-qt.exe' '$(HOST_BINDIR)' endef
--- a/src/qwt.mk Sat Jun 08 20:53:29 2013 -0400 +++ b/src/qwt.mk Sun Jun 09 09:48:08 2013 -0400 @@ -18,11 +18,11 @@ define $(PKG)_BUILD # build - cd '$(1)/src' && $(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-qmake + cd '$(1)/src' && $(MXE_QMAKE) $(MAKE) -C '$(1)/src' -f 'Makefile.Release' -j '$(JOBS)' install #build sinusplot example to test linkage - cd '$(1)/examples/sinusplot' && $(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-qmake + cd '$(1)/examples/sinusplot' && $(MXE_QMAKE) $(MAKE) -C '$(1)/examples/sinusplot' -f 'Makefile.Release' -j '$(JOBS)' # install
--- a/src/qwtplot3d.mk Sat Jun 08 20:53:29 2013 -0400 +++ b/src/qwtplot3d.mk Sun Jun 09 09:48:08 2013 -0400 @@ -16,7 +16,7 @@ endef define $(PKG)_BUILD - cd '$(1)' && '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-qmake' + cd '$(1)' && '$(MXE_QMAKE)' $(MAKE) -C '$(1)' -j '$(JOBS)' $(INSTALL) -d '$(HOST_LIBDIR)' $(INSTALL) -m644 '$(1)/lib/libqwtplot3d.a' '$(HOST_LIBDIR)'
--- a/src/sdl.mk Sat Jun 08 20:53:29 2013 -0400 +++ b/src/sdl.mk Sun Jun 09 09:48:08 2013 -0400 @@ -27,10 +27,10 @@ --disable-stdio-redirect $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= $(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= - $(LN_SF) '$(HOST_BINDIR)/sdl-config' '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-sdl-config' + $(LN_SF) '$(HOST_BINDIR)/sdl-config' '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)sdl-config' - '$(TARGET)-gcc' \ + '$(MXE_CC)' \ -W -Wall -Werror -ansi -pedantic \ '$(2).c' -o '$(HOST_BINDIR)/test-sdl.exe' \ - `'$(TARGET)-pkg-config' sdl --cflags --libs` + `'$(MXE_PKG_CONFIG)' sdl --cflags --libs` endef
--- a/src/sdl_image.mk Sat Jun 08 20:53:29 2013 -0400 +++ b/src/sdl_image.mk Sun Jun 09 09:48:08 2013 -0400 @@ -29,8 +29,8 @@ LIBS='-lz' $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= - '$(TARGET)-gcc' \ + '$(MXE_CC)' \ -W -Wall -Werror -ansi -pedantic \ '$(2).c' -o '$(HOST_BINDIR)/test-sdl_image.exe' \ - `'$(TARGET)-pkg-config' SDL_image --cflags --libs` + `'$(MXE_PKG_CONFIG)' SDL_image --cflags --libs` endef
--- a/src/sdl_mixer.mk Sat Jun 08 20:53:29 2013 -0400 +++ b/src/sdl_mixer.mk Sun Jun 09 09:48:08 2013 -0400 @@ -19,7 +19,7 @@ $(SED) -i 's,^\(Requires:.*\),\1 vorbisfile,' '$(1)/SDL_mixer.pc.in' echo \ 'Libs.private:' \ - "`$(TARGET)-pkg-config libmodplug --libs`" \ + "`$(MXE_PKG_CONFIG) libmodplug --libs`" \ "`$(HOST_BINDIR)/smpeg-config --libs`" \ >> '$(1)/SDL_mixer.pc.in' $(SED) -i 's,for path in /usr/local; do,for path in; do,' '$(1)/configure' @@ -43,8 +43,8 @@ LIBS='-lvorbis -logg' $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= - '$(TARGET)-gcc' \ + '$(MXE_CC)' \ -W -Wall -Werror -ansi -pedantic \ '$(2).c' -o '$(HOST_BINDIR)/test-sdl_mixer.exe' \ - `'$(TARGET)-pkg-config' SDL_mixer --cflags --libs` + `'$(MXE_PKG_CONFIG)' SDL_mixer --cflags --libs` endef
--- a/src/sdl_net.mk Sat Jun 08 20:53:29 2013 -0400 +++ b/src/sdl_net.mk Sun Jun 09 09:48:08 2013 -0400 @@ -25,8 +25,8 @@ --disable-gui $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= - '$(TARGET)-gcc' \ + '$(MXE_CC)' \ -W -Wall -Werror -ansi -pedantic \ '$(2).c' -o '$(HOST_BINDIR)/test-sdl_net.exe' \ - `'$(TARGET)-pkg-config' SDL_net --cflags --libs` + `'$(MXE_PKG_CONFIG)' SDL_net --cflags --libs` endef
--- a/src/sdl_pango.mk Sat Jun 08 20:53:29 2013 -0400 +++ b/src/sdl_pango.mk Sun Jun 09 09:48:08 2013 -0400 @@ -24,6 +24,6 @@ --prefix='$(HOST_PREFIX)' \ --with-sdl-prefix='$(HOST_PREFIX)' \ --disable-sdltest \ - PKG_CONFIG='$(TARGET)-pkg-config' + PKG_CONFIG='$(MXE_PKG_CONFIG)' $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= endef
--- a/src/sdl_sound.mk Sat Jun 08 20:53:29 2013 -0400 +++ b/src/sdl_sound.mk Sun Jun 09 09:48:08 2013 -0400 @@ -39,13 +39,13 @@ --disable-physfs \ --disable-altcvt \ CFLAGS='-g -O2 -fno-inline' \ - LIBS="`'$(TARGET)-pkg-config' vorbisfile flac speex --libs` `'$(HOST_BINDIR)/libmikmod-config' --libs`" + LIBS="`'$(MXE_PKG_CONFIG)' vorbisfile flac speex --libs` `'$(HOST_BINDIR)/libmikmod-config' --libs`" $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= - '$(TARGET)-gcc' \ + '$(MXE_CC)' \ -W -Wall -Werror -std=c99 -pedantic \ '$(2).c' -o '$(HOST_BINDIR)/test-sdl_sound.exe' \ -lSDL_sound \ - `'$(TARGET)-pkg-config' sdl vorbisfile flac speex --cflags --libs` \ + `'$(MXE_PKG_CONFIG)' sdl vorbisfile flac speex --cflags --libs` \ `'$(HOST_BINDIR)/libmikmod-config' --cflags --libs` endef
--- a/src/smpeg.mk Sat Jun 08 20:53:29 2013 -0400 +++ b/src/smpeg.mk Sun Jun 09 09:48:08 2013 -0400 @@ -18,8 +18,8 @@ define $(PKG)_BUILD $(SED) -i 's,\(-lsmpeg\),\1 -lstdc++,' '$(1)/smpeg-config.in' cd '$(1)' && ./configure \ - AR='$(TARGET)-ar' \ - NM='$(TARGET)-nm' \ + AR='$(MXE_AR)' \ + NM='$(MXE_NM)' \ $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) \ --disable-debug \ @@ -31,7 +31,7 @@ CFLAGS='-ffriend-injection' $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= - '$(TARGET)-gcc' \ + '$(MXE_CC)' \ -W -Wall -Werror -std=c99 -pedantic \ '$(2).c' -o '$(HOST_BINDIR)/test-smpeg.exe' \ `'$(HOST_BINDIR)/smpeg-config' --cflags --libs`
--- a/src/sox.mk Sat Jun 08 20:53:29 2013 -0400 +++ b/src/sox.mk Sun Jun 09 09:48:08 2013 -0400 @@ -31,8 +31,8 @@ $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= EXTRA_PROGRAMS= $(MAKE) -C '$(1)' -j 1 install - '$(TARGET)-gcc' \ + '$(MXE_CC)' \ -W -Wall -Werror -ansi -pedantic \ '$(2).c' -o '$(HOST_BINDIR)/test-sox.exe' \ - `'$(TARGET)-pkg-config' sox --cflags --libs` + `'$(MXE_PKG_CONFIG)' sox --cflags --libs` endef
--- a/src/stable-octave.mk Sat Jun 08 20:53:29 2013 -0400 +++ b/src/stable-octave.mk Sun Jun 09 09:48:08 2013 -0400 @@ -19,7 +19,7 @@ cd '$(1)/.build' && '$(1)/configure' \ $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ --prefix='$(HOST_PREFIX)' \ - FLTK_CONFIG="$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-fltk-config" \ + FLTK_CONFIG="$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)fltk-config" \ gl_cv_func_gettimeofday_clobber=no ## We want both of these install steps so that we install in the
--- a/src/suitesparse.mk Sat Jun 08 20:53:29 2013 -0400 +++ b/src/suitesparse.mk Sun Jun 09 09:48:08 2013 -0400 @@ -47,7 +47,7 @@ CFLAGS='$(MXE_CFLAGS)' \ CXXFLAGS='$(MXE_CXXFLAGS)' \ AR='$(MXE_AR)' \ - RANLIB='$(TARGET)-ranlib' \ + RANLIB='$(MXE_RANLIB)' \ BLAS='-lblas -lgfortran -lgfortranbegin' \ CHOLMOD_CONFIG='-DNPARTITION'
--- a/src/termcap.mk Sat Jun 08 20:53:29 2013 -0400 +++ b/src/termcap.mk Sun Jun 09 09:48:08 2013 -0400 @@ -20,11 +20,11 @@ $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \ $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ --prefix='$(HOST_PREFIX)' \ - AR=$(TARGET)-ar + AR=$(MXE_AR) - $(MAKE) AR=$(TARGET)-ar -C '$(1)' -j '$(JOBS)' install + $(MAKE) AR=$(MXE_AR) -C '$(1)' -j '$(JOBS)' install if [ "$(BUILD_SHARED)" = yes ]; then \ - $(MAKE_SHARED_FROM_STATIC) --ar '$(TARGET)-ar' --ld '$(TARGET)-gcc' '$(HOST_LIBDIR)/libtermcap.a' --install '$(INSTALL)' --libdir '$(HOST_LIBDIR)' --bindir '$(HOST_BINDIR)'; \ + $(MAKE_SHARED_FROM_STATIC) --ar '$(MXE_AR)' --ld '$(MXE_CC)' '$(HOST_LIBDIR)/libtermcap.a' --install '$(INSTALL)' --libdir '$(HOST_LIBDIR)' --bindir '$(HOST_BINDIR)'; \ fi endef
--- a/src/tinyxml.mk Sat Jun 08 20:53:29 2013 -0400 +++ b/src/tinyxml.mk Sun Jun 09 09:48:08 2013 -0400 @@ -16,15 +16,15 @@ endef define $(PKG)_BUILD - cd '$(1)' && $(TARGET)-g++ -c -O3 -Wall -Wno-unknown-pragmas -Wno-format -D TIXML_USE_STL '$(1)'/*.cpp - cd '$(1)' && $(TARGET)-ar cr libtinyxml.a *.o - $(TARGET)-ranlib '$(1)/libtinyxml.a' + cd '$(1)' && $(MXE_CXX) -c -O3 -Wall -Wno-unknown-pragmas -Wno-format -D TIXML_USE_STL '$(1)'/*.cpp + cd '$(1)' && $(MXE_AR) cr libtinyxml.a *.o + $(MXE_RANLIB) '$(1)/libtinyxml.a' $(INSTALL) -d '$(HOST_LIBDIR)' $(INSTALL) -m644 '$(1)'/*.a '$(HOST_LIBDIR)' $(INSTALL) -d '$(HOST_INCDIR)' $(INSTALL) -m644 '$(1)'/*.h '$(HOST_INCDIR)' - '$(TARGET)-g++' \ + '$(MXE_CXX)' \ -W -Wall -D TIXML_USE_STL -Werror -ansi -pedantic \ '$(2).cpp' -o '$(HOST_BINDIR)/test-tinyxml.exe' \ -ltinyxml
--- a/src/vigra.mk Sat Jun 08 20:53:29 2013 -0400 +++ b/src/vigra.mk Sun Jun 09 09:48:08 2013 -0400 @@ -33,8 +33,8 @@ -DWITH_VALGRIND=OFF $(MAKE) -C '$(1)/build' -j '$(JOBS)' install - $(TARGET)-g++ \ + $(MXE_CXX) \ '$(2).cpp' -o $(HOST_BINDIR)/test-vigra.exe \ -DVIGRA_STATIC_LIB \ - -lvigraimpex `'$(TARGET)-pkg-config' OpenEXR libtiff-4 libpng --cflags --libs` -ljpeg + -lvigraimpex `'$(MXE_PKG_CONFIG)' OpenEXR libtiff-4 libpng --cflags --libs` -ljpeg endef
--- a/src/vmime.mk Sat Jun 08 20:53:29 2013 -0400 +++ b/src/vmime.mk Sun Jun 09 09:48:08 2013 -0400 @@ -18,8 +18,8 @@ define $(PKG)_BUILD cd '$(1)' && cmake \ -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ - -DCMAKE_AR='$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-ar' \ - -DCMAKE_RANLIB='$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-ranlib' \ + -DCMAKE_AR='$(MXE_AR)' \ + -DCMAKE_RANLIB='$(MXE_RANLIB)' \ . # Disable VMIME_HAVE_MLANG_H @@ -31,8 +31,8 @@ $(INSTALL) -m644 '$(1)/vmime/config.hpp' '$(HOST_INCDIR)/vmime/' $(SED) -i 's/posix/windows/g;' '$(1)/examples/example6.cpp' - $(TARGET)-g++ -s -o '$(1)/examples/test-vmime.exe' \ + $(MXE_CXX) -s -o '$(1)/examples/test-vmime.exe' \ '$(1)/examples/example6.cpp' \ - `'$(TARGET)-pkg-config' libvmime --cflags --libs` + `'$(MXE_PKG_CONFIG)' libvmime --cflags --libs` $(INSTALL) -m755 '$(1)/examples/test-vmime.exe' '$(HOST_BINDIR)' endef
--- a/src/vorbis.mk Sat Jun 08 20:53:29 2013 -0400 +++ b/src/vorbis.mk Sun Jun 09 09:48:08 2013 -0400 @@ -20,6 +20,6 @@ $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(HOST_PREFIX)' \ - PKG_CONFIG='$(TARGET)-pkg-config' + PKG_CONFIG='$(MXE_PKG_CONFIG)' $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= endef
--- a/src/winpcap.mk Sat Jun 08 20:53:29 2013 -0400 +++ b/src/winpcap.mk Sun Jun 09 09:48:08 2013 -0400 @@ -17,9 +17,9 @@ define $(PKG)_BUILD # build - cd '$(1)' && $(TARGET)-gcc -ICommon -IpacketNtx/Dll -O -c '$(1)/packetNtx/Dll/Packet32.c' - $(TARGET)-ar rc '$(1)/libpacket.a' '$(1)/Packet32.o' - $(TARGET)-ranlib '$(1)/libpacket.a' + cd '$(1)' && $(MXE_CC) -ICommon -IpacketNtx/Dll -O -c '$(1)/packetNtx/Dll/Packet32.c' + $(MXE_AR) rc '$(1)/libpacket.a' '$(1)/Packet32.o' + $(MXE_RANLIB) '$(1)/libpacket.a' $(INSTALL) -d '$(HOST_INCDIR)' $(INSTALL) -m644 '$(1)/Common'/*.h '$(HOST_INCDIR)' $(INSTALL) -d '$(HOST_LIBDIR)' @@ -28,9 +28,9 @@ mv '$(1)/wpcap/libpcap/Win32/Include/ip6_misc.h' '$(1)/file.tmp' mv '$(1)/file.tmp' '$(1)/wpcap/libpcap/Win32/Include/IP6_misc.h' - CC='$(TARGET)-gcc' \ - AR='$(TARGET)-ar' \ - RANLIB='$(TARGET)-ranlib' \ + CC='$(MXE_CC)' \ + AR='$(MXE_AR)' \ + RANLIB='$(MXE_RANLIB)' \ $(MAKE) -C '$(1)/wpcap/PRJ' -j 1 libwpcap.a $(INSTALL) -d '$(HOST_INCDIR)' $(INSTALL) -m644 '$(1)/wpcap/libpcap/'*.h '$(1)/wpcap/Win32-Extensions/'*.h '$(HOST_INCDIR)'
--- a/src/wt.mk Sat Jun 08 20:53:29 2013 -0400 +++ b/src/wt.mk Sun Jun 09 09:48:08 2013 -0400 @@ -27,10 +27,10 @@ -DBOOST_PREFIX='$(HOST_PREFIX)' \ -DBOOST_COMPILER=_win32 \ -DSSL_PREFIX='$(HOST_PREFIX)' \ - -DOPENSSL_LIBS="`'$(TARGET)-pkg-config' --libs-only-l openssl`" \ + -DOPENSSL_LIBS="`'$(MXE_PKG_CONFIG)' --libs-only-l openssl`" \ -DGM_PREFIX='$(HOST_PREFIX)' \ - -DGM_LIBS="`'$(TARGET)-pkg-config' --libs-only-l GraphicsMagick++`" \ - -DPANGO_FT2_LIBS="`'$(TARGET)-pkg-config' --libs-only-l pangoft2`" \ + -DGM_LIBS="`'$(MXE_PKG_CONFIG)' --libs-only-l GraphicsMagick++`" \ + -DPANGO_FT2_LIBS="`'$(MXE_PKG_CONFIG)' --libs-only-l pangoft2`" \ -DWT_CMAKE_FINDER_INSTALL_DIR='/lib/wt' \ -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ '$(1)'
--- a/src/wxwidgets.mk Sat Jun 08 20:53:29 2013 -0400 +++ b/src/wxwidgets.mk Sun Jun 09 09:48:08 2013 -0400 @@ -54,11 +54,11 @@ --without-hildon \ --without-dmalloc \ --without-odbc \ - LIBS=" `'$(TARGET)-pkg-config' --libs-only-l libtiff-4`" + LIBS=" `'$(MXE_PKG_CONFIG)' --libs-only-l libtiff-4`" $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= -$(MAKE) -C '$(1)/locale' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= allmo $(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= __install_wxrc___depname= - $(INSTALL) -m755 '$(HOST_BINDIR)/wx-config' '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-wx-config' + $(INSTALL) -m755 '$(HOST_BINDIR)/wx-config' '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)wx-config' # build the wxWidgets variant without unicode support cd '$(1)' && $(call UNPACK_PKG_ARCHIVE,wxwidgets) @@ -102,7 +102,7 @@ --without-hildon \ --without-dmalloc \ --without-odbc \ - LIBS=" `'$(TARGET)-pkg-config' --libs-only-l libtiff-4`" + LIBS=" `'$(MXE_PKG_CONFIG)' --libs-only-l libtiff-4`" $(MAKE) -C '$(1)/$(wxwidgets_SUBDIR)' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= # backup of the unicode wx-config script @@ -111,14 +111,14 @@ $(MAKE) -C '$(1)/$(wxwidgets_SUBDIR)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= __install_wxrc___depname= mv '$(HOST_BINDIR)/wx-config' '$(HOST_BINDIR)/wx-config-nounicode' - $(INSTALL) -m755 '$(HOST_BINDIR)/wx-config-nounicode' '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-wx-config-nounicode' + $(INSTALL) -m755 '$(HOST_BINDIR)/wx-config-nounicode' '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)wx-config-nounicode' # restore the unicode wx-config script mv '$(HOST_BINDIR)/wx-config-backup' '$(HOST_BINDIR)/wx-config' # build test program - '$(TARGET)-g++' \ + '$(MXE_CXX)' \ -W -Wall -Werror -pedantic -std=gnu++0x \ '$(2).cpp' -o '$(HOST_BINDIR)/test-wxwidgets.exe' \ - `'$(TARGET)-wx-config' --cflags --libs` + `'$(MXE_TOOL_PREFIX)wx-config' --cflags --libs` endef
--- a/src/x264.mk Sat Jun 08 20:53:29 2013 -0400 +++ b/src/x264.mk Sun Jun 09 09:48:08 2013 -0400 @@ -15,7 +15,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ - --cross-prefix='$(TARGET)'- \ + --cross-prefix='$(MXE_TOOL_PREFIX)' \ $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ --prefix='$(HOST_PREFIX)' \ $(ENABLE_SHARED_OR_STATIC) \
--- a/src/xerces.mk Sat Jun 08 20:53:29 2013 -0400 +++ b/src/xerces.mk Sun Jun 09 09:48:08 2013 -0400 @@ -41,12 +41,12 @@ --disable-msgloader-icu \ --with-curl='$(HOST_PREFIX)' \ --without-icu \ - LIBS="`$(TARGET)-pkg-config --libs libcurl`" + LIBS="`$(MXE_PKG_CONFIG) --libs libcurl`" $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= $(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= - '$(TARGET)-g++' \ + '$(MXE_CXX)' \ -W -Wall -Werror -ansi -pedantic \ '$(2).cpp' -o '$(HOST_BINDIR)/test-xerces.exe' \ - `'$(TARGET)-pkg-config' xerces-c --cflags --libs` + `'$(MXE_PKG_CONFIG)' xerces-c --cflags --libs` endef
--- a/src/xine-lib.mk Sat Jun 08 20:53:29 2013 -0400 +++ b/src/xine-lib.mk Sun Jun 09 09:48:08 2013 -0400 @@ -53,7 +53,7 @@ --without-wavpack \ CFLAGS='-I$(1)/win32/include' \ PTHREAD_LIBS='-lpthread -lws2_32' \ - LIBS="`$(TARGET)-pkg-config --libs libmng`" + LIBS="`$(MXE_PKG_CONFIG) --libs libmng`" $(MAKE) -C '$(1)' -j '$(JOBS)' $(MAKE) -C '$(1)' -j 1 install endef
--- a/src/xmlwrapp.mk Sat Jun 08 20:53:29 2013 -0400 +++ b/src/xmlwrapp.mk Sun Jun 09 09:48:08 2013 -0400 @@ -20,6 +20,6 @@ $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(HOST_PREFIX)' \ - PKG_CONFIG='$(TARGET)-pkg-config' + PKG_CONFIG='$(MXE_PKG_CONFIG)' $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= html_DATA= endef
--- a/src/zziplib.mk Sat Jun 08 20:53:29 2013 -0400 +++ b/src/zziplib.mk Sun Jun 09 09:48:08 2013 -0400 @@ -23,7 +23,7 @@ --disable-mmap \ $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(HOST_PREFIX)' \ - PKG_CONFIG='$(TARGET)-pkg-config' + PKG_CONFIG='$(MXE_PKG_CONFIG)' $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= $(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= endef