Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

[ios] fixed buildside texturepacker for ios

  • Loading branch information...
commit 054a22726878475e9213e5ac47f36fed177b24ca 1 parent d248283
davilla davilla authored
9 configure.in
View
@@ -589,13 +589,7 @@ case $host in
use_dvdcss=no
use_gles=yes
use_cpu=cortex-a8
- check_sdl_arch=[`file /opt/local/lib/libSDL_image.dylib | awk '{V=7; print $V}'`]
- if test "x$check_sdl_arch" = "xi386"; then
- use_texturepacker_native=yes
- USE_TEXTUREPACKER_NATIVE_ROOT="/opt/local"
- else
- use_texturepacker=no
- fi
+ use_texturepacker_native=yes
ARCH="arm-osx"
use_arch="arm"
PYTHON_VERSION="2.6"
@@ -609,7 +603,6 @@ case $host in
use_joystick=no
use_vtbdecoder=no
use_texturepacker_native=yes
- USE_TEXTUREPACKER_NATIVE_ROOT="$prefix"
ARCH="x86-osx"
AC_SUBST(ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_DARWIN -DTARGET_DARWIN_OSX -D_LINUX")
;;
3  tools/darwin/depends/Makefile.in
View
@@ -1,6 +1,9 @@
include Makefile.include
BUILDTOOLS = gas-preprocessor help2man m4 autoconf automake libtool pkg-config yasm cmake sed tar dpkg swig
+ifeq ($(DARWIN), ios)
+BUILDTOOLS+= liblzo2-native libjpeg-turbo-native libpng-native libtiff-native libsdl-native libsdl_image-native
+endif
SUBDIRS := \
Backrow pcre expat gettext readline sqlite3 \
46 tools/darwin/depends/libjpeg-turbo-native/Makefile
View
@@ -0,0 +1,46 @@
+include ../Makefile.buildtools
+export NASM=$(TOOLCHAIN)/bin/yasm
+export CFLAGS=-I$(TOOLCHAIN)/include -fexceptions
+export LDFLAGS=-L$(TOOLCHAIN)/lib
+export CPPFLAGS=-I$(TOOLCHAIN)/include
+export CXXFLAGS=-I$(TOOLCHAIN)/include
+
+# lib name, version
+LIBNAME=libjpeg-turbo
+VERSION=1.2.0
+SOURCE=$(LIBNAME)-$(VERSION)
+ARCHIVE=$(LIBNAME)-$(VERSION).tar.gz
+
+# configuration settings
+CONFIGURE=./configure --prefix=$(TOOLCHAIN) \
+ --with-jpeg8
+
+LIBDYLIB=$(SOURCE)/.libs/lib$(LIBNAME).dylib
+
+CLEAN_FILES=$(ARCHIVE) $(SOURCE)
+
+all: $(LIBDYLIB) .installed
+
+$(TARBALLS_LOCATION)/$(ARCHIVE):
+ $(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE)
+
+$(SOURCE): $(TARBALLS_LOCATION)/$(ARCHIVE)
+ rm -rf $(SOURCE)
+ $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE)
+ echo $(SOURCE) > .gitignore
+ cd $(SOURCE); autoreconf -vif
+ cd $(SOURCE); $(CONFIGURE)
+
+$(LIBDYLIB): $(SOURCE)
+ make -j 1 -C $(SOURCE)
+
+.installed:
+ make -C $(SOURCE) install
+ touch $@
+
+clean:
+ make -C $(SOURCE) clean
+ rm -f .installed
+
+distclean::
+ rm -rf $(SOURCE) .installed
42 tools/darwin/depends/liblzo2-native/Makefile
View
@@ -0,0 +1,42 @@
+include ../Makefile.buildtools
+export CFLAGS=-I$(TOOLCHAIN)/include
+export LDFLAGS=-L$(TOOLCHAIN)/lib
+export CPPFLAGS=-I$(TOOLCHAIN)/include
+export CXXFLAGS=-I$(TOOLCHAIN)/include
+
+# lib name, version
+LIBNAME=lzo
+VERSION=2.06
+SOURCE=$(LIBNAME)-$(VERSION)
+ARCHIVE=$(SOURCE).tar.gz
+
+# configuration settings
+CONFIGURE=./configure --prefix=$(TOOLCHAIN) \
+ --enable-shared=yes
+
+LIBDYLIB=$(SOURCE)/src/.libs/lib$(LIBNAME)2.dylib
+
+all: $(LIBDYLIB) .installed
+
+$(TARBALLS_LOCATION)/$(ARCHIVE):
+ $(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE)
+
+$(SOURCE): $(TARBALLS_LOCATION)/$(ARCHIVE)
+ rm -rf $(SOURCE)
+ $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE)
+ echo $(SOURCE) > .gitignore
+ cd $(SOURCE); $(CONFIGURE)
+
+$(LIBDYLIB): $(SOURCE)
+ make -j $(MAKE_JOBS) -C $(SOURCE)
+
+.installed:
+ make -C $(SOURCE) install
+ touch $@
+
+clean:
+ make -C $(SOURCE) clean
+ rm -f .installed
+
+distclean::
+ rm -rf $(SOURCE) .installed
41 tools/darwin/depends/libpng-native/Makefile
View
@@ -0,0 +1,41 @@
+include ../Makefile.buildtools
+export CFLAGS=-I$(TOOLCHAIN)/include
+export LDFLAGS=-L$(TOOLCHAIN)/lib
+export CPPFLAGS=-I$(TOOLCHAIN)/include
+export CXXFLAGS=-I$(TOOLCHAIN)/include
+
+# lib name, version
+LIBNAME=libpng
+VERSION=1.2.38
+SOURCE=$(LIBNAME)-$(VERSION)
+ARCHIVE=$(SOURCE).tar.gz
+
+# configuration settings
+CONFIGURE=./configure --prefix=$(TOOLCHAIN)
+
+LIBDYLIB=$(SOURCE)/.libs/$(LIBNAME).dylib
+
+all: $(LIBDYLIB) .installed
+
+$(TARBALLS_LOCATION)/$(ARCHIVE):
+ $(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE)
+
+$(SOURCE): $(TARBALLS_LOCATION)/$(ARCHIVE)
+ rm -rf $(SOURCE)
+ $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE)
+ echo $(SOURCE) > .gitignore
+ cd $(SOURCE); $(CONFIGURE)
+
+$(LIBDYLIB): $(SOURCE)
+ make -j $(MAKE_JOBS) -C $(SOURCE)
+
+.installed:
+ make -C $(SOURCE) install
+ touch $@
+
+clean:
+ make -C $(SOURCE) clean
+ rm -f .installed
+
+distclean::
+ rm -rf $(SOURCE) .installed
33 tools/darwin/depends/libsdl-native/01-SDL_SetWidthHeight.patch
View
@@ -0,0 +1,33 @@
+Index: include/SDL_video.h
+===================================================================
+--- include/SDL_video.h (revision 4116)
++++ include/SDL_video.h (working copy)
+@@ -324,6 +324,11 @@
+ extern DECLSPEC SDL_Rect ** SDLCALL SDL_ListModes(SDL_PixelFormat *format, Uint32 flags);
+
+ /**
++* Alter the width and height of the current surface to the given sizes.
++*/
++extern DECLSPEC void SDLCALL SDL_SetWidthHeight(int width, int height);
++
++/**
+ * Set up a video mode with the specified width, height and bits-per-pixel.
+ *
+ * If 'bpp' is 0, it is treated as the current display bits per pixel.
+
+Index: src/video/SDL_video.c
+===================================================================
+--- src/video/SDL_video.c (revision 4116)
++++ src/video/SDL_video.c (working copy)
+@@ -1956,3 +1956,11 @@
+ return(0);
+ }
+ }
++
++void SDL_SetWidthHeight(int width, int height)
++{
++ if (current_video != NULL && current_video->screen != NULL) {
++ current_video->screen->w = width;
++ current_video->screen->h = height;
++ }
++}
12 tools/darwin/depends/libsdl-native/02-mmx.patch
View
@@ -0,0 +1,12 @@
+--- src/video/mmx.h Mon Feb 06 08:28:51 2006 +0000
++++ src/video/mmx.h Sun Jan 30 13:38:57 2011 -0800
+@@ -355,7 +355,7 @@
+
+ #define mmx_r2m(op, reg, mem) \
+ __asm__ __volatile__ (#op " %%" #reg ", %0" \
+- : "=X" (mem) \
++ : "=m" (mem) \
+ : /* nothing */ )
+
+ #define mmx_r2r(op, regs, regd) \
+
45 tools/darwin/depends/libsdl-native/Makefile
View
@@ -0,0 +1,45 @@
+include ../Makefile.buildtools
+export CFLAGS=-I$(TOOLCHAIN)/include
+export LDFLAGS=-L$(TOOLCHAIN)/lib
+export CPPFLAGS=-I$(TOOLCHAIN)/include
+export CXXFLAGS=-I$(TOOLCHAIN)/include
+
+# lib name, version
+LIBNAME=SDL
+VERSION=1.2.14
+SOURCE=$(LIBNAME)-$(VERSION)
+ARCHIVE=$(SOURCE).tar.gz
+
+# configuration settings
+CONFIGURE=./configure --prefix=$(TOOLCHAIN) \
+ --without-x --disable-video-x11
+
+LIBDYLIB=$(SOURCE)/.libs/$(LIBNAME).dylib
+
+all: $(LIBDYLIB) .installed
+
+$(TARBALLS_LOCATION)/$(ARCHIVE):
+ $(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE)
+ echo $(ARCHIVE) > .gitignore
+
+$(SOURCE): $(TARBALLS_LOCATION)/$(ARCHIVE)
+ rm -rf $(SOURCE)
+ $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE)
+ echo $(SOURCE) > .gitignore
+ cd $(SOURCE); patch -p0 < ../01-SDL_SetWidthHeight.patch
+ cd $(SOURCE); patch -p0 < ../02-mmx.patch
+ cd $(SOURCE); $(CONFIGURE)
+
+$(LIBDYLIB): $(SOURCE)
+ make -j 1 -C $(SOURCE)
+
+.installed:
+ make -C $(SOURCE) install
+ touch $@
+
+clean:
+ make -C $(SOURCE) clean
+ rm -f .installed
+
+distclean::
+ rm -rf $(SOURCE) .installed
42 tools/darwin/depends/libsdl_image-native/Makefile
View
@@ -0,0 +1,42 @@
+include ../Makefile.buildtools
+export CFLAGS=-I$(TOOLCHAIN)/include
+export LDFLAGS=-L$(TOOLCHAIN)/lib
+export CPPFLAGS=-I$(TOOLCHAIN)/include
+export CXXFLAGS=-I$(TOOLCHAIN)/include
+
+# lib name, version
+LIBNAME=SDL_image
+VERSION=1.2.7
+SOURCE=$(LIBNAME)-$(VERSION)
+ARCHIVE=$(SOURCE).tar.gz
+
+# configuration settings
+CONFIGURE=./configure --prefix=$(TOOLCHAIN) \
+ --disable-jpg-shared --disable-png-shared --disable-tif-shared --disable-sdltest
+
+LIBDYLIB=$(SOURCE)/.libs/$(LIBNAME).a
+
+all: $(LIBDYLIB) .installed
+
+$(TARBALLS_LOCATION)/$(ARCHIVE):
+ $(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE)
+
+$(SOURCE): $(TARBALLS_LOCATION)/$(ARCHIVE)
+ rm -rf $(SOURCE)
+ $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE)
+ echo $(SOURCE) > .gitignore
+ cd $(SOURCE); $(CONFIGURE)
+
+$(LIBDYLIB): $(SOURCE)
+ make -j $(MAKE_JOBS) -C $(SOURCE)
+
+.installed:
+ make -C $(SOURCE) install
+ touch $@
+
+clean:
+ make -C $(SOURCE) clean
+ rm -f .installed
+
+distclean::
+ rm -rf $(SOURCE) .installed
41 tools/darwin/depends/libtiff-native/Makefile
View
@@ -0,0 +1,41 @@
+include ../Makefile.buildtools
+export CFLAGS=-I$(TOOLCHAIN)/include
+export LDFLAGS=-L$(TOOLCHAIN)/lib
+export CPPFLAGS=-I$(TOOLCHAIN)/include
+export CXXFLAGS=-I$(TOOLCHAIN)/include
+
+# lib name, version
+LIBNAME=tiff
+VERSION=3.8.2
+SOURCE=$(LIBNAME)-$(VERSION)
+ARCHIVE=$(SOURCE).tar.gz
+
+# configuration settings
+CONFIGURE=./configure --prefix=$(TOOLCHAIN)
+
+LIBDYLIB=$(SOURCE)/libtiff/.libs/lib$(LIBNAME).dylib
+
+all: $(LIBDYLIB) .installed
+
+$(TARBALLS_LOCATION)/$(ARCHIVE):
+ $(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE)
+
+$(SOURCE): $(TARBALLS_LOCATION)/$(ARCHIVE)
+ rm -rf $(SOURCE)
+ $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE)
+ echo $(SOURCE) > .gitignore
+ cd $(SOURCE); $(CONFIGURE)
+
+$(LIBDYLIB): $(SOURCE)
+ make -j $(MAKE_JOBS) -C $(SOURCE)
+
+.installed:
+ make -C $(SOURCE) install
+ touch $@
+
+clean:
+ make -C $(SOURCE) clean
+ rm -f .installed
+
+distclean::
+ rm -rf $(SOURCE) .installed
7 tools/darwin/depends/xbmc/Makefile
View
@@ -2,6 +2,13 @@ include ../Makefile.include
SOURCE=../../../../
+ifeq ($(DARWIN), ios)
+include ../Makefile.buildtools
+export USE_TEXTUREPACKER_NATIVE_ROOT=$(TOOLCHAIN)
+else
+export USE_TEXTUREPACKER_NATIVE_ROOT=$(PREFIX)
+endif
+
# configuration settings
export PATH:=$(TOOLCHAIN)/bin:$(PREFIX)/bin:$(PATH)
CONFIGURE=./configure --prefix=$(PREFIX) \

1 comment on commit 054a227

Memphiz
Owner

Ohh cool - you've learned that from droid? ^^

Please sign in to comment.
Something went wrong with that request. Please try again.