From 06ff1bc5947a762623853754161a8cded6870aa4 Mon Sep 17 00:00:00 2001 From: martell Date: Mon, 2 Dec 2013 07:10:37 +0000 Subject: [PATCH] Fixed HelloCpp Linking on Linux --- cocos/2d/CMakeLists.txt | 28 +++++++++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-) diff --git a/cocos/2d/CMakeLists.txt b/cocos/2d/CMakeLists.txt index 21eb76e8f1..a5838f5dcb 100644 --- a/cocos/2d/CMakeLists.txt +++ b/cocos/2d/CMakeLists.txt @@ -149,6 +149,26 @@ add_library(cocos2d STATIC ) if(WIN32) + +if(MINGW) + +set(COCOS_LINK + z + jpeg + png + webp + tiff + glfw3 + glew32 + opengl32 + iconv + freetype + bz2 + ) + +else() + + set(COCOS_LINK libjpeg libpng @@ -161,19 +181,21 @@ set(COCOS_LINK libiconv libzlib ) + +endif() + elseif(APPLE) else() set(COCOS_LINK jpeg - png webp tiff freetype - pthread fontconfig + png + pthread glfw - gles GLEW GL X11