diff options
| author | David 'Digit' Turner <digit@google.com> | 2014-08-27 19:01:06 +0200 |
|---|---|---|
| committer | David 'Digit' Turner <digit@google.com> | 2014-08-27 19:01:06 +0200 |
| commit | 31435b2d287b4eb5a4def3dfb17fbd7f930e5ced (patch) | |
| tree | dd49d80843e153f72f8003561c893015478d67a1 /emulator/opengl/sdl.mk | |
| parent | 956b01fd91a6a576e8c8e35b2d608408e866c5da (diff) | |
| download | sdk-31435b2d287b4eb5a4def3dfb17fbd7f930e5ced.zip sdk-31435b2d287b4eb5a4def3dfb17fbd7f930e5ced.tar.gz sdk-31435b2d287b4eb5a4def3dfb17fbd7f930e5ced.tar.bz2 | |
emulator/opengl: Cleanup build files + remove obsolete tests.
This patch cleans up the build files for the GPU emulation libraries
(i.e. there is no need to test for BUILD_EMULATOR_64BITS anymore,
filtering is now handled by the build system directly).
+ Remove a bunch obsolete tests, which were not unit tests, despite
their name beginning with ut_xxxx.
Which includes removing dependency on SDL too.
+ Remove -m64 and -fPIC flags from compilation. These are not
necessary anymore (again, the build system now takes charge of
placing them when necessary), and generated link-time warning
when building Windows executables.
+ Remove a few declarations related to the now-obsolete platform
build (these libraries are only built with the emulator's build
system now).
Change-Id: I27c28979c42cd51f2fe9e30edd4141136e80ee03
Diffstat (limited to 'emulator/opengl/sdl.mk')
| -rw-r--r-- | emulator/opengl/sdl.mk | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/emulator/opengl/sdl.mk b/emulator/opengl/sdl.mk deleted file mode 100644 index a85ed58..0000000 --- a/emulator/opengl/sdl.mk +++ /dev/null @@ -1,25 +0,0 @@ -# This contains common definitions used to define a host module to -# link SDL with the EmuGL test programs. - -ifeq ($(BUILD_STANDALONE_EMULATOR),true) - -# When using the emulator standalone build, inherit the values from the -# Makefile that included us. -EMUGL_SDL_CFLAGS := $(SDL_CFLAGS) -EMUGL_SDL_LDLIBS := $(SDL_LDLIBS) -EMUGL_SDL_STATIC_LIBRARIES := emulator_libSDL emulator_libSDLmain - -else # BUILD_STANDALONE_EMULATOR != true - -# Otherwise, use the prebuilt libraries that come with the platform. - -EMUGL_SDL_CONFIG ?= prebuilts/tools/$(HOST_PREBUILT_TAG)/sdl/bin/sdl-config -EMUGL_SDL_CFLAGS := $(shell $(EMUGL_SDL_CONFIG) --cflags) -EMUGL_SDL_LDLIBS := $(filter-out %.a %.lib,$(shell $(EMUGL_SDL_CONFIG) --static-libs)) -EMUGL_SDL_STATIC_LIBRARIES := libSDL libSDLmain - -ifeq ($(HOST_OS),windows) -EMUGL_SDL_LDLIBS += -lws2_32 -endif - -endif # BUILD_STANDALONE_EMULATOR != true |