diff options
| -rw-r--r-- | plugins/ao/Makefile | 7 | ||||
| -rw-r--r-- | plugins/converter/Makefile.am | 10 | ||||
| -rwxr-xr-x | scripts/portable_build.sh | 16 |
3 files changed, 18 insertions, 15 deletions
diff --git a/plugins/ao/Makefile b/plugins/ao/Makefile index 3b8e24ad..890c0010 100644 --- a/plugins/ao/Makefile +++ b/plugins/ao/Makefile @@ -2,13 +2,14 @@ OUT=ao.so CC=gcc -ZLIB_LIBS?=-lz +#ZLIB_LIBS?=-lz +ZLIB_LIBS=../../lib-x86-32/libz.a CFLAGS?=-O2 -fomit-frame-pointer CFLAGS+=-Wall -fPIC -DPATH_MAX=1024 -DHAS_PSXCPU=1 -I../.. -I./ -Ieng_ssf -Ieng_qsf -Ieng_dsf CFLAGS+=$(STATIC_CFLAGS) -LDFLAGS+=-module -shared $(ZLIB_LIBS) -lm +LDFLAGS+=-module -shared -lm SOURCES=plugin.c main.c corlett.c\ eng_dsf/eng_dsf.c eng_dsf/dc_hw.c eng_dsf/aica.c eng_dsf/aicadsp.c eng_dsf/arm7.c eng_dsf/arm7i.c\ @@ -24,7 +25,7 @@ OBJECTS=$(SOURCES:.c=.o) all: $(SOURCES) $(OUT) $(OUT): $(OBJECTS) - $(CC) $(LDFLAGS) $(OBJECTS) -o $@ + $(CC) $(LDFLAGS) $(OBJECTS) -o $@ $(ZLIB_LIBS) .c.o: $(CC) $(CFLAGS) $< -c -o $@ diff --git a/plugins/converter/Makefile.am b/plugins/converter/Makefile.am index 72c4e19b..198cec95 100644 --- a/plugins/converter/Makefile.am +++ b/plugins/converter/Makefile.am @@ -1,7 +1,7 @@ if HAVE_CONVERTER if STATICLINK -pkglib_LTLIBRARIES = converter.la converter_gtkui.la convgui_fallback.la +pkglib_LTLIBRARIES = converter.la converter_gtkui.la converter_gtkui_fallback.la else pkglib_LTLIBRARIES = converter.la converter_gtkui.la endif @@ -17,12 +17,12 @@ converter_gtkui_la_CFLAGS = -std=c99 $(GTKUI_DEPS_CFLAGS) # fallback lib if STATICLINK GTK_ROOT=../../../deadbeef-deps/gtk-debian/usr -convgui_fallback_la_SOURCES = convgui.c interface.c support.c callbacks.h converter.h interface.h support.h -convgui_fallback_la_LDFLAGS = -module +converter_gtkui_fallback_la_SOURCES = convgui.c interface.c support.c callbacks.h converter.h interface.h support.h +converter_gtkui_fallback_la_LDFLAGS = -module -convgui_fallback_la_LIBADD = $(LDADD) -L$(GTK_ROOT)/lib $(GTK_ROOT)/lib/libgtk-x11-2.0.la $(GTK_ROOT)/lib/libgdk-x11-2.0.la $(GTK_ROOT)/lib/libpangoft2-1.0.la $(GTK_ROOT)/lib/libpangocairo-1.0.la $(GTK_ROOT)/lib/libgdk_pixbuf-2.0.la -lm $(GTK_ROOT)/lib/libcairo.la $(GTK_ROOT)/lib/libpango-1.0.la $(GTK_ROOT)/lib/libgobject-2.0.la $(GTK_ROOT)/lib/libgmodule-2.0.la $(GTK_ROOT)/lib/libgthread-2.0.la -lrt $(GTK_ROOT)/lib/libglib-2.0.la +converter_gtkui_fallback_la_LIBADD = $(LDADD) -L$(GTK_ROOT)/lib $(GTK_ROOT)/lib/libgtk-x11-2.0.la $(GTK_ROOT)/lib/libgdk-x11-2.0.la $(GTK_ROOT)/lib/libpangoft2-1.0.la $(GTK_ROOT)/lib/libpangocairo-1.0.la $(GTK_ROOT)/lib/libgdk_pixbuf-2.0.la -lm $(GTK_ROOT)/lib/libcairo.la $(GTK_ROOT)/lib/libpango-1.0.la $(GTK_ROOT)/lib/libgobject-2.0.la $(GTK_ROOT)/lib/libgmodule-2.0.la $(GTK_ROOT)/lib/libgthread-2.0.la -lrt $(GTK_ROOT)/lib/libglib-2.0.la -convgui_fallback_la_CFLAGS = -std=c99 -I $(GTK_ROOT)/include -I $(GTK_ROOT)/lib/gtk-2.0/include -I $(GTK_ROOT)/include/glib-2.0 -I $(GTK_ROOT)/include/gtk-2.0 -I $(GTK_ROOT)/include/cairo -I $(GTK_ROOT)/lib/glib-2.0/include/ -I $(GTK_ROOT)/include/pango-1.0 -I $(GTK_ROOT)/include/atk-1.0 -DULTRA_COMPATIBLE=1 +converter_gtkui_fallback_la_CFLAGS = -std=c99 -I $(GTK_ROOT)/include -I $(GTK_ROOT)/lib/gtk-2.0/include -I $(GTK_ROOT)/include/glib-2.0 -I $(GTK_ROOT)/include/gtk-2.0 -I $(GTK_ROOT)/include/cairo -I $(GTK_ROOT)/lib/glib-2.0/include/ -I $(GTK_ROOT)/include/pango-1.0 -I $(GTK_ROOT)/include/atk-1.0 -DULTRA_COMPATIBLE=1 endif diff --git a/scripts/portable_build.sh b/scripts/portable_build.sh index 89fc5a8d..5ab23f29 100755 --- a/scripts/portable_build.sh +++ b/scripts/portable_build.sh @@ -3,22 +3,24 @@ VERSION=`cat PORTABLE_VERSION | perl -ne 'chomp and print'` ORIGIN=`pwd | perl -ne 'chomp and print'` export APBUILD_STATIC_LIBGCC=1 -#./autogen.sh +./autogen.sh CC=$ORIGIN/tools/apbuild/apgcc CXX=$ORIGIN/tools/apbuild/apgcc ./configure --enable-staticlink --enable-portable --disable-nls --disable-artwork-imlib2 sed -i 's/-lstdc++ -lm -lgcc_s -lc -lgcc_s/-lm -lc/g' libtool -#make clean -#make -j9 +make clean +make -j9 -ZLIB_LIBS=$ORIGIN/lib-x86-32/libz.a -CFLAGS=-I $ORIGIN/lib-x86-32/include +#ZLIB_LIBS="$ORIGIN/lib-x86-32/libz.a" +CFLAGS="-I$ORIGIN/lib-x86-32/include" -for i in dumb shn ao ; do +for i in shn dumb ao ; do + echo cd cd $ORIGIN/plugins/$i make clean - make -j8 ZLIB_LIBS=$ZLIB_LIBS STATIC_CFLAGS=$CFLAGS CC=$CC CXX=$CXX + echo making $ORIGIN/plugins/$i + make -j8 STATIC_CFLAGS="$CFLAGS" CC=$CC CXX=$CXX done cd $ORIGIN |