From 719806b2ade835b4a581ec5dbb023e2145fc5864 Mon Sep 17 00:00:00 2001 From: Arnold <40414978+PatriceJiang@users.noreply.github.com> Date: Fri, 13 Mar 2020 16:38:47 +0800 Subject: [PATCH] update libs --- win32/CMakeLists.txt | 52 ++++++++++++++++++++++++++++++++++---------- 1 file changed, 41 insertions(+), 11 deletions(-) diff --git a/win32/CMakeLists.txt b/win32/CMakeLists.txt index 7cc2191e..65936fc2 100644 --- a/win32/CMakeLists.txt +++ b/win32/CMakeLists.txt @@ -17,19 +17,19 @@ set_target_properties(glew32 PROPERTIES IMPORTED_IMPLIB ${CMAKE_CURRENT_LIST_DIR}/libs/glew32.lib ) -add_library(glfw3-2015 STATIC IMPORTED GLOBAL) +# add_library(glfw3-2015 STATIC IMPORTED GLOBAL) -set_target_properties(glfw3-2015 PROPERTIES - IMPORTED_IMPLIB ${CMAKE_CURRENT_LIST_DIR}/libs/glfw3-2015.lib -) +# set_target_properties(glfw3-2015 PROPERTIES +# IMPORTED_IMPLIB ${CMAKE_CURRENT_LIST_DIR}/libs/glfw3-2015.lib +# ) -add_library(glfw3 STATIC IMPORTED GLOBAL) +# add_library(glfw3 STATIC IMPORTED GLOBAL) -set_target_properties(glfw3 PROPERTIES - #IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/glfw3.lib - IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/glfw3-2015.lib - #IMPORTED_IMPLIB ${CMAKE_CURRENT_LIST_DIR}/libs/glfw3-2015.lib -) +# set_target_properties(glfw3 PROPERTIES +# #IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/glfw3.lib +# IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/glfw3-2015.lib +# #IMPORTED_IMPLIB ${CMAKE_CURRENT_LIST_DIR}/libs/glfw3-2015.lib +# ) add_library(iconv SHARED IMPORTED GLOBAL) @@ -154,6 +154,7 @@ add_library(OpenAL32 SHARED IMPORTED GLOBAL) set_target_properties(OpenAL32 PROPERTIES IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/OpenAL32.dll IMPORTED_IMPLIB ${CMAKE_CURRENT_LIST_DIR}/libs/OpenAL32.lib + INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_CURRENT_LIST_DIR}/include/OpenalSoft ) add_library(sqlite3 SHARED IMPORTED GLOBAL) @@ -163,6 +164,31 @@ set_target_properties(sqlite3 PROPERTIES IMPORTED_IMPLIB ${CMAKE_CURRENT_LIST_DIR}/libs/sqlite3.lib ) + +add_library(SDL2 SHARED IMPORTED GLOBAL) +set_target_properties(SDL2 PROPERTIES + IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/SDL2.dll + IMPORTED_IMPLIB ${CMAKE_CURRENT_LIST_DIR}/libs/SDL2.lib +) + +add_library(EGL SHARED IMPORTED GLOBAL) +set_target_properties(EGL PROPERTIES + IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/libEGL.dll + IMPORTED_IMPLIB ${CMAKE_CURRENT_LIST_DIR}/libs/libEGL.lib +) + +add_library(GLESv2 SHARED IMPORTED GLOBAL) +set_target_properties(GLESv2 PROPERTIES + IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/libGLESv2.dll + IMPORTED_IMPLIB ${CMAKE_CURRENT_LIST_DIR}/libs/libGLESv2.lib +) + + +add_library(GLES_CM SHARED IMPORTED GLOBAL) +set_target_properties(GLES_CM PROPERTIES + IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/libGLES_CM.dll + IMPORTED_IMPLIB ${CMAKE_CURRENT_LIST_DIR}/libs/libGLES_CM.lib +) set(se_libs_name) if(USE_SE_V8) @@ -189,6 +215,7 @@ if(USE_SE_V8) set_target_properties(v8 PROPERTIES INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_CURRENT_LIST_DIR}/include/v8 + INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_CURRENT_LIST_DIR}/include/v8 ) set(se_libs_name v8) @@ -226,7 +253,6 @@ endif() list(APPEND CC_EXTERNAL_LIBS freetype glew32 - glfw3 iconv crypto curl @@ -245,6 +271,10 @@ list(APPEND CC_EXTERNAL_LIBS ${se_libs_name} zlib websockets + SDL2 + GLESv2 + EGL + GLES_CM ) list(APPEND CC_EXTERNAL_INCLUDES