From cfd4bf7a987043070699ae04fcc5023478b3009a Mon Sep 17 00:00:00 2001 From: xietuo <695726929@qq.com> Date: Fri, 24 Jul 2020 18:47:11 +0800 Subject: [PATCH] =?UTF-8?q?Summary:=20=E4=BF=AE=E5=A4=8Dbuild.sh=E8=BF=87?= =?UTF-8?q?=E7=A8=8B=E4=B8=AD=E5=87=BA=E7=8E=B0=E7=9A=84=E9=97=AE=E9=A2=98?= =?UTF-8?q?=20Issue:=20https://gitee.com/hinus/HiLang/issues/I1OU6W=20http?= =?UTF-8?q?s://gitee.com/hinus/HiLang/issues/I1OTTV=20Description:=201.=20?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0string.h=202.=20=E6=A0=B9=E6=8D=AE=E5=AE=98?= =?UTF-8?q?=E7=BD=91=E6=96=87=E6=A1=A3=EF=BC=8C=E4=BF=AE=E6=94=B9CMakeList?= =?UTF-8?q?=20LLT:?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/vm/CMakeLists.txt | 13 +++++++++++-- src/main/vm/extlib/hidraw.cpp | 4 ++-- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/src/main/vm/CMakeLists.txt b/src/main/vm/CMakeLists.txt index 6ab6b14..11f8883 100644 --- a/src/main/vm/CMakeLists.txt +++ b/src/main/vm/CMakeLists.txt @@ -75,7 +75,16 @@ ADD_LIBRARY(draw SHARED extlib/hidraw.cpp TARGET_LINK_LIBRARIES(hivm -ldl) TARGET_LINK_LIBRARIES(math hivm) -find_package(OpenGL REQUIRED) -TARGET_LINK_LIBRARIES(draw hivm ${OPENGL_LIBRARIES} -lglew32) +# -lglew32 on WINDOWS, -lGLEW -lGLU -lGL on UNIX +if (APPLE) + find_package(OpenGL REQUIRED) + TARGET_LINK_LIBRARIES(draw hivm ${OPENGL_LIBRARIES} -lGLEW -lGLU -lGL) +elseif (UNIX) + find_package(OpenGL REQUIRED) + TARGET_LINK_LIBRARIES(draw hivm ${OPENGL_LIBRARIES} -lGLEW -lGLU -lGL) +elseif (WIN32) + find_package(OpenGL REQUIRED) + TARGET_LINK_LIBRARIES(draw hivm ${OPENGL_LIBRARIES} -lglew32) +endif () TARGET_LINK_LIBRARIES(railgun hivm) diff --git a/src/main/vm/extlib/hidraw.cpp b/src/main/vm/extlib/hidraw.cpp index 7f5a493..34528c2 100644 --- a/src/main/vm/extlib/hidraw.cpp +++ b/src/main/vm/extlib/hidraw.cpp @@ -4,7 +4,7 @@ #include #include - +#include #ifdef RAILGUN_WINDOWS #include #endif @@ -259,4 +259,4 @@ SO_PUBLIC ModuleObject* init_libdraw() { #ifdef __cplusplus } -#endif \ No newline at end of file +#endif -- Gitee