Merge pull request cocos2d#3332 from azmeuk/clang

Clang support for Linux
angeltown · Jul 31, 2013 · b206e2e · b206e2e
2 parents 786e7ea + aaba34e
commit b206e2e
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 15 deletions.
diff --git a/cocos2dx/proj.emscripten/cocos2dx.mk b/cocos2dx/proj.emscripten/cocos2dx.mk
@@ -52,8 +52,8 @@ LBITS := $(shell getconf LONG_BIT)
 INCLUDES += -I$(COCOS_SRC)/platform/third_party/linux
 
 ifeq ($(DEBUG), 1)
-CCFLAGS += -O0 -s ASSERTIONS=1 -s SAFE_HEAP=1 --jcache -s GL_UNSAFE_OPTS=0
-CXXFLAGS += -O0 -s ASSERTIONS=1 -s SAFE_HEAP=1 --jcache -s GL_UNSAFE_OPTS=0
+CCFLAGS += -O0 -s ASSERTIONS=1 -s SAFE_HEAP=1 --jcache -s GL_UNSAFE_OPTS=0 -g
+CXXFLAGS += -O0 -s ASSERTIONS=1 -s SAFE_HEAP=1 --jcache -s GL_UNSAFE_OPTS=0 -g
 DEFINES += -D_DEBUG -DCOCOS2D_DEBUG=1 -DCP_USE_DOUBLES=0
 OBJ_DIR := $(OBJ_DIR)/debug
 LIB_DIR := $(LIB_DIR)/debug

diff --git a/cocos2dx/proj.linux/cocos2dx.mk b/cocos2dx/proj.linux/cocos2dx.mk
@@ -1,14 +1,36 @@
+################################################################################
+#
+# LINUX MAKEFILE
+#
+# Available options are:
+# - CLANG=1  : Compiles with clang instead of gcc. Clang must be in your PATH.
+# - V=1      : Enables the verbose mode.
+# - DEBUG=1  : Enables the debug mode, disable compiler optimizations.
+# - OPENAL=1 : Uses OpenAL instead of FMOD as sound engine.
+#
+################################################################################
+
 all:
 
-CC = gcc
-CXX = g++
 # Remove -Wall, because it enables -Wunused-function, and this warning exists in webp.h
 # when enable c++11. I don't know why.
 # GCC 4.6 is primary platform for cocos2d v.3, because it's default compiler for Android, 
 # Blackberry, some Linux distributions.It supports all important features of c++11, but have 
 # no flag "-std=c++11" (which was turned on in version 4.7).
-CCFLAGS += -MMD -Werror -Wno-deprecated-declarations -fPIC
-CXXFLAGS += -MMD -Werror -Wno-deprecated-declarations -fPIC -std=gnu++0x
+CCFLAGS  += -MMD -Wno-deprecated-declarations -fPIC
+CXXFLAGS += -MMD -Wno-deprecated-declarations -fPIC -std=gnu++0x
+
+ifeq ($(CLANG), 1)
+CC := clang
+CXX := clang++
+DEFINES += -D__STRICT_ANSI__ # Allows clang 3.3 to use __float128
+else
+CC = gcc
+CXX = g++
+CCFLAGS  += -Werror
+CXXFLAGS += -Werror
+endif
+
 ARFLAGS = cr
 
 DEFINES += -DLINUX -DCC_KEYBOARD_SUPPORT

diff --git a/external/Box2D/proj.emscripten/Makefile b/external/Box2D/proj.emscripten/Makefile
@@ -50,14 +50,13 @@ include ../../../cocos2dx/proj.emscripten/cocos2dx.mk
 
 INCLUDES = -I../..
 
-# Unfortunetly Box2D doesn't compiler cleanly without these
-CXXFLAGS += -Qunused-variable
-CXXFLAGS += -Wno-uninitialized
+# Cocos2d is not responsible for warnings in external projects
+CXXFLAGS += -w
 
 ifeq ($(DEBUG), 1)
-DEFINES = -D_DEBUG
+DEFINES += -D_DEBUG
 else
-DEFINES =
+DEFINES +=
 endif
 
 TARGET := $(LIB_DIR)/$(TARGET)

diff --git a/external/Box2D/proj.linux/Makefile b/external/Box2D/proj.linux/Makefile
@@ -50,9 +50,8 @@ include ../../../cocos2dx/proj.linux/cocos2dx.mk
 
 INCLUDES = -I../..
 
-# Unfortunetly Box2D doesn't compiler cleanly without these
-CXXFLAGS += -Wno-unused-but-set-variable
-CXXFLAGS += -Wno-uninitialized
+# Cocos2d is not responsible for warnings in external projects
+CXXFLAGS += -w
 
 ifeq ($(DEBUG), 1)
 DEFINES = -D_DEBUG

diff --git a/samples/Cpp/HelloCpp/proj.emscripten/main.cpp b/samples/Cpp/HelloCpp/proj.emscripten/main.cpp
@@ -13,7 +13,7 @@ int main(int argc, char **argv)
     // create the application instance
     AppDelegate app;
 
-    EGLView* eglView = EGLView::getInstance();
+    EGLView::getInstance();
 
     return Application::getInstance()->run();
 }