diff --git a/samples/Cpp/HelloCpp/proj.blackberry/.cproject b/samples/Cpp/HelloCpp/proj.blackberry/.cproject index 625b467085..b1e144c720 100644 --- a/samples/Cpp/HelloCpp/proj.blackberry/.cproject +++ b/samples/Cpp/HelloCpp/proj.blackberry/.cproject @@ -31,12 +31,12 @@ - - - - - - + + + + + + @@ -165,11 +165,11 @@ @@ -216,12 +216,12 @@ - - - - - - + + + + + + @@ -252,11 +252,11 @@ @@ -303,12 +303,12 @@ - - - - - - + + + + + + @@ -339,11 +339,11 @@ @@ -388,12 +388,12 @@ - - - - - - + + + + + + @@ -423,12 +423,12 @@ @@ -474,12 +474,12 @@ - - - - - - + + + + + + @@ -510,11 +510,11 @@ @@ -560,12 +560,12 @@ - - - - - - + + + + + + @@ -596,11 +596,11 @@ diff --git a/samples/Cpp/HelloCpp/proj.linux/Makefile b/samples/Cpp/HelloCpp/proj.linux/Makefile index 30ff3e47d8..3d845f50e3 100644 --- a/samples/Cpp/HelloCpp/proj.linux/Makefile +++ b/samples/Cpp/HelloCpp/proj.linux/Makefile @@ -5,7 +5,7 @@ CCFLAGS = -Wall CXXFLAGS = -Wall VISIBILITY = -COCOS2DX_PATH = ../../../cocos2dx +COCOS2DX_PATH = ../../../../cocos2dx INCLUDES = -I../ \ -I../Classes \ -I$(COCOS2DX_PATH) \ @@ -29,9 +29,9 @@ OBJECTS = ./main.o \ LBITS := $(shell getconf LONG_BIT) ifeq ($(LBITS),64) -STATICLIBS_DIR = ../../../cocos2dx/platform/third_party/linux/libraries/lib64 +STATICLIBS_DIR = ../../../../cocos2dx/platform/third_party/linux/libraries/lib64 else -STATICLIBS_DIR = ../../../cocos2dx/platform/third_party/linux/libraries +STATICLIBS_DIR = ../../../../cocos2dx/platform/third_party/linux/libraries endif STATICLIBS = STATICLIBS = $(STATICLIBS_DIR)/libfreetype.a \ @@ -43,19 +43,19 @@ STATICLIBS = $(STATICLIBS_DIR)/libfreetype.a \ SHAREDLIBS = ifeq ($(LBITS),64) -SHAREDLIBS_DIR = ../../../CocosDenshion/third_party/fmod/lib64/api/lib +SHAREDLIBS_DIR = ../../../../CocosDenshion/third_party/fmod/lib64/api/lib SHAREDLIBS = -L$(SHAREDLIBS_DIR) -lfmodex64 else -SHAREDLIBS_DIR = ../../../CocosDenshion/third_party/fmod/api/lib +SHAREDLIBS_DIR = ../../../../CocosDenshion/third_party/fmod/api/lib SHAREDLIBS = -L$(SHAREDLIBS_DIR) -lfmodex endif SHAREDLIBS += -lglfw -lGL -#SHAREDLIBS += -L../../../lib/linux/Debug -lcocos2d -lrt -lz -lcocosdenshion -Wl,-rpath,../../../../lib/linux/Debug/ +#SHAREDLIBS += -L../../../../lib/linux/Debug -lcocos2d -lrt -lz -lcocosdenshion -Wl,-rpath,../../../../../lib/linux/Debug/ SHAREDLIBS += -Wl,-rpath,../../$(SHAREDLIBS_DIR) -#SHAREDLIBS += -Wl,-rpath,../../../../cocos2dx/platform/third_party/linux/glew-1.7.0/glew-1.7.0/lib -SHAREDLIBS += -L../../../cocos2dx/platform/third_party/linux/glew-1.7.0/glew-1.7.0/lib -lGLEW -SHAREDLIBS += -Wl,-rpath,../../../../../cocos2dx/platform/third_party/linux/glew-1.7.0/glew-1.7.0/lib +#SHAREDLIBS += -Wl,-rpath,../../../../../cocos2dx/platform/third_party/linux/glew-1.7.0/glew-1.7.0/lib +SHAREDLIBS += -L../../../../cocos2dx/platform/third_party/linux/glew-1.7.0/glew-1.7.0/lib -lGLEW +SHAREDLIBS += -Wl,-rpath,../../../../../../cocos2dx/platform/third_party/linux/glew-1.7.0/glew-1.7.0/lib #$(shell ../../build-linux.sh $<) @@ -65,16 +65,16 @@ BIN_DIR = $(BIN_DIR_ROOT) debug: BIN_DIR = $(BIN_DIR_ROOT)/debug debug: CCFLAGS += -g3 -O0 debug: CXXFLAGS += -g3 -O0 -debug: SHAREDLIBS += -L../../../lib/linux/Debug -lcocos2d -lrt -lz -lcocosdenshion -debug: SHAREDLIBS += -Wl,-rpath,../../../../../lib/linux/Debug/ +debug: SHAREDLIBS += -L../../../../lib/linux/Debug -lcocos2d -lrt -lz -lcocosdenshion +debug: SHAREDLIBS += -Wl,-rpath,../../../../../../lib/linux/Debug/ debug: DEFINES += -DDEBUG -DCOCOS2D_DEBUG=1 debug: $(TARGET) release: BIN_DIR = $(BIN_DIR_ROOT)/release release: CCFLAGS += -O3 release: CXXFLAGS += -O3 -release: SHAREDLIBS += -L../../../lib/linux/Release -lcocos2d -lrt -lz -lcocosdenshion -release: SHAREDLIBS += -Wl,-rpath,../../../../../lib/linux/Release/ +release: SHAREDLIBS += -L../../../../lib/linux/Release -lcocos2d -lrt -lz -lcocosdenshion +release: SHAREDLIBS += -Wl,-rpath,../../../../../../lib/linux/Release/ release: DEFINES += -DNDEBUG release: $(TARGET) diff --git a/samples/Cpp/HelloCpp/proj.marmalade/HelloCPP.mkb b/samples/Cpp/HelloCpp/proj.marmalade/HelloCPP.mkb index c03a6a877e..5f626391c2 100644 --- a/samples/Cpp/HelloCpp/proj.marmalade/HelloCPP.mkb +++ b/samples/Cpp/HelloCpp/proj.marmalade/HelloCPP.mkb @@ -1,6 +1,6 @@ options { - module_path="../../../cocos2dx/proj.marmalade/" + module_path="../../../../cocos2dx/proj.marmalade/" s3e-data-dir = "../Resources" } diff --git a/samples/Cpp/SimpleGame/proj.marmalade/SimpleGame.mkb b/samples/Cpp/SimpleGame/proj.marmalade/SimpleGame.mkb index 5cd3d85859..3879747fef 100644 --- a/samples/Cpp/SimpleGame/proj.marmalade/SimpleGame.mkb +++ b/samples/Cpp/SimpleGame/proj.marmalade/SimpleGame.mkb @@ -1,6 +1,6 @@ options { - module_path="../../../cocos2dx/proj.marmalade/;../../../CocosDenshion/proj.marmalade/" + module_path="../../../../cocos2dx/proj.marmalade/;../../../../CocosDenshion/proj.marmalade/" s3e-data-dir = "../Resources/" } diff --git a/samples/Cpp/TestCpp/proj.blackberry/.cproject b/samples/Cpp/TestCpp/proj.blackberry/.cproject index 6aa93adc53..252d5d00e1 100644 --- a/samples/Cpp/TestCpp/proj.blackberry/.cproject +++ b/samples/Cpp/TestCpp/proj.blackberry/.cproject @@ -31,15 +31,15 @@ - - - - - - - - - + + + + + + + + + @@ -72,16 +72,16 @@ @@ -129,15 +129,15 @@ - - - - - - - - - + + + + + + + + + @@ -169,16 +169,16 @@ @@ -225,15 +225,15 @@ - - - - - - - - - + + + + + + + + + @@ -267,16 +267,16 @@ @@ -323,15 +323,15 @@ - - - - - - - - - + + + + + + + + + @@ -365,16 +365,16 @@ @@ -420,15 +420,15 @@ - - - - - - - - - + + + + + + + + + @@ -461,16 +461,16 @@ @@ -516,15 +516,15 @@ - - - - - - - - - + + + + + + + + + @@ -558,16 +558,16 @@ @@ -613,15 +613,15 @@ - - - - - - - - - + + + + + + + + + @@ -655,16 +655,16 @@ diff --git a/samples/Cpp/TestCpp/proj.linux/Makefile b/samples/Cpp/TestCpp/proj.linux/Makefile index 4e09433cef..68f1c1e439 100644 --- a/samples/Cpp/TestCpp/proj.linux/Makefile +++ b/samples/Cpp/TestCpp/proj.linux/Makefile @@ -6,7 +6,7 @@ CXXFLAGS = -Wall VISIBILITY = LIBS = -COCOS2DX_PATH = ../../../cocos2dx +COCOS2DX_PATH = ../../../../cocos2dx INCLUDES = -I../ \ -I../../ \ -I../Classes \ @@ -20,10 +20,10 @@ INCLUDES = -I../ \ -I$(COCOS2DX_PATH)/platform/third_party/linux/glew-1.7.0/glew-1.7.0/include/ \ -I$(COCOS2DX_PATH)/platform/third_party/linux/libxml2 \ -I$(COCOS2DX_PATH)/platform/third_party/linux/libjpeg \ - -I../../../CocosDenshion/include \ - -I../../../extensions/ \ - -I../../../external/ \ - -I../../../external/chipmunk/include/chipmunk \ + -I../../../../CocosDenshion/include \ + -I../../../../extensions/ \ + -I../../../../external/ \ + -I../../../../external/chipmunk/include/chipmunk \ LBITS := $(shell getconf LONG_BIT) @@ -129,12 +129,12 @@ OBJECTS = ../Classes/AccelerometerTest/AccelerometerTest.o \ ./main.o include $(COCOS2DX_PATH)/../extensions/proj.linux/Makefile -OBJECTS += $(addprefix ../../../extensions/proj.linux/, $(EXTENSIONS_OBJECTS)) +OBJECTS += $(addprefix ../../../../extensions/proj.linux/, $(EXTENSIONS_OBJECTS)) ifeq ($(LBITS),64) -STATICLIBS_DIR = ../../../cocos2dx/platform/third_party/linux/libraries/lib64 +STATICLIBS_DIR = ../../../../cocos2dx/platform/third_party/linux/libraries/lib64 else -STATICLIBS_DIR = ../../../cocos2dx/platform/third_party/linux/libraries +STATICLIBS_DIR = ../../../../cocos2dx/platform/third_party/linux/libraries endif STATICLIBS = STATICLIBS = $(STATICLIBS_DIR)/libfreetype.a \ @@ -143,24 +143,24 @@ STATICLIBS = $(STATICLIBS_DIR)/libfreetype.a \ $(STATICLIBS_DIR)/libpng.a \ $(STATICLIBS_DIR)/libjpeg.a \ $(STATICLIBS_DIR)/libtiff.a \ - ../../../lib/linux/Debug/libbox2d.a \ - ../../../lib/linux/Debug/libchipmunk.a \ + ../../../../lib/linux/Debug/libbox2d.a \ + ../../../../lib/linux/Debug/libchipmunk.a \ SHAREDLIBS = ifeq ($(LBITS),64) -SHAREDLIBS_DIR = ../../../CocosDenshion/third_party/fmod/lib64/api/lib +SHAREDLIBS_DIR = ../../../../CocosDenshion/third_party/fmod/lib64/api/lib SHAREDLIBS = -L$(SHAREDLIBS_DIR) -lfmodex64 else -SHAREDLIBS_DIR = ../../../CocosDenshion/third_party/fmod/api/lib +SHAREDLIBS_DIR = ../../../../CocosDenshion/third_party/fmod/api/lib SHAREDLIBS = -L$(SHAREDLIBS_DIR) -lfmodex endif SHAREDLIBS += -lglfw -lGL -#SHAREDLIBS += -L../../../lib/linux/Debug -lcocos2d -lrt -lz -lcocosdenshion -Wl,-rpath,../../../../lib/linux/Debug/ +#SHAREDLIBS += -L../../../../lib/linux/Debug -lcocos2d -lrt -lz -lcocosdenshion -Wl,-rpath,../../../../../lib/linux/Debug/ SHAREDLIBS += -Wl,-rpath,../../$(SHAREDLIBS_DIR) -#SHAREDLIBS += -Wl,-rpath,../../../../cocos2dx/platform/third_party/linux/glew-1.7.0/glew-1.7.0/lib -SHAREDLIBS += -L../../../cocos2dx/platform/third_party/linux/glew-1.7.0/glew-1.7.0/lib -lGLEW -SHAREDLIBS += -Wl,-rpath,../../../../../cocos2dx/platform/third_party/linux/glew-1.7.0/glew-1.7.0/lib +#SHAREDLIBS += -Wl,-rpath,../../../../../cocos2dx/platform/third_party/linux/glew-1.7.0/glew-1.7.0/lib +SHAREDLIBS += -L../../../../cocos2dx/platform/third_party/linux/glew-1.7.0/glew-1.7.0/lib -lGLEW +SHAREDLIBS += -Wl,-rpath,../../../../../../cocos2dx/platform/third_party/linux/glew-1.7.0/glew-1.7.0/lib SHAREDLIBS += -Wl,-rpath,../$(STATICLIBS_DIR) @@ -169,14 +169,14 @@ SHAREDLIBS += -lcurl BIN_DIR_ROOT=bin BIN_DIR = BIN_DIR_ROOT -debug: SHAREDLIBS += -L../../../lib/linux/Debug -lcocos2d -lrt -lz -lcocosdenshion -Wl,-rpath,../../../../../lib/linux/Debug +debug: SHAREDLIBS += -L../../../../lib/linux/Debug -lcocos2d -lrt -lz -lcocosdenshion -Wl,-rpath,../../../../../../lib/linux/Debug debug: CCFLAGS += -g3 -O0 debug: CXXFLAGS += -g3 -O0 debug: DEFINES += -DDEBUG -DCC_ENABLE_CHIPMUNK_INTEGRATION -DCOCOS2D_DEBUG=1 debug: BIN_DIR = $(BIN_DIR_ROOT)/debug debug: $(TARGET) -release: SHAREDLIBS += -L../../../lib/linux/Release -lcocos2d -lrt -lz -lcocosdenshion -Wl,-rpath,../../../../../lib/linux/Release +release: SHAREDLIBS += -L../../../../lib/linux/Release -lcocos2d -lrt -lz -lcocosdenshion -Wl,-rpath,../../../../../../lib/linux/Release release: CCFLAGS += -O3 release: CXXFLAGS += -O3 release: DEFINES += -DNDEBUG -DCC_ENABLE_CHIPMUNK_INTEGRATION diff --git a/samples/Cpp/TestCpp/proj.marmalade/TestCPP.mkb b/samples/Cpp/TestCpp/proj.marmalade/TestCPP.mkb index 5fc4514f8e..68011a34d4 100644 --- a/samples/Cpp/TestCpp/proj.marmalade/TestCPP.mkb +++ b/samples/Cpp/TestCpp/proj.marmalade/TestCPP.mkb @@ -1,6 +1,6 @@ options { - module_path="../../../cocos2dx/proj.marmalade/;../../../CocosDenshion/proj.marmalade/;../../../extensions/proj.marmalade/;../../../external/chipmunk/proj.marmalade/;../../../external/Box2D/proj.marmalade/" + module_path="../../../../cocos2dx/proj.marmalade/;../../../../CocosDenshion/proj.marmalade/;../../../../extensions/proj.marmalade/;../../../../external/chipmunk/proj.marmalade/;../../../../external/Box2D/proj.marmalade/" s3e-data-dir = "../Resources/" } diff --git a/samples/Lua/HelloLua/proj.blackberry/.cproject b/samples/Lua/HelloLua/proj.blackberry/.cproject index 45cd666b60..98b2650b64 100644 --- a/samples/Lua/HelloLua/proj.blackberry/.cproject +++ b/samples/Lua/HelloLua/proj.blackberry/.cproject @@ -31,16 +31,16 @@ - - - - - - - - - - + + + + + + + + + + @@ -185,13 +185,13 @@ @@ -240,16 +240,16 @@ - - - - - - - - - - + + + + + + + + + + @@ -284,13 +284,13 @@ @@ -339,16 +339,16 @@ - - - - - - - - - - + + + + + + + + + + @@ -383,13 +383,13 @@ @@ -436,16 +436,16 @@ - - - - - - - - - - + + + + + + + + + + @@ -479,14 +479,14 @@ @@ -534,16 +534,16 @@ - - - - - - - - - - + + + + + + + + + + @@ -578,13 +578,13 @@ @@ -632,16 +632,16 @@ - - - - - - - - - - + + + + + + + + + + @@ -676,13 +676,13 @@ diff --git a/samples/Lua/HelloLua/proj.linux/Makefile b/samples/Lua/HelloLua/proj.linux/Makefile index acac34fa72..ee03750cfd 100644 --- a/samples/Lua/HelloLua/proj.linux/Makefile +++ b/samples/Lua/HelloLua/proj.linux/Makefile @@ -5,7 +5,7 @@ CCFLAGS = -Wall CXXFLAGS = -Wall VISIBILITY = -COCOS2DX_PATH = ../../../cocos2dx +COCOS2DX_PATH = ../../../../cocos2dx INCLUDES = -I../ \ -I../Classes \ -I$(COCOS2DX_PATH) \ @@ -19,25 +19,25 @@ INCLUDES = -I../ \ -I$(COCOS2DX_PATH)/kazmath/include \ -I$(COCOS2DX_PATH)/platform/third_party/linux/libxml2 \ -I$(COCOS2DX_PATH)/platform/third_party/linux/libjpeg \ - -I../../../CocosDenshion/include \ - -I../../../scripting/lua/lua \ - -I../../../scripting/lua/tolua \ - -I../../../scripting/lua/cocos2dx_support + -I../../../../CocosDenshion/include \ + -I../../../../scripting/lua/lua \ + -I../../../../scripting/lua/tolua \ + -I../../../../scripting/lua/cocos2dx_support DEFINES = -DLINUX OBJECTS = ./main.o \ ../Classes/AppDelegate.o \ - ../../../scripting/lua/cocos2dx_support/CCLuaEngine.o \ - ../../../scripting/lua/cocos2dx_support/Cocos2dxLuaLoader.o \ - ../../../scripting/lua/cocos2dx_support/LuaCocos2d.o \ - ../../../scripting/lua/cocos2dx_support/tolua_fix.o + ../../../../scripting/lua/cocos2dx_support/CCLuaEngine.o \ + ../../../../scripting/lua/cocos2dx_support/Cocos2dxLuaLoader.o \ + ../../../../scripting/lua/cocos2dx_support/LuaCocos2d.o \ + ../../../../scripting/lua/cocos2dx_support/tolua_fix.o LBITS := $(shell getconf LONG_BIT) ifeq ($(LBITS),64) -STATICLIBS_DIR = ../../../cocos2dx/platform/third_party/linux/libraries/lib64 +STATICLIBS_DIR = ../../../../cocos2dx/platform/third_party/linux/libraries/lib64 else -STATICLIBS_DIR = ../../../cocos2dx/platform/third_party/linux/libraries +STATICLIBS_DIR = ../../../../cocos2dx/platform/third_party/linux/libraries endif STATICLIBS = $(STATICLIBS_DIR)/libfreetype.a \ @@ -48,14 +48,14 @@ STATICLIBS = $(STATICLIBS_DIR)/libfreetype.a \ # $(STATICLIBS_DIR)/libGLEW.a \ SHAREDLIBS += -lglfw -lcurl -llua -SHAREDLIBS += -Wl,-rpath,../../../../../cocos2dx/platform/third_party/linux/glew-1.7.0/glew-1.7.0/lib -SHAREDLIBS += -L../../../cocos2dx/platform/third_party/linux/glew-1.7.0/glew-1.7.0/lib -lGLEW -SHAREDLIBS += -Wl,-rpath,../../../../../lib/linux/Debug +SHAREDLIBS += -Wl,-rpath,../../../../../../cocos2dx/platform/third_party/linux/glew-1.7.0/glew-1.7.0/lib +SHAREDLIBS += -L../../../../cocos2dx/platform/third_party/linux/glew-1.7.0/glew-1.7.0/lib -lGLEW +SHAREDLIBS += -Wl,-rpath,../../../../../../lib/linux/Debug ifeq ($(LBITS),64) -SHAREDLIBS += -L../../../CocosDenshion/third_party/fmod/lib64/api/lib -lfmodex64 -Wl,-rpath,../../../../../CocosDenshion/third_party/fmod/lib64/api/lib +SHAREDLIBS += -L../../../../CocosDenshion/third_party/fmod/lib64/api/lib -lfmodex64 -Wl,-rpath,../../../../../../CocosDenshion/third_party/fmod/lib64/api/lib else -SHAREDLIBS += -L../../../CocosDenshion/third_party/fmod/api/lib -lfmodex -Wl,-rpath,../../../../../CocosDenshion/third_party/fmod/api/lib +SHAREDLIBS += -L../../../../CocosDenshion/third_party/fmod/api/lib -lfmodex -Wl,-rpath,../../../../../../CocosDenshion/third_party/fmod/api/lib endif #$(shell ../../build-linux.sh $<) @@ -66,16 +66,16 @@ BIN_DIR = $(BIN_DIR_ROOT) debug: BIN_DIR = $(BIN_DIR_ROOT)/debug debug: CCFLAGS += -g3 -O0 debug: CXXFLAGS += -g3 -O0 -debug: SHAREDLIBS += -L../../../lib/linux/Debug -lcocos2d -lrt -lz -lcocosdenshion -debug: SHAREDLIBS += -Wl,-rpath,../../../../../lib/linux/Debug/ +debug: SHAREDLIBS += -L../../../../lib/linux/Debug -lcocos2d -lrt -lz -lcocosdenshion +debug: SHAREDLIBS += -Wl,-rpath,../../../../../../lib/linux/Debug/ debug: DEFINES += -DDEBUG debug: $(TARGET) release: BIN_DIR = $(BIN_DIR_ROOT)/release release: CCFLAGS += -O3 release: CXXFLAGS += -O3 -release: SHAREDLIBS += -L../../../lib/linux/Release -lcocos2d -lrt -lz -lcocosdenshion -release: SHAREDLIBS += -Wl,-rpath,../../../../../lib/linux/Release/ +release: SHAREDLIBS += -L../../../../lib/linux/Release -lcocos2d -lrt -lz -lcocosdenshion +release: SHAREDLIBS += -Wl,-rpath,../../../../../../lib/linux/Release/ release: DEFINES += -DNDEBUG release: $(TARGET) diff --git a/samples/Lua/HelloLua/proj.marmalade/HelloLua.mkb b/samples/Lua/HelloLua/proj.marmalade/HelloLua.mkb index dd22d7d9af..a6560241d4 100644 --- a/samples/Lua/HelloLua/proj.marmalade/HelloLua.mkb +++ b/samples/Lua/HelloLua/proj.marmalade/HelloLua.mkb @@ -1,13 +1,13 @@ options { - module_path="../../../cocos2dx/proj.marmalade/;../../../CocosDenshion/proj.marmalade/;../../../scripting/lua/proj.marmalade/" + module_path="../../../../cocos2dx/proj.marmalade/;../../../../CocosDenshion/proj.marmalade/;../../../../scripting/lua/proj.marmalade/" s3e-data-dir = "../Resources/" } includepaths { ../Classes - ../../../scripting/lua/cocos2dx_support/ + ../../../../scripting/lua/cocos2dx_support/ } subprojects { diff --git a/samples/Lua/TestLua/proj.linux/Makefile b/samples/Lua/TestLua/proj.linux/Makefile index 2c349b90b2..869ab67c99 100644 --- a/samples/Lua/TestLua/proj.linux/Makefile +++ b/samples/Lua/TestLua/proj.linux/Makefile @@ -5,7 +5,7 @@ CCFLAGS = -Wall CXXFLAGS = -Wall VISIBILITY = -COCOS2DX_PATH = ../../../cocos2dx +COCOS2DX_PATH = ../../../../cocos2dx INCLUDES = -I../ \ -I../Classes \ -I$(COCOS2DX_PATH) \ @@ -19,26 +19,26 @@ INCLUDES = -I../ \ -I$(COCOS2DX_PATH)/kazmath/include \ -I$(COCOS2DX_PATH)/platform/third_party/linux/libxml2 \ -I$(COCOS2DX_PATH)/platform/third_party/linux/libjpeg \ - -I../../../CocosDenshion/include \ - -I../../../scripting/lua/lua \ - -I../../../scripting/lua/tolua \ - -I../../../scripting/lua/cocos2dx_support + -I../../../../CocosDenshion/include \ + -I../../../../scripting/lua/lua \ + -I../../../../scripting/lua/tolua \ + -I../../../../scripting/lua/cocos2dx_support DEFINES = -DLINUX OBJECTS = ./main.o \ ../Classes/AppDelegate.o \ - ../../../scripting/lua/cocos2dx_support/CCLuaEngine.o \ - ../../../scripting/lua/cocos2dx_support/Cocos2dxLuaLoader.o \ - ../../../scripting/lua/cocos2dx_support/LuaCocos2d.o \ - ../../../scripting/lua/cocos2dx_support/tolua_fix.o \ + ../../../../scripting/lua/cocos2dx_support/CCLuaEngine.o \ + ../../../../scripting/lua/cocos2dx_support/Cocos2dxLuaLoader.o \ + ../../../../scripting/lua/cocos2dx_support/LuaCocos2d.o \ + ../../../../scripting/lua/cocos2dx_support/tolua_fix.o \ LBITS := $(shell getconf LONG_BIT) ifeq ($(LBITS),64) -STATICLIBS_DIR = ../../../cocos2dx/platform/third_party/linux/libraries/lib64 +STATICLIBS_DIR = ../../../../cocos2dx/platform/third_party/linux/libraries/lib64 else -STATICLIBS_DIR = ../../../cocos2dx/platform/third_party/linux/libraries +STATICLIBS_DIR = ../../../../cocos2dx/platform/third_party/linux/libraries endif STATICLIBS = $(STATICLIBS_DIR)/libfreetype.a \ @@ -48,18 +48,18 @@ STATICLIBS = $(STATICLIBS_DIR)/libfreetype.a \ $(STATICLIBS_DIR)/libjpeg.a \ $(STATICLIBS_DIR)/libtiff.a \ # $(STATICLIBS_DIR)/libGLEW.a \ - ../../../lib/linux/Debug/libbox2d.a \ - ../../../lib/linux/Debug/libchipmunk.a + ../../../../lib/linux/Debug/libbox2d.a \ + ../../../../lib/linux/Debug/libchipmunk.a SHAREDLIBS += -lglfw -lcurl -llua -SHAREDLIBS += -Wl,-rpath,../../../../../cocos2dx/platform/third_party/linux/glew-1.7.0/glew-1.7.0/lib -SHAREDLIBS += -L../../../cocos2dx/platform/third_party/linux/glew-1.7.0/glew-1.7.0/lib -lGLEW -SHAREDLIBS += -Wl,-rpath,../../../../../lib/linux/Debug +SHAREDLIBS += -Wl,-rpath,../../../../../../cocos2dx/platform/third_party/linux/glew-1.7.0/glew-1.7.0/lib +SHAREDLIBS += -L../../../../cocos2dx/platform/third_party/linux/glew-1.7.0/glew-1.7.0/lib -lGLEW +SHAREDLIBS += -Wl,-rpath,../../../../../../lib/linux/Debug ifeq ($(LBITS),64) -SHAREDLIBS += -L../../../CocosDenshion/third_party/fmod/lib64/api/lib -lfmodex64 -Wl,-rpath,../../../../../CocosDenshion/third_party/fmod/lib64/api/lib +SHAREDLIBS += -L../../../../CocosDenshion/third_party/fmod/lib64/api/lib -lfmodex64 -Wl,-rpath,../../../../../../CocosDenshion/third_party/fmod/lib64/api/lib else -SHAREDLIBS += -L../../../CocosDenshion/third_party/fmod/api/lib -lfmodex -Wl,-rpath,../../../../../CocosDenshion/third_party/fmod/api/lib +SHAREDLIBS += -L../../../../CocosDenshion/third_party/fmod/api/lib -lfmodex -Wl,-rpath,../../../../../../CocosDenshion/third_party/fmod/api/lib endif #$(shell ../../build-linux.sh $<) @@ -70,23 +70,23 @@ BIN_DIR = $(BIN_DIR_ROOT) debug: BIN_DIR = $(BIN_DIR_ROOT)/debug debug: CCFLAGS += -g3 -O0 debug: CXXFLAGS += -g3 -O0 -debug: SHAREDLIBS += -L../../../lib/linux/Debug -lcocos2d -lrt -lz -lcocosdenshion -debug: SHAREDLIBS += -Wl,-rpath,../../../../../lib/linux/Debug/ +debug: SHAREDLIBS += -L../../../../lib/linux/Debug -lcocos2d -lrt -lz -lcocosdenshion +debug: SHAREDLIBS += -Wl,-rpath,../../../../../../lib/linux/Debug/ debug: DEFINES += -DDEBUG debug: $(TARGET) release: BIN_DIR = $(BIN_DIR_ROOT)/release release: CCFLAGS += -O3 release: CXXFLAGS += -O3 -release: SHAREDLIBS += -L../../../lib/linux/Release -lcocos2d -lrt -lz -lcocosdenshion -release: SHAREDLIBS += -Wl,-rpath,../../../../../lib/linux/Release/ +release: SHAREDLIBS += -L../../../../lib/linux/Release -lcocos2d -lrt -lz -lcocosdenshion +release: SHAREDLIBS += -Wl,-rpath,../../../../../../lib/linux/Release/ release: DEFINES += -DNDEBUG release: $(TARGET) ####### Build rules $(TARGET): $(OBJECTS) mkdir -p $(BIN_DIR) - cp -R ../../../samples/TestCpp/Resources ../../../samples/TestLua/ + cp -R ../../../../samples/TestCpp/Resources ../../../../samples/TestLua/ $(CXX) $(CXXFLAGS) $(INCLUDES) $(DEFINES) $(OBJECTS) -o $(BIN_DIR)/$(TARGET) $(SHAREDLIBS) $(STATICLIBS) ####### Compile diff --git a/samples/Lua/TestLua/proj.marmalade/TestLua.mkb b/samples/Lua/TestLua/proj.marmalade/TestLua.mkb index c8ecfc252c..d169726f32 100644 --- a/samples/Lua/TestLua/proj.marmalade/TestLua.mkb +++ b/samples/Lua/TestLua/proj.marmalade/TestLua.mkb @@ -1,13 +1,13 @@ options { - module_path="../../../cocos2dx/proj.marmalade/;../../../CocosDenshion/proj.marmalade/;../../../scripting/lua/proj.marmalade/;../../../extensions/proj.marmalade/;../../../external/chipmunk/proj.marmalade/;../../../external/Box2D/proj.marmalade/" + module_path="../../../../cocos2dx/proj.marmalade/;../../../../CocosDenshion/proj.marmalade/;../../../../scripting/lua/proj.marmalade/;../../../../extensions/proj.marmalade/;../../../../external/chipmunk/proj.marmalade/;../../../../external/Box2D/proj.marmalade/" s3e-data-dir = "../Resources" } includepaths { ../Classes - ../../../scripting/lua/cocos2dx_support/ + ../../../../scripting/lua/cocos2dx_support/ } subprojects {