LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

am 2a59fa7d: Merge "emulator: fix the build"

Browse Source 
* commit '2a59fa7dd29872c203218ebc3da45011f7caf66c':
  emulator: fix the build
This commit is contained in:
David 'Digit' Turner
2011-08-25 13:10:39 -07:00
committed by Android Git Automerger
parent c662376323 2a59fa7dd2
commit 9765cb8a7f
1 changed files with 8 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
tools/emulator/opengl/host/renderer/Android.mk
View File

@@ -1,31 +1,14 @@
LOCAL_PATH:=$(call my-dir)
# host renderer process ###########################
include $(CLEAR_VARS)
$(call emugl-begin-host-executable,emulator_renderer)
$(call emugl-import,libOpenglRender)
LOCAL_SRC_FILES := main.cpp
LOCAL_CFLAGS += -O0 -g
emulatorOpengl := $(LOCAL_PATH)/../..
#ifeq ($(HOST_OS),windows)
#LOCAL_LDLIBS += -lws2_32
#endif
LOCAL_MODULE := emulator_renderer
LOCAL_MODULE_TAGS := debug
$(call emugl-end-module)
LOCAL_SRC_FILES := \
main.cpp
LOCAL_CFLAGS += -g -O0
LOCAL_C_INCLUDES := $(emulatorOpengl)/host/include \
$(emulatorOpengl)/host/include/libOpenglRender \
$(emulatorOpengl)/shared/OpenglOsUtils \
$(emulatorOpengl)/shared/OpenglCodecCommon \
$(emulatorOpengl)/host/libs/libOpenglRender
ifeq ($(HOST_OS),windows)
LOCAL_LDLIBS += -lws2_32
endif
LOCAL_SHARED_LIBRARIES := libOpenglRender \
libGLESv1_dec \
libGLESv2_dec \
lib_renderControl_dec
include $(BUILD_HOST_EXECUTABLE)