| commit | 4abdce97bf517c1fd5d57f0778742c1300fc6f06 | [log] [tgz] |
|---|---|---|
| author | David Turner <digit@android.com> | Fri Jun 27 15:10:59 2014 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Thu Jun 26 21:20:22 2014 +0000 |
| tree | 9886593a8206377fbffbc917722a58e9fa9930d0 | |
| parent | 5a1137164fc33460113d31ba5b96ce81558280b8 [diff] | |
| parent | eadcab1dbdb9f05adfc776480f281ff67fc34ed7 [diff] |
Merge "Modify SDL makefile to use the same CFLAGS on 64 bit builds"
diff --git a/distrib/sdl-1.2.15/sources.make b/distrib/sdl-1.2.15/sources.make index 0c988ce..2e1af2b 100644 --- a/distrib/sdl-1.2.15/sources.make +++ b/distrib/sdl-1.2.15/sources.make
@@ -268,6 +268,7 @@ $(call start-emulator64-library,emulator_lib64SDLmain) LOCAL_C_INCLUDES += $(LOCAL_PATH)/include +LOCAL_CFLAGS += $(SDL_CFLAGS) LOCAL_SRC_FILES := $(SDLMAIN_SOURCES) $(call end-emulator-library)