From ddc313a1035bda629064d51357510511ffebdc96 Mon Sep 17 00:00:00 2001 From: dm Date: Mon, 11 Mar 2019 18:13:53 +0500 Subject: [PATCH] Revert "[CMAKE] Fixed emcc warnings about SDL & OPENGL_LIBRARIES being nil" This reverts commit 8d59fcd7f1deb470bbe7caec0f5b92b6be3bfd36. --- CMakeLists.txt | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 41f1dfe1d..e7a6eef7c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -145,8 +145,6 @@ set(OXYGINE_LIBRARY_DIRS if (FORCE_GLES) set(OPENGL_LIBRARIES libGLESv2.lib) -else () - set(OPENGL_LIBRARIES "") endif(FORCE_GLES) @@ -161,10 +159,8 @@ set(CORE_LIBS if (OX_USE_SDL2) - if(!EMSCRIPTEN) - set(CORE_LIBS ${CORE_LIBS} - SDL2main SDL2) - endif(!EMSCRIPTEN) + set(CORE_LIBS ${CORE_LIBS} + SDL2main SDL2) set(OXYGINE_INCLUDE_DIRS ${OXYGINE_INCLUDE_DIRS} ${SDL2_INCLUDE_DIRS}) endif(OX_USE_SDL2)