diff --git a/CocosDenshion/proj.linux/Makefile b/CocosDenshion/proj.linux/Makefile index e2ae77df01..23183adaea 100644 --- a/CocosDenshion/proj.linux/Makefile +++ b/CocosDenshion/proj.linux/Makefile @@ -1,8 +1,8 @@ CC = gcc CXX = g++ TARGET = libcocosdenshion.so -CCFLAGS = -Wall -g -O2 -CXXFLAGS = -Wall -g -O2 +CCFLAGS = -Wall -g -O2 -fPIC +CXXFLAGS = -Wall -g -O2 -fPIC VISIBILITY = INCLUDES = -I.. \ diff --git a/cocos2dx/platform/third_party/linux/libraries/lib64/libcurl.a.REMOVED.git-id b/cocos2dx/platform/third_party/linux/libraries/lib64/libcurl.a.REMOVED.git-id new file mode 100644 index 0000000000..4a89718bfc --- /dev/null +++ b/cocos2dx/platform/third_party/linux/libraries/lib64/libcurl.a.REMOVED.git-id @@ -0,0 +1 @@ +16aa53d20c3f675cf94eb63ee029a3ca655e849a \ No newline at end of file diff --git a/cocos2dx/platform/third_party/linux/libraries/lib64/libfreetype.a.REMOVED.git-id b/cocos2dx/platform/third_party/linux/libraries/lib64/libfreetype.a.REMOVED.git-id new file mode 100644 index 0000000000..d59d453354 --- /dev/null +++ b/cocos2dx/platform/third_party/linux/libraries/lib64/libfreetype.a.REMOVED.git-id @@ -0,0 +1 @@ +605d56a7423e747f13034756e21bf64e0ad94a43 \ No newline at end of file diff --git a/cocos2dx/platform/third_party/linux/libraries/lib64/libjpeg.a.REMOVED.git-id b/cocos2dx/platform/third_party/linux/libraries/lib64/libjpeg.a.REMOVED.git-id new file mode 100644 index 0000000000..e9f19c488e --- /dev/null +++ b/cocos2dx/platform/third_party/linux/libraries/lib64/libjpeg.a.REMOVED.git-id @@ -0,0 +1 @@ +26c9923522213ccf69d7934d31376fcb28216b29 \ No newline at end of file diff --git a/cocos2dx/platform/third_party/linux/libraries/lib64/libpng.a.REMOVED.git-id b/cocos2dx/platform/third_party/linux/libraries/lib64/libpng.a.REMOVED.git-id new file mode 100644 index 0000000000..b078584e81 --- /dev/null +++ b/cocos2dx/platform/third_party/linux/libraries/lib64/libpng.a.REMOVED.git-id @@ -0,0 +1 @@ +d582ee99eb4cf5b1a3e1010535d3ad0e02b07d15 \ No newline at end of file diff --git a/cocos2dx/platform/third_party/linux/libraries/lib64/libxml2.a.REMOVED.git-id b/cocos2dx/platform/third_party/linux/libraries/lib64/libxml2.a.REMOVED.git-id new file mode 100644 index 0000000000..d4818a8baa --- /dev/null +++ b/cocos2dx/platform/third_party/linux/libraries/lib64/libxml2.a.REMOVED.git-id @@ -0,0 +1 @@ +f4d59c12129476e3e34083f0b6dc9953821da854 \ No newline at end of file diff --git a/cocos2dx/proj.linux/Makefile b/cocos2dx/proj.linux/Makefile index ae92f17b03..700075df4a 100644 --- a/cocos2dx/proj.linux/Makefile +++ b/cocos2dx/proj.linux/Makefile @@ -108,13 +108,18 @@ OBJECTS = ../actions/CCAction.o \ ../CCScheduler.o \ ../cocos2d.o +LBITS := $(shell getconf LONG_BIT) +ifeq ($(LBITS),64) +STATICLIBS_DIR = ../platform/third_party/linux/libraries/lib64 +else STATICLIBS_DIR = ../platform/third_party/linux/libraries -#STATICLIBS = $(STATICLIBS_DIR)/libfreetype.a \ -# $(STATICLIBS_DIR)/libcurl.a \ -# $(STATICLIBS_DIR)/libxml2.a \ -# $(STATICLIBS_DIR)/libpng.a \ -# $(STATICLIBS_DIR)/libjpeg.a - +endif +STATICLIBS = $(STATICLIBS_DIR)/libfreetype.a \ + $(STATICLIBS_DIR)/libcurl.a \ + $(STATICLIBS_DIR)/libxml2.a \ + $(STATICLIBS_DIR)/libpng.a \ + $(STATICLIBS_DIR)/libjpeg.a + SHAREDLIBS = -lglfw -lGL ####### Build rules