diff options
| author | David 'Digit' Turner <digit@google.com> | 2014-07-12 03:11:34 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-07-10 20:18:52 +0000 |
| commit | 4e4233679d4ef4e25d13fe3b56bd8cdaa3b822cc (patch) | |
| tree | b8ea40c428b9d4cf3f842ab1c0cbe52a1fcd883c /emulator/opengl/host/renderer | |
| parent | d1dd8ee1e85f60569ddf6ebc7fe1cbde7ebb6f38 (diff) | |
| parent | d50eea1bfe3883072b4f8dfcb663f0d83c36bab1 (diff) | |
| download | sdk-4e4233679d4ef4e25d13fe3b56bd8cdaa3b822cc.zip sdk-4e4233679d4ef4e25d13fe3b56bd8cdaa3b822cc.tar.gz sdk-4e4233679d4ef4e25d13fe3b56bd8cdaa3b822cc.tar.bz2 | |
Merge changes I551e0f3d,I26d84cf5,I27c993d1 into idea133
* changes:
emulator/opengl: Remove out-of-process handling code.
emulator/opengl: refactor Thread class.
emulator/opengl: refactor shared library handling.
Diffstat (limited to 'emulator/opengl/host/renderer')
| -rw-r--r-- | emulator/opengl/host/renderer/Android.mk | 6 | ||||
| -rw-r--r-- | emulator/opengl/host/renderer/main.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/emulator/opengl/host/renderer/Android.mk b/emulator/opengl/host/renderer/Android.mk index 55fcb80..81dcaf7 100644 --- a/emulator/opengl/host/renderer/Android.mk +++ b/emulator/opengl/host/renderer/Android.mk @@ -6,9 +6,9 @@ $(call emugl-import,libOpenglRender) LOCAL_SRC_FILES := main.cpp LOCAL_CFLAGS += -O0 -g -#ifeq ($(HOST_OS),windows) -#LOCAL_LDLIBS += -lws2_32 -#endif +ifeq ($(HOST_OS),linux) +LOCAL_LDLIBS += -lX11 +endif $(call emugl-end-module) diff --git a/emulator/opengl/host/renderer/main.cpp b/emulator/opengl/host/renderer/main.cpp index 2c3f8e2..470e692 100644 --- a/emulator/opengl/host/renderer/main.cpp +++ b/emulator/opengl/host/renderer/main.cpp @@ -141,7 +141,7 @@ int main(int argc, char *argv[]) // // run the server listener loop // - server->Main(); + server->main(); #else // // on windows we need to handle messages for the |