Android.mk
author Sam Lantinga <slouken@libsdl.org>
Tue, 10 Jan 2017 08:54:33 -0800
changeset 10806 36f40b8cc979
parent 9592 ba866f4ec675
child 10879 773cbb61ad27
permissions -rwxr-xr-x
Fixed bugs 2570, 3145, improved OpenGL ES context support on Windows and X11

Mark Callow

The attached patch does the following for the X11 and Windows platforms, the only ones where SDL attempts to use context_create_es_profile:

- Adds SDL_HINT_OPENGL_ES_DRIVER by which the application can
say to use the OpenGL ES driver & EGL rather than the Open GL
driver. (For bug #2570)
- Adds code to {WIN,X11}_GL_InitExtensions to determine the maximum
OpenGL ES version supported by the OpenGL driver (for bug #3145)
- Modifies the test that determines whether to use the OpenGL
driver or the real OpenGL ES driver to take into account the
hint, the requested and supported ES version and whether ES 1.X
is being requested. (For bug #2570 & bug #3145)
- Enables the testgles2 test for __WINDOWS__ and __LINUX__ and adds
the test to the VisualC projects.

With the fix in place I have run testdraw2, testgl and testgles2 without any issues and have run my own apps that use OpenGL, OpenGL ES 3 and OpenGL ES 1.1.
     1 LOCAL_PATH := $(call my-dir)
     2 
     3 ###########################
     4 #
     5 # SDL shared library
     6 #
     7 ###########################
     8 
     9 include $(CLEAR_VARS)
    10 
    11 LOCAL_MODULE := SDL2
    12 
    13 LOCAL_C_INCLUDES := $(LOCAL_PATH)/include
    14 
    15 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_C_INCLUDES)
    16 
    17 LOCAL_SRC_FILES := \
    18 	$(subst $(LOCAL_PATH)/,, \
    19 	$(wildcard $(LOCAL_PATH)/src/*.c) \
    20 	$(wildcard $(LOCAL_PATH)/src/audio/*.c) \
    21 	$(wildcard $(LOCAL_PATH)/src/audio/android/*.c) \
    22 	$(wildcard $(LOCAL_PATH)/src/audio/dummy/*.c) \
    23 	$(LOCAL_PATH)/src/atomic/SDL_atomic.c \
    24 	$(LOCAL_PATH)/src/atomic/SDL_spinlock.c.arm \
    25 	$(wildcard $(LOCAL_PATH)/src/core/android/*.c) \
    26 	$(wildcard $(LOCAL_PATH)/src/cpuinfo/*.c) \
    27 	$(wildcard $(LOCAL_PATH)/src/dynapi/*.c) \
    28 	$(wildcard $(LOCAL_PATH)/src/events/*.c) \
    29 	$(wildcard $(LOCAL_PATH)/src/file/*.c) \
    30 	$(wildcard $(LOCAL_PATH)/src/haptic/*.c) \
    31 	$(wildcard $(LOCAL_PATH)/src/haptic/dummy/*.c) \
    32 	$(wildcard $(LOCAL_PATH)/src/joystick/*.c) \
    33 	$(wildcard $(LOCAL_PATH)/src/joystick/android/*.c) \
    34 	$(wildcard $(LOCAL_PATH)/src/loadso/dlopen/*.c) \
    35 	$(wildcard $(LOCAL_PATH)/src/power/*.c) \
    36 	$(wildcard $(LOCAL_PATH)/src/power/android/*.c) \
    37 	$(wildcard $(LOCAL_PATH)/src/filesystem/android/*.c) \
    38 	$(wildcard $(LOCAL_PATH)/src/render/*.c) \
    39 	$(wildcard $(LOCAL_PATH)/src/render/*/*.c) \
    40 	$(wildcard $(LOCAL_PATH)/src/stdlib/*.c) \
    41 	$(wildcard $(LOCAL_PATH)/src/thread/*.c) \
    42 	$(wildcard $(LOCAL_PATH)/src/thread/pthread/*.c) \
    43 	$(wildcard $(LOCAL_PATH)/src/timer/*.c) \
    44 	$(wildcard $(LOCAL_PATH)/src/timer/unix/*.c) \
    45 	$(wildcard $(LOCAL_PATH)/src/video/*.c) \
    46 	$(wildcard $(LOCAL_PATH)/src/video/android/*.c) \
    47 	$(wildcard $(LOCAL_PATH)/src/test/*.c))
    48 
    49 LOCAL_CFLAGS += -DGL_GLEXT_PROTOTYPES
    50 LOCAL_LDLIBS := -ldl -lGLESv1_CM -lGLESv2 -llog -landroid
    51 
    52 include $(BUILD_SHARED_LIBRARY)
    53 
    54 ###########################
    55 #
    56 # SDL static library
    57 #
    58 ###########################
    59 
    60 LOCAL_MODULE := SDL2_static
    61 
    62 LOCAL_MODULE_FILENAME := libSDL2
    63 
    64 LOCAL_SRC_FILES += $(subst $(LOCAL_PATH)/,,$(LOCAL_PATH)/src/main/android/SDL_android_main.c)
    65 
    66 LOCAL_LDLIBS := 
    67 LOCAL_EXPORT_LDLIBS := -Wl,--undefined=Java_org_libsdl_app_SDLActivity_nativeInit -ldl -lGLESv1_CM -lGLESv2 -llog -landroid
    68 
    69 include $(BUILD_STATIC_LIBRARY)