diff options
| author | Tobias Gruetzmacher <tobias-git@23.gs> | 2014-10-09 19:15:06 (GMT) |
|---|---|---|
| committer | Tobias Gruetzmacher <tobias-git@23.gs> | 2014-10-09 19:15:06 (GMT) |
| commit | 3a73727b761708c14fb87b7f017d74ebb82c703c (patch) | |
| tree | 88b390fc1e58228a3acef4dccedb4df1cc671ae1 /src/sdl2_mixer.mk | |
| parent | 10d10facd7414e72485e03a080596b393eaf6f45 (diff) | |
| download | mxe-3a73727b761708c14fb87b7f017d74ebb82c703c.zip mxe-3a73727b761708c14fb87b7f017d74ebb82c703c.tar.gz mxe-3a73727b761708c14fb87b7f017d74ebb82c703c.tar.bz2 | |
Enable shared build for sdl2_mixer.
Added a fix for library order when linking.
Diffstat (limited to 'src/sdl2_mixer.mk')
| -rw-r--r-- | src/sdl2_mixer.mk | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/src/sdl2_mixer.mk b/src/sdl2_mixer.mk index 23ab904..0f0dc8d 100644 --- a/src/sdl2_mixer.mk +++ b/src/sdl2_mixer.mk @@ -25,9 +25,7 @@ define $(PKG)_BUILD >> '$(1)/SDL2_mixer.pc.in' $(SED) -i 's,for path in /usr/local; do,for path in; do,' '$(1)/configure' cd '$(1)' && ./configure \ - --host='$(TARGET)' \ - --disable-shared \ - --prefix='$(PREFIX)/$(TARGET)' \ + $(MXE_CONFIGURE_OPTS) \ --with-sdl-prefix='$(PREFIX)/$(TARGET)' \ --disable-sdltest \ --disable-music-mod \ @@ -41,14 +39,13 @@ define $(PKG)_BUILD SMPEG_CONFIG='$(PREFIX)/$(TARGET)/bin/smpeg2-config' \ WINDRES='$(TARGET)-windres' \ LIBS='-lvorbis -logg' - $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= + $(MAKE) -C '$(1)' -j '$(JOBS)' install $(MXE_DISABLE_CRUFT) -# '$(TARGET)-gcc' \ -# -W -Wall -Werror -ansi -pedantic \ -# '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-sdl2_mixer.exe' \ -# `'$(TARGET)-pkg-config' SDL2_mixer --cflags --libs` + '$(TARGET)-gcc' \ + -W -Wall -Werror -ansi -pedantic \ + '$(TOP_DIR)/src/sdl_mixer-test.c' -o '$(PREFIX)/$(TARGET)/bin/test-sdl2_mixer.exe' \ + `'$(TARGET)-pkg-config' SDL2_mixer --cflags --libs` endef $(PKG)_BUILD_i686-pc-mingw32 = -$(PKG)_BUILD_SHARED = |