diff options
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | src/atkmm.mk | 4 | ||||
| -rw-r--r-- | src/glibmm.mk | 5 | ||||
| -rw-r--r-- | src/libgsf.mk | 5 | ||||
| -rw-r--r-- | src/libsigc++.mk | 5 | ||||
| -rw-r--r-- | src/libxml++.mk | 5 | ||||
| -rw-r--r-- | src/xvidcore.mk | 10 |
7 files changed, 14 insertions, 24 deletions
@@ -300,7 +300,7 @@ $(PREFIX)/$(3)/installed/$(1): $(TOP_DIR)/src/$(1).mk \ @echo '[build] $(1)', @echo '[no-build] $(1)') @touch '$(LOG_DIR)/$(TIMESTAMP)/$(1)_$(3)' - @[ $(words $(MXE_TARGETS)) == 1 ] || ln -sf '$(TIMESTAMP)/$(1)_$(3)' '$(LOG_DIR)/$(1)_$(3)' + @ln -sf '$(TIMESTAMP)/$(1)_$(3)' '$(LOG_DIR)/$(1)_$(3)' @ln -sf '$(TIMESTAMP)/$(1)_$(3)' '$(LOG_DIR)/$(1)' @if ! (time $(MAKE) -f '$(MAKEFILE)' 'build-only-$(1)_$(3)') &> '$(LOG_DIR)/$(TIMESTAMP)/$(1)_$(3)'; then \ echo; \ @@ -349,7 +349,7 @@ endef $(foreach TARGET,$(MXE_TARGETS), \ $(shell [ -d '$(PREFIX)/$(TARGET)/installed' ] || mkdir -p '$(PREFIX)/$(TARGET)/installed') \ $(foreach PKG,$(PKGS), \ - $(eval $(call PKG_RULE,$(PKG),$(call TMP_DIR,$(PKG)),$(TARGET))))) + $(eval $(call PKG_RULE,$(PKG),$(call TMP_DIR,$(PKG)-$(TARGET)),$(TARGET))))) # convenience set-like functions for unique lists SET_APPEND = \ diff --git a/src/atkmm.mk b/src/atkmm.mk index 7d5c06b..9f7cb09 100644 --- a/src/atkmm.mk +++ b/src/atkmm.mk @@ -19,9 +19,7 @@ endef define $(PKG)_BUILD cd '$(1)' && ./configure \ - --host='$(TARGET)' \ - --disable-shared \ - --prefix='$(PREFIX)/$(TARGET)' \ + $(MXE_CONFIGURE_OPTS) \ MAKE=$(MAKE) $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= $(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= diff --git a/src/glibmm.mk b/src/glibmm.mk index a20a1f2..4d9a93e 100644 --- a/src/glibmm.mk +++ b/src/glibmm.mk @@ -19,10 +19,7 @@ endef define $(PKG)_BUILD cd '$(1)' && ./configure \ - --host='$(TARGET)' \ - --build="`config.guess`" \ - --disable-shared \ - --prefix='$(PREFIX)/$(TARGET)' \ + $(MXE_CONFIGURE_OPTS) \ CXX='$(TARGET)-c++' \ PKG_CONFIG='$(PREFIX)/bin/$(TARGET)-pkg-config' \ GLIB_COMPILE_SCHEMAS='$(PREFIX)/$(TARGET)/bin/glib-compile-schemas' \ diff --git a/src/libgsf.mk b/src/libgsf.mk index 098b002..f2190c0 100644 --- a/src/libgsf.mk +++ b/src/libgsf.mk @@ -22,10 +22,7 @@ define $(PKG)_BUILD $(SED) -i 's,^\(Requires:.*\),\1 gio-2.0,' '$(1)'/libgsf-1.pc.in echo 'Libs.private: -lz -lbz2' >> '$(1)'/libgsf-1.pc.in cd '$(1)' && ./configure \ - --host='$(TARGET)' \ - --build="`config.guess`" \ - --disable-shared \ - --prefix='$(PREFIX)/$(TARGET)' \ + $(MXE_CONFIGURE_OPTS) \ --disable-nls \ --disable-gtk-doc \ --without-python \ diff --git a/src/libsigc++.mk b/src/libsigc++.mk index 21f10a5..fca9bdd 100644 --- a/src/libsigc++.mk +++ b/src/libsigc++.mk @@ -19,10 +19,7 @@ endef define $(PKG)_BUILD cd '$(1)' && ./configure \ - --host='$(TARGET)' \ - --build="`config.guess`" \ - --disable-shared \ - --prefix='$(PREFIX)/$(TARGET)' \ + $(MXE_CONFIGURE_OPTS) \ CXX='$(TARGET)-c++' \ PKG_CONFIG='$(PREFIX)/bin/$(TARGET)-pkg-config' \ MAKE=$(MAKE) diff --git a/src/libxml++.mk b/src/libxml++.mk index 4d4128b..36386a5 100644 --- a/src/libxml++.mk +++ b/src/libxml++.mk @@ -19,10 +19,7 @@ endef define $(PKG)_BUILD cd '$(1)' && CXX="$(TARGET)-g++ -mthreads" ./configure \ - --host='$(TARGET)' \ - --build="`config.guess`" \ - --disable-shared \ - --prefix='$(PREFIX)/$(TARGET)' \ + $(MXE_CONFIGURE_OPTS) \ MAKE=$(MAKE) $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= $(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= diff --git a/src/xvidcore.mk b/src/xvidcore.mk index ef2933e..f80f6b8 100644 --- a/src/xvidcore.mk +++ b/src/xvidcore.mk @@ -17,15 +17,19 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - cd '$(1)' && autoconf + $(SED) -i 's,yasm_prog="yasm",yasm_prog="$(TARGET)-yasm",' '$(1)/configure.in' + cd '$(1)' && autoreconf -fi cd '$(1)' && ./configure \ $(MXE_CONFIGURE_OPTS) $(MAKE) -C '$(1)' -j 1 BUILD_DIR='build' $(if $(BUILD_STATIC),SHARED,STATIC)_LIB= $(INSTALL) -d '$(PREFIX)/$(TARGET)/include' $(INSTALL) -m644 '$(1)/../../src/xvid.h' '$(PREFIX)/$(TARGET)/include/' $(INSTALL) -d '$(PREFIX)/$(TARGET)/lib' - $(INSTALL) -m644 '$(1)/build/xvidcore.$(LIB_SUFFIX)' '$(PREFIX)/$(TARGET)/lib/' - ln -sf '$(PREFIX)/$(TARGET)/lib/xvidcore.$(LIB_SUFFIX)' '$(PREFIX)/$(TARGET)/lib/libxvidcore.$(LIB_SUFFIX)' + $(INSTALL) -m644 '$(1)/build/xvidcore.$(LIB_SUFFIX)' '$(PREFIX)/$(TARGET)/bin/' + $(if $(BUILD_STATIC), \ + ln -sf '$(PREFIX)/$(TARGET)/lib/xvidcore.$(LIB_SUFFIX)' '$(PREFIX)/$(TARGET)/lib/libxvidcore.$(LIB_SUFFIX)', \ + mv '$(1)/build/xvidcore.dll.a' '$(1)/build/libxvidcore.dll.a' && \ + $(INSTALL) -m644 '$(1)/build/libxvidcore.dll.a' '$(PREFIX)/$(TARGET)/lib/') endef define $(PKG)_BUILD_x86_64-w64-mingw32 |