Makefile.pandora
author Sam Lantinga <slouken@libsdl.org>
Tue, 02 Apr 2013 07:57:37 -0700
changeset 7045 4be2c24b7de1
parent 5586 7fe92c1dc1d9
child 7667 be1cc6f55840
permissions -rw-r--r--
Fixed bug 1780 - SDL_RWFromFile() sets an error on Android although a valid SDL_RWops pointer is returned.

Philipp Wiesemann

SDL_RWFromFile() sets an error to be queried with SDL_GetError() on Android although a valid SDL_RWops pointer is returned.

This happens if the fallback implemented in SDL_android.cpp is used to load compressed assets (see README.android in section "Loading assets") and results in a message like "java.io.FileNotFoundException: This file can not be opened as a file descriptor; it is probably compressed". I think this is confusing and not needed because the loading works as expected.

I attached a patch which changes SDL_android.cpp to not set an error if compressed assets are loaded. In this case also no Exception is queried and no additional string are created.
     1 # Makefile to build the pandora SDL library
     2 
     3 AR	= arm-none-linux-gnueabi-ar
     4 RANLIB	= arm-none-linux-gnueabi-ranlib
     5 CC = arm-none-linux-gnueabi-gcc
     6 CXX = arm-none-linux-gnueabi-g++
     7 STRIP = arm-none-linux-gnueabi-strip
     8 
     9 CFLAGS  = -O3 -march=armv7-a -mcpu=cortex-a8 -mtune=cortex-a8 -mfloat-abi=softfp \
    10 	-mfpu=neon -ftree-vectorize -ffast-math -fomit-frame-pointer -fno-strict-aliasing -fsingle-precision-constant \
    11 	-I./include -I$(PNDSDK)/usr/include -DSDL_REVISION=0
    12 
    13 TARGET  = libSDL.a
    14 
    15 SOURCES = ./src/*.c ./src/audio/*.c ./src/cpuinfo/*.c ./src/events/*.c \
    16 	./src/file/*.c ./src/stdlib/*.c ./src/thread/*.c ./src/timer/*.c ./src/video/*.c \
    17 	./src/joystick/*.c ./src/haptic/*.c ./src/power/*.c ./src/video/dummy/*.c ./src/audio/disk/*.c \
    18 	./src/audio/dummy/*.c ./src/loadso/dlopen/*.c ./src/audio/dsp/*.c \
    19 	./src/thread/pthread/SDL_systhread.c ./src/thread/pthread/SDL_syssem.c \
    20 	./src/thread/pthread/SDL_sysmutex.c ./src/thread/pthread/SDL_syscond.c \
    21 	./src/joystick/linux/*.c ./src/haptic/linux/*.c ./src/timer/unix/*.c \
    22 	./src/atomic/linux/*.c \
    23 	./src/video/pandora/SDL_pandora.o ./src/video/pandora/SDL_pandora_events.o ./src/video/x11/*.c 
    24 	
    25 
    26 OBJECTS = $(shell echo $(SOURCES) | sed -e 's,\.c,\.o,g')
    27 
    28 CONFIG_H = $(shell cp include/SDL_config_pandora.h include/SDL_config.h && touch include/SDL_revision.h)
    29 
    30 all: $(TARGET)
    31 
    32 $(TARGET): $(CONFIG_H) $(OBJECTS)
    33 	$(AR) crv $@ $^
    34 	$(RANLIB) $@
    35 
    36 clean:
    37 	rm -f $(TARGET) $(OBJECTS)