From c965131a08031a7b2b53cd9b0f378d757c480e55 Mon Sep 17 00:00:00 2001 From: James Chen Date: Mon, 6 Jan 2014 19:33:28 -0800 Subject: [PATCH 1/6] Uses relative path for kazmath/CMakeLists.txt and physics/CMakeLists.txt. --- cocos/math/kazmath/CMakeLists.txt | 24 ++++++++++++------------ cocos/physics/CMakeLists.txt | 20 ++++++++++---------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/cocos/math/kazmath/CMakeLists.txt b/cocos/math/kazmath/CMakeLists.txt index 208b4a97c2..ae7ea4b3d7 100644 --- a/cocos/math/kazmath/CMakeLists.txt +++ b/cocos/math/kazmath/CMakeLists.txt @@ -1,17 +1,17 @@ SET(KAZMATH_SOURCES - ${CMAKE_SOURCE_DIR}/cocos/math/kazmath/src/mat4.c - ${CMAKE_SOURCE_DIR}/cocos/math/kazmath/src/mat3.c - ${CMAKE_SOURCE_DIR}/cocos/math/kazmath/src/plane.c - ${CMAKE_SOURCE_DIR}/cocos/math/kazmath/src/vec4.c - ${CMAKE_SOURCE_DIR}/cocos/math/kazmath/src/quaternion.c - ${CMAKE_SOURCE_DIR}/cocos/math/kazmath/src/vec2.c - ${CMAKE_SOURCE_DIR}/cocos/math/kazmath/src/vec3.c - ${CMAKE_SOURCE_DIR}/cocos/math/kazmath/src/utility.c - ${CMAKE_SOURCE_DIR}/cocos/math/kazmath/src/aabb.c - ${CMAKE_SOURCE_DIR}/cocos/math/kazmath/src/ray2.c - ${CMAKE_SOURCE_DIR}/cocos/math/kazmath/src/GL/mat4stack.c - ${CMAKE_SOURCE_DIR}/cocos/math/kazmath/src/GL/matrix.c + mat4.c + mat3.c + plane.c + vec4.c + quaternion.c + vec2.c + vec3.c + utility.c + aabb.c + ray2.c + GL/mat4stack.c + GL/matrix.c ) ADD_SUBDIRECTORY(src) diff --git a/cocos/physics/CMakeLists.txt b/cocos/physics/CMakeLists.txt index ef81f5ec6b..2810dcb5f4 100644 --- a/cocos/physics/CMakeLists.txt +++ b/cocos/physics/CMakeLists.txt @@ -1,13 +1,13 @@ set(COCOS_PHYSICS_SRC - ${CMAKE_SOURCE_DIR}/cocos/physics/chipmunk/CCPhysicsContactInfo_chipmunk.cpp - ${CMAKE_SOURCE_DIR}/cocos/physics/chipmunk/CCPhysicsJointInfo_chipmunk.cpp - ${CMAKE_SOURCE_DIR}/cocos/physics/chipmunk/CCPhysicsShapeInfo_chipmunk.cpp - ${CMAKE_SOURCE_DIR}/cocos/physics/chipmunk/CCPhysicsBodyInfo_chipmunk.cpp - ${CMAKE_SOURCE_DIR}/cocos/physics/chipmunk/CCPhysicsWorldInfo_chipmunk.cpp - ${CMAKE_SOURCE_DIR}/cocos/physics/CCPhysicsBody.cpp - ${CMAKE_SOURCE_DIR}/cocos/physics/CCPhysicsContact.cpp - ${CMAKE_SOURCE_DIR}/cocos/physics/CCPhysicsShape.cpp - ${CMAKE_SOURCE_DIR}/cocos/physics/CCPhysicsJoint.cpp - ${CMAKE_SOURCE_DIR}/cocos/physics/CCPhysicsWorld.cpp + ../physics/chipmunk/CCPhysicsContactInfo_chipmunk.cpp + ../physics/chipmunk/CCPhysicsJointInfo_chipmunk.cpp + ../physics/chipmunk/CCPhysicsShapeInfo_chipmunk.cpp + ../physics/chipmunk/CCPhysicsBodyInfo_chipmunk.cpp + ../physics/chipmunk/CCPhysicsWorldInfo_chipmunk.cpp + ../physics/CCPhysicsBody.cpp + ../physics/CCPhysicsContact.cpp + ../physics/CCPhysicsShape.cpp + ../physics/CCPhysicsJoint.cpp + ../physics/CCPhysicsWorld.cpp ) From 9183a69873d97d2f5d8397ac3f8ec152e0ac3759 Mon Sep 17 00:00:00 2001 From: James Chen Date: Mon, 6 Jan 2014 19:34:48 -0800 Subject: [PATCH 2/6] Simplifies linux template, build.sh is not needed now. --- template/multi-platform-cpp/CMakeLists.txt | 72 ++++++++++++------- template/multi-platform-lua/CMakeLists.txt | 83 ++++++++++++++-------- 2 files changed, 100 insertions(+), 55 deletions(-) diff --git a/template/multi-platform-cpp/CMakeLists.txt b/template/multi-platform-cpp/CMakeLists.txt index 7b64f8b7cc..4376f2f9c8 100644 --- a/template/multi-platform-cpp/CMakeLists.txt +++ b/template/multi-platform-cpp/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 2.6) -set(APP_NAME HelloCpp) +set(APP_NAME MyGame) project (${APP_NAME}) include(cocos2d/build/BuildHelpers.CMakeLists.txt) @@ -76,7 +76,6 @@ include_directories( link_directories( /usr/local/lib - ${COCOS2D_ROOT}/lib ${COCOS2D_ROOT}/external/jpeg/prebuilt/linux/${ARCH_DIR} ${COCOS2D_ROOT}/external/tiff/prebuilt/linux/${ARCH_DIR} ${COCOS2D_ROOT}/external/webp/prebuilt/linux/${ARCH_DIR} @@ -85,6 +84,50 @@ link_directories( ${COCOS2D_ROOT}/external/linux-specific/fmod/prebuilt/${ARCH_DIR} ) +# kazmath +add_subdirectory(${COCOS2D_ROOT}/cocos/math/kazmath) + +# chipmunk library +add_subdirectory(${COCOS2D_ROOT}/external/chipmunk/src) + +# box2d library +add_subdirectory(${COCOS2D_ROOT}/external/Box2D) + +# unzip library +add_subdirectory(${COCOS2D_ROOT}/external/unzip) + +# tinyxml2 library +add_subdirectory(${COCOS2D_ROOT}/external/tinyxml2) + +# audio +add_subdirectory(${COCOS2D_ROOT}/cocos/audio) + +# cocos base library +add_subdirectory(${COCOS2D_ROOT}/cocos/base) + +# cocos 2d library +add_subdirectory(${COCOS2D_ROOT}/cocos/2d) + +# gui +add_subdirectory(${COCOS2D_ROOT}/cocos/gui) + +# network +add_subdirectory(${COCOS2D_ROOT}/cocos/network) + +# extensions +add_subdirectory(${COCOS2D_ROOT}/extensions) + +## Editor Support + +# spine +add_subdirectory(${COCOS2D_ROOT}/cocos/editor-support/spine) + +# cocosbuilder +add_subdirectory(${COCOS2D_ROOT}/cocos/editor-support/cocosbuilder) + +# cocostudio +add_subdirectory(${COCOS2D_ROOT}/cocos/editor-support/cocostudio) + # add the executable add_executable(${APP_NAME} ${GAME_SRC} @@ -99,37 +142,12 @@ endif() target_link_libraries(${APP_NAME} gui network - curl - ldap - lber - idn - rtmp spine cocostudio cocosbuilder extensions - box2d audio - ${FMOD_LIB} cocos2d - cocosbase - chipmunk - tinyxml2 - kazmath - unzip - jpeg - webp - tiff - freetype - fontconfig - png - pthread - glfw - GLEW - GL - X11 - rt - z ) set(APP_BIN_DIR "${CMAKE_SOURCE_DIR}/bin") diff --git a/template/multi-platform-lua/CMakeLists.txt b/template/multi-platform-lua/CMakeLists.txt index 57076b1fdc..c14a3d0fe9 100644 --- a/template/multi-platform-lua/CMakeLists.txt +++ b/template/multi-platform-lua/CMakeLists.txt @@ -79,7 +79,6 @@ include_directories( link_directories( /usr/local/lib - ${COCOS2D_ROOT}/lib ${COCOS2D_ROOT}/external/jpeg/prebuilt/linux/${ARCH_DIR} ${COCOS2D_ROOT}/external/tiff/prebuilt/linux/${ARCH_DIR} ${COCOS2D_ROOT}/external/webp/prebuilt/linux/${ARCH_DIR} @@ -88,6 +87,60 @@ link_directories( ${COCOS2D_ROOT}/external/linux-specific/fmod/prebuilt/${ARCH_DIR} ) +# kazmath +add_subdirectory(${COCOS2D_ROOT}/cocos/math/kazmath) + +# chipmunk library +add_subdirectory(${COCOS2D_ROOT}/external/chipmunk/src) + +# box2d library +add_subdirectory(${COCOS2D_ROOT}/external/Box2D) + +# unzip library +add_subdirectory(${COCOS2D_ROOT}/external/unzip) + +# tinyxml2 library +add_subdirectory(${COCOS2D_ROOT}/external/tinyxml2) + +# audio +add_subdirectory(${COCOS2D_ROOT}/cocos/audio) + +# cocos base library +add_subdirectory(${COCOS2D_ROOT}/cocos/base) + +# cocos 2d library +add_subdirectory(${COCOS2D_ROOT}/cocos/2d) + +# gui +add_subdirectory(${COCOS2D_ROOT}/cocos/gui) + +# network +add_subdirectory(${COCOS2D_ROOT}/cocos/network) + +# extensions +add_subdirectory(${COCOS2D_ROOT}/extensions) + +## Editor Support + +# spine +add_subdirectory(${COCOS2D_ROOT}/cocos/editor-support/spine) + +# cocosbuilder +add_subdirectory(${COCOS2D_ROOT}/cocos/editor-support/cocosbuilder) + +# cocostudio +add_subdirectory(${COCOS2D_ROOT}/cocos/editor-support/cocostudio) + +## Scripting +# lua +add_subdirectory(${COCOS2D_ROOT}/external/lua/lua) + +# tolua +add_subdirectory(${COCOS2D_ROOT}/external/lua/tolua) + +# luabinding +add_subdirectory(${COCOS2D_ROOT}/cocos/scripting) + # add the executable add_executable(${APP_NAME} ${GAME_SRC} @@ -101,41 +154,14 @@ endif() target_link_libraries(${APP_NAME} luabinding - tolua - lua gui network - curl - ldap - lber - idn - rtmp spine cocostudio cocosbuilder extensions - box2d audio - ${FMOD_LIB} cocos2d - cocosbase - chipmunk - tinyxml2 - kazmath - unzip - jpeg - webp - tiff - freetype - fontconfig - png - pthread - glfw - GLEW - GL - X11 - rt - z ) set(APP_BIN_DIR "${CMAKE_SOURCE_DIR}/bin") @@ -146,5 +172,6 @@ set_target_properties(${APP_NAME} PROPERTIES pre_build(${APP_NAME} COMMAND ${CMAKE_COMMAND} -E remove_directory ${APP_BIN_DIR}/Resources COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/Resources ${APP_BIN_DIR}/Resources + COMMAND ${CMAKE_COMMAND} -E copy_directory ${COCOS2D_ROOT}/cocos/scripting/lua/script ${APP_BIN_DIR}/Resources ) From 2512c15cb9e2da3b9289cd2dc379a95777fa1a06 Mon Sep 17 00:00:00 2001 From: James Chen Date: Mon, 6 Jan 2014 19:35:33 -0800 Subject: [PATCH 3/6] Renames title names for cpp and lua templates. --- template/multi-platform-cpp/proj.linux/main.cpp | 2 +- template/multi-platform-lua/proj.linux/main.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/template/multi-platform-cpp/proj.linux/main.cpp b/template/multi-platform-cpp/proj.linux/main.cpp index fe87d9a1cd..78a0c780cb 100644 --- a/template/multi-platform-cpp/proj.linux/main.cpp +++ b/template/multi-platform-cpp/proj.linux/main.cpp @@ -14,6 +14,6 @@ int main(int argc, char **argv) // create the application instance AppDelegate app; EGLView eglView; - eglView.init("TestCPP",900,640); + eglView.init("Cocos2d-x Game",900,640); return Application::getInstance()->run(); } diff --git a/template/multi-platform-lua/proj.linux/main.cpp b/template/multi-platform-lua/proj.linux/main.cpp index fe87d9a1cd..5e5565893c 100644 --- a/template/multi-platform-lua/proj.linux/main.cpp +++ b/template/multi-platform-lua/proj.linux/main.cpp @@ -14,6 +14,6 @@ int main(int argc, char **argv) // create the application instance AppDelegate app; EGLView eglView; - eglView.init("TestCPP",900,640); + eglView.init("Cocos2d-x Game Using LUA",900,640); return Application::getInstance()->run(); } From 23012352ce37dbb5e70c3c2ffe14ba9e53370d68 Mon Sep 17 00:00:00 2001 From: James Chen Date: Mon, 6 Jan 2014 19:36:13 -0800 Subject: [PATCH 4/6] Deletes unused Makefile for linux. --- samples/Cpp/HelloCpp/proj.linux/.cproject | 389 ------------------ samples/Cpp/HelloCpp/proj.linux/.project | 93 ----- samples/Cpp/HelloCpp/proj.linux/Makefile | 25 -- samples/Cpp/SimpleGame/proj.linux/Makefile | 26 -- samples/Cpp/TestCpp/proj.linux/.cproject | 429 -------------------- samples/Cpp/TestCpp/proj.linux/.project | 142 ------- samples/Cpp/TestCpp/proj.linux/Makefile | 174 -------- samples/Lua/HelloLua/proj.linux/.cproject | 436 -------------------- samples/Lua/HelloLua/proj.linux/.project | 54 --- samples/Lua/HelloLua/proj.linux/Makefile | 22 - samples/Lua/TestLua/proj.linux/.cproject | 446 --------------------- samples/Lua/TestLua/proj.linux/.project | 56 --- samples/Lua/TestLua/proj.linux/Makefile | 31 -- 13 files changed, 2323 deletions(-) delete mode 100644 samples/Cpp/HelloCpp/proj.linux/.cproject delete mode 100644 samples/Cpp/HelloCpp/proj.linux/.project delete mode 100644 samples/Cpp/HelloCpp/proj.linux/Makefile delete mode 100644 samples/Cpp/SimpleGame/proj.linux/Makefile delete mode 100644 samples/Cpp/TestCpp/proj.linux/.cproject delete mode 100644 samples/Cpp/TestCpp/proj.linux/.project delete mode 100644 samples/Cpp/TestCpp/proj.linux/Makefile delete mode 100644 samples/Lua/HelloLua/proj.linux/.cproject delete mode 100644 samples/Lua/HelloLua/proj.linux/.project delete mode 100644 samples/Lua/HelloLua/proj.linux/Makefile delete mode 100644 samples/Lua/TestLua/proj.linux/.cproject delete mode 100644 samples/Lua/TestLua/proj.linux/.project delete mode 100644 samples/Lua/TestLua/proj.linux/Makefile diff --git a/samples/Cpp/HelloCpp/proj.linux/.cproject b/samples/Cpp/HelloCpp/proj.linux/.cproject deleted file mode 100644 index fc14f996d1..0000000000 --- a/samples/Cpp/HelloCpp/proj.linux/.cproject +++ /dev/null @@ -1,389 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/samples/Cpp/HelloCpp/proj.linux/.project b/samples/Cpp/HelloCpp/proj.linux/.project deleted file mode 100644 index e53a1e70a7..0000000000 --- a/samples/Cpp/HelloCpp/proj.linux/.project +++ /dev/null @@ -1,93 +0,0 @@ - - - HelloCpp - - - libcocos2d - libCocosDenshion - - - - org.eclipse.cdt.managedbuilder.core.genmakebuilder - clean,full,incremental, - - - ?name? - - - - org.eclipse.cdt.make.core.append_environment - true - - - org.eclipse.cdt.make.core.autoBuildTarget - all - - - org.eclipse.cdt.make.core.buildArguments - - - - org.eclipse.cdt.make.core.buildCommand - make - - - org.eclipse.cdt.make.core.buildLocation - ${workspace_loc:/HelloCocos2dx/Debug} - - - org.eclipse.cdt.make.core.cleanBuildTarget - clean - - - org.eclipse.cdt.make.core.contents - org.eclipse.cdt.make.core.activeConfigSettings - - - org.eclipse.cdt.make.core.enableAutoBuild - false - - - org.eclipse.cdt.make.core.enableCleanBuild - true - - - org.eclipse.cdt.make.core.enableFullBuild - true - - - org.eclipse.cdt.make.core.fullBuildTarget - all - - - org.eclipse.cdt.make.core.stopOnError - true - - - org.eclipse.cdt.make.core.useDefaultBuildCmd - true - - - - - org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder - full,incremental, - - - - - - org.eclipse.cdt.core.cnature - org.eclipse.cdt.core.ccnature - org.eclipse.cdt.managedbuilder.core.managedBuildNature - org.eclipse.cdt.managedbuilder.core.ScannerConfigNature - - - - Classes - 2 - PARENT-1-PROJECT_LOC/Classes - - - - diff --git a/samples/Cpp/HelloCpp/proj.linux/Makefile b/samples/Cpp/HelloCpp/proj.linux/Makefile deleted file mode 100644 index 0548290a52..0000000000 --- a/samples/Cpp/HelloCpp/proj.linux/Makefile +++ /dev/null @@ -1,25 +0,0 @@ -EXECUTABLE = HelloCpp - -INCLUDES = -I.. -I../Classes - -SOURCES = main.cpp \ - ../Classes/AppDelegate.cpp \ - ../Classes/HelloWorldScene.cpp - -COCOS_ROOT = ../../../.. -include $(COCOS_ROOT)/cocos/2d/cocos2dx.mk - -SHAREDLIBS += -lcocos2d -COCOS_LIBS = $(LIB_DIR)/libcocos2d.so - -$(TARGET): $(OBJECTS) $(STATICLIBS) $(COCOS_LIBS) $(CORE_MAKEFILE_LIST) - @mkdir -p $(@D) - $(LOG_LINK)$(CXX) $(CXXFLAGS) $(OBJECTS) -o $@ $(SHAREDLIBS) $(STATICLIBS) - -$(OBJ_DIR)/%.o: %.cpp $(CORE_MAKEFILE_LIST) - @mkdir -p $(@D) - $(LOG_CXX)$(CXX) $(CXXFLAGS) $(INCLUDES) $(DEFINES) $(VISIBILITY) -c $< -o $@ - -$(OBJ_DIR)/%.o: ../%.cpp $(CORE_MAKEFILE_LIST) - @mkdir -p $(@D) - $(LOG_CXX)$(CXX) $(CXXFLAGS) $(INCLUDES) $(DEFINES) $(VISIBILITY) -c $< -o $@ diff --git a/samples/Cpp/SimpleGame/proj.linux/Makefile b/samples/Cpp/SimpleGame/proj.linux/Makefile deleted file mode 100644 index 9204555b28..0000000000 --- a/samples/Cpp/SimpleGame/proj.linux/Makefile +++ /dev/null @@ -1,26 +0,0 @@ -EXECUTABLE = SimpleGame - -INCLUDES = -I.. -I../Classes - -SOURCES = main.cpp \ - ../Classes/AppDelegate.cpp \ - ../Classes/HelloWorldScene.cpp \ - ../Classes/GameOverScene.cpp - -COCOS_ROOT = ../../../.. -include $(COCOS_ROOT)/cocos/2d/cocos2dx.mk - -SHAREDLIBS += -lcocos2d -lcocosdenshion -INCLUDES += -I$(COCOS_ROOT)/cocos/audio/include - -$(TARGET): $(OBJECTS) $(STATICLIBS) $(COCOS_LIBS) $(CORE_MAKEFILE_LIST) - @mkdir -p $(@D) - $(LOG_LINK)$(CXX) $(CXXFLAGS) $(OBJECTS) -o $@ $(SHAREDLIBS) $(STATICLIBS) - -$(OBJ_DIR)/%.o: %.cpp $(CORE_MAKEFILE_LIST) - @mkdir -p $(@D) - $(LOG_CXX)$(CXX) $(CXXFLAGS) $(INCLUDES) $(DEFINES) $(VISIBILITY) -c $< -o $@ - -$(OBJ_DIR)/%.o: ../%.cpp $(CORE_MAKEFILE_LIST) - @mkdir -p $(@D) - $(LOG_CXX)$(CXX) $(CXXFLAGS) $(INCLUDES) $(DEFINES) $(VISIBILITY) -c $< -o $@ diff --git a/samples/Cpp/TestCpp/proj.linux/.cproject b/samples/Cpp/TestCpp/proj.linux/.cproject deleted file mode 100644 index 66a12db761..0000000000 --- a/samples/Cpp/TestCpp/proj.linux/.cproject +++ /dev/null @@ -1,429 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/samples/Cpp/TestCpp/proj.linux/.project b/samples/Cpp/TestCpp/proj.linux/.project deleted file mode 100644 index 41bd136722..0000000000 --- a/samples/Cpp/TestCpp/proj.linux/.project +++ /dev/null @@ -1,142 +0,0 @@ - - - TestCpp - - - libBox2D - libChipmunk - libcocos2d - libCocosDenshion - libextension - - - - org.eclipse.cdt.managedbuilder.core.genmakebuilder - clean,full,incremental, - - - ?children? - ?name?=outputEntries\|?children?=?name?=entry\\\\\\\|\\\|?name?=entry\\\\\\\|\\\|\|| - - - ?name? - - - - org.eclipse.cdt.make.core.append_environment - true - - - org.eclipse.cdt.make.core.autoBuildTarget - all - - - org.eclipse.cdt.make.core.buildArguments - - - - org.eclipse.cdt.make.core.buildCommand - make - - - org.eclipse.cdt.make.core.buildLocation - ${workspace_loc:/TestCpp/Debug} - - - org.eclipse.cdt.make.core.cleanBuildTarget - clean - - - org.eclipse.cdt.make.core.contents - org.eclipse.cdt.make.core.activeConfigSettings - - - org.eclipse.cdt.make.core.enableAutoBuild - false - - - org.eclipse.cdt.make.core.enableCleanBuild - true - - - org.eclipse.cdt.make.core.enableFullBuild - true - - - org.eclipse.cdt.make.core.fullBuildTarget - all - - - org.eclipse.cdt.make.core.stopOnError - true - - - org.eclipse.cdt.make.core.useDefaultBuildCmd - true - - - - - org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder - full,incremental, - - - - - - org.eclipse.cdt.core.cnature - org.eclipse.cdt.core.ccnature - org.eclipse.cdt.managedbuilder.core.managedBuildNature - org.eclipse.cdt.managedbuilder.core.ScannerConfigNature - - - - Classes - 2 - PARENT-1-PROJECT_LOC/Classes - - - extensions - 2 - PARENT-4-PROJECT_LOC/extensions - - - - - 1373359140703 - - 22 - - org.eclipse.ui.ide.multiFilter - 1.0-name-matches-false-false-WebSocket* - - - - 1345105423456 - extensions - 10 - - org.eclipse.ui.ide.multiFilter - 1.0-name-matches-true-false-proj.win32 - - - - 1345106176896 - Classes/ExtensionsTest - 10 - - org.eclipse.ui.ide.multiFilter - 1.0-name-matches-true-false-EditBoxTest - - - - 1345105383081 - extensions/GUI - 10 - - org.eclipse.ui.ide.multiFilter - 1.0-name-matches-true-false-CCEditBox - - - - diff --git a/samples/Cpp/TestCpp/proj.linux/Makefile b/samples/Cpp/TestCpp/proj.linux/Makefile deleted file mode 100644 index da31571fb0..0000000000 --- a/samples/Cpp/TestCpp/proj.linux/Makefile +++ /dev/null @@ -1,174 +0,0 @@ -EXECUTABLE = TestCpp - -DEFINES += -DCC_KEYBOARD_SUPPORT - -INCLUDES = -I../../../../external \ - -I../../../../cocos/editor-support \ - -I../../../../cocos \ - -I../Classes - -SOURCES = ../Classes/AccelerometerTest/AccelerometerTest.cpp \ - ../Classes/ActionManagerTest/ActionManagerTest.cpp \ - ../Classes/ActionsEaseTest/ActionsEaseTest.cpp \ - ../Classes/ActionsProgressTest/ActionsProgressTest.cpp \ - ../Classes/ActionsTest/ActionsTest.cpp \ - ../Classes/Box2DTest/Box2dTest.cpp \ - ../Classes/Box2DTestBed/Box2dView.cpp \ - ../Classes/Box2DTestBed/GLES-Render.cpp \ - ../Classes/Box2DTestBed/Test.cpp \ - ../Classes/Box2DTestBed/TestEntries.cpp \ - ../Classes/BugsTest/Bug-1159.cpp \ - ../Classes/BugsTest/Bug-1174.cpp \ - ../Classes/BugsTest/Bug-350.cpp \ - ../Classes/BugsTest/Bug-422.cpp \ - ../Classes/BugsTest/Bug-458/Bug-458.cpp \ - ../Classes/BugsTest/Bug-458/QuestionContainerSprite.cpp \ - ../Classes/BugsTest/Bug-624.cpp \ - ../Classes/BugsTest/Bug-886.cpp \ - ../Classes/BugsTest/Bug-899.cpp \ - ../Classes/BugsTest/Bug-914.cpp \ - ../Classes/BugsTest/BugsTest.cpp \ - ../Classes/ChipmunkTest/ChipmunkTest.cpp \ - ../Classes/ClickAndMoveTest/ClickAndMoveTest.cpp \ - ../Classes/ClippingNodeTest/ClippingNodeTest.cpp \ - ../Classes/CocosDenshionTest/CocosDenshionTest.cpp \ - ../Classes/CurlTest/CurlTest.cpp \ - ../Classes/CurrentLanguageTest/CurrentLanguageTest.cpp \ - ../Classes/DrawPrimitivesTest/DrawPrimitivesTest.cpp \ - ../Classes/EffectsAdvancedTest/EffectsAdvancedTest.cpp \ - ../Classes/EffectsTest/EffectsTest.cpp \ - ../Classes/ExtensionsTest/CocosBuilderTest/ButtonTest/ButtonTestLayer.cpp \ - ../Classes/ExtensionsTest/CocosBuilderTest/CocosBuilderTest.cpp \ - ../Classes/ExtensionsTest/CocosBuilderTest/HelloCocosBuilder/HelloCocosBuilderLayer.cpp \ - ../Classes/ExtensionsTest/CocosBuilderTest/AnimationsTest/AnimationsTestLayer.cpp \ - ../Classes/ExtensionsTest/CocosBuilderTest/MenuTest/MenuTestLayer.cpp \ - ../Classes/ExtensionsTest/CocosBuilderTest/TestHeader/TestHeaderLayer.cpp \ - ../Classes/ExtensionsTest/CocosBuilderTest/TimelineCallbackTest/TimelineCallbackTestLayer.cpp \ - ../Classes/ExtensionsTest/ControlExtensionTest/CCControlButtonTest/CCControlButtonTest.cpp \ - ../Classes/ExtensionsTest/ControlExtensionTest/CCControlColourPicker/CCControlColourPickerTest.cpp \ - ../Classes/ExtensionsTest/ControlExtensionTest/CCControlScene.cpp \ - ../Classes/ExtensionsTest/ControlExtensionTest/CCControlSceneManager.cpp \ - ../Classes/ExtensionsTest/ControlExtensionTest/CCControlSliderTest/CCControlSliderTest.cpp \ - ../Classes/ExtensionsTest/ControlExtensionTest/CCControlSwitchTest/CCControlSwitchTest.cpp \ - ../Classes/ExtensionsTest/ControlExtensionTest/CCControlPotentiometerTest/CCControlPotentiometerTest.cpp \ - ../Classes/ExtensionsTest/ControlExtensionTest/CCControlStepperTest/CCControlStepperTest.cpp \ - ../Classes/ExtensionsTest/TableViewTest/TableViewTestScene.cpp \ - ../Classes/ExtensionsTest/TableViewTest/CustomTableViewCell.cpp \ - ../Classes/ExtensionsTest/ExtensionsTest.cpp \ - ../Classes/ExtensionsTest/NotificationCenterTest/NotificationCenterTest.cpp \ - ../Classes/ExtensionsTest/NetworkTest/HttpClientTest.cpp \ - ../Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.cpp \ - ../Classes/ExtensionsTest/CocoStudioComponentsTest/ComponentsTestScene.cpp \ - ../Classes/ExtensionsTest/CocoStudioComponentsTest/EnemyController.cpp \ - ../Classes/ExtensionsTest/CocoStudioComponentsTest/GameOverScene.cpp \ - ../Classes/ExtensionsTest/CocoStudioComponentsTest/PlayerController.cpp \ - ../Classes/ExtensionsTest/CocoStudioComponentsTest/ProjectileController.cpp \ - ../Classes/ExtensionsTest/CocoStudioComponentsTest/SceneController.cpp \ - ../Classes/ExtensionsTest/CocoStudioSceneTest/SceneEditorTest.cpp \ - ../Classes/ExtensionsTest/CocoStudioGUITest/UIScene.cpp \ - ../Classes/ExtensionsTest/CocoStudioGUITest/UISceneManager.cpp \ - ../Classes/ExtensionsTest/CocoStudioGUITest/UIButtonTest/UIButtonTest.cpp \ - ../Classes/ExtensionsTest/CocoStudioGUITest/UICheckBoxTest/UICheckBoxTest.cpp \ - ../Classes/ExtensionsTest/CocoStudioGUITest/UIDragPanelTest/UIDragPanelTest.cpp \ - ../Classes/ExtensionsTest/CocoStudioGUITest/UIImageViewTest/UIImageViewTest.cpp \ - ../Classes/ExtensionsTest/CocoStudioGUITest/UILabelAtlasTest/UILabelAtlasTest.cpp \ - ../Classes/ExtensionsTest/CocoStudioGUITest/UILabelBMFontTest/UILabelBMFontTest.cpp \ - ../Classes/ExtensionsTest/CocoStudioGUITest/UILabelTest/UILabelTest.cpp \ - ../Classes/ExtensionsTest/CocoStudioGUITest/UIListViewTest/UIListViewTest.cpp \ - ../Classes/ExtensionsTest/CocoStudioGUITest/UILoadingBarTest/UILoadingBarTest.cpp \ - ../Classes/ExtensionsTest/CocoStudioGUITest/UINodeContainerTest/UINodeContainerTest.cpp \ - ../Classes/ExtensionsTest/CocoStudioGUITest/UIPageViewTest/UIPageViewTest.cpp \ - ../Classes/ExtensionsTest/CocoStudioGUITest/UIPanelTest/UIPanelTest.cpp \ - ../Classes/ExtensionsTest/CocoStudioGUITest/UIScrollViewTest/UIScrollViewTest.cpp \ - ../Classes/ExtensionsTest/CocoStudioGUITest/UISliderTest/UISliderTest.cpp \ - ../Classes/ExtensionsTest/CocoStudioGUITest/UITextAreaTest/UITextAreaTest.cpp \ - ../Classes/ExtensionsTest/CocoStudioGUITest/UITextButtonTest/UITextButtonTest.cpp \ - ../Classes/ExtensionsTest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest.cpp \ - ../Classes/ExtensionsTest/CocoStudioGUITest/CocosGUIScene.cpp \ - ../Classes/ExtensionsTest/Scale9SpriteTest/Scale9SpriteTest.cpp \ - ../Classes/NewEventDispatcherTest/NewEventDispatcherTest.cpp \ - ../Classes/FontTest/FontTest.cpp \ - ../Classes/IntervalTest/IntervalTest.cpp \ - ../Classes/KeyboardTest/KeyboardTest.cpp \ - ../Classes/InputTest/MouseTest.cpp \ - ../Classes/KeypadTest/KeypadTest.cpp \ - ../Classes/LabelTest/LabelTest.cpp \ - ../Classes/LabelTest/LabelTestNew.cpp \ - ../Classes/LayerTest/LayerTest.cpp \ - ../Classes/MenuTest/MenuTest.cpp \ - ../Classes/MotionStreakTest/MotionStreakTest.cpp \ - ../Classes/MutiTouchTest/MutiTouchTest.cpp \ - ../Classes/NodeTest/NodeTest.cpp \ - ../Classes/ParallaxTest/ParallaxTest.cpp \ - ../Classes/ParticleTest/ParticleTest.cpp \ - ../Classes/PerformanceTest/PerformanceAllocTest.cpp \ - ../Classes/PerformanceTest/PerformanceNodeChildrenTest.cpp \ - ../Classes/PerformanceTest/PerformanceParticleTest.cpp \ - ../Classes/PerformanceTest/PerformanceSpriteTest.cpp \ - ../Classes/PerformanceTest/PerformanceTest.cpp \ - ../Classes/PerformanceTest/PerformanceTextureTest.cpp \ - ../Classes/PerformanceTest/PerformanceTouchesTest.cpp \ - ../Classes/PhysicsTest/PhysicsTest.cpp \ - ../Classes/RenderTextureTest/RenderTextureTest.cpp \ - ../Classes/RotateWorldTest/RotateWorldTest.cpp \ - ../Classes/SceneTest/SceneTest.cpp \ - ../Classes/SchedulerTest/SchedulerTest.cpp \ - ../Classes/ShaderTest/ShaderTest.cpp \ - ../Classes/ShaderTest/ShaderTest2.cpp \ - ../Classes/SpriteTest/SpriteTest.cpp \ - ../Classes/TextInputTest/TextInputTest.cpp \ - ../Classes/Texture2dTest/Texture2dTest.cpp \ - ../Classes/TexturePackerEncryptionTest/TextureAtlasEncryptionTest.cpp \ - ../Classes/TextureCacheTest/TextureCacheTest.cpp \ - ../Classes/TileMapTest/TileMapTest.cpp \ - ../Classes/TouchesTest/Ball.cpp \ - ../Classes/TouchesTest/Paddle.cpp \ - ../Classes/TouchesTest/TouchesTest.cpp \ - ../Classes/TransitionsTest/TransitionsTest.cpp \ - ../Classes/UserDefaultTest/UserDefaultTest.cpp \ - ../Classes/ZwoptexTest/ZwoptexTest.cpp \ - ../Classes/FileUtilsTest/FileUtilsTest.cpp \ - ../Classes/SpineTest/SpineTest.cpp \ - ../Classes/DataVisitorTest/DataVisitorTest.cpp \ - ../Classes/ConfigurationTest/ConfigurationTest.cpp \ - ../Classes/controller.cpp \ - ../Classes/testBasic.cpp \ - ../Classes/AppDelegate.cpp \ - ../Classes/BaseTest.cpp \ - ../Classes/VisibleRect.cpp \ - main.cpp - -SHAREDLIBS = -lcocos2d -lcocosdenshion -lcurl -lpng -COCOS_LIBS = $(LIB_DIR)/libcocos2d.so $(LIB_DIR)/libcocosdenshion.so - - -include ../../../../cocos/2d/cocos2dx.mk - -STATICLIBS += \ - $(STATICLIBS_DIR)/curl/prebuilt/linux/$(POSTFIX)/libcurl.a \ - $(LIB_DIR)/libextension.a \ - $(LIB_DIR)/libbox2d.a \ - $(LIB_DIR)/libchipmunk.a \ - $(LIB_DIR)/libgui.a \ - $(LIB_DIR)/libcocosbuilder.a \ - $(LIB_DIR)/libspine.a \ - $(LIB_DIR)/libcocostudio.a \ - $(LIB_DIR)/libnetwork.a - -####### Build rules -$(TARGET): $(OBJECTS) $(STATICLIBS) $(COCOS_LIBS) $(CORE_MAKEFILE_LIST) - @mkdir -p $(@D) - $(LOG_LINK)$(CXX) $(CXXFLAGS) $(OBJECTS) -o $@ $(SHAREDLIBS) $(STATICLIBS) $(LIBS) - -####### Compile -$(OBJ_DIR)/%.o: ../%.cpp $(CORE_MAKEFILE_LIST) - @mkdir -p $(@D) - $(LOG_CXX)$(CXX) $(CXXFLAGS) $(INCLUDES) $(DEFINES) -c $< -o $@ - -$(OBJ_DIR)/%.o: %.cpp $(CORE_MAKEFILE_LIST) - @mkdir -p $(@D) - $(LOG_CXX)$(CXX) $(CXXFLAGS) $(INCLUDES) $(DEFINES) -c $< -o $@ - -$(OBJ_DIR)/%.o: %.c $(CORE_MAKEFILE_LIST) - @mkdir -p $(@D) - $(LOG_CC)$(CC) $(CCFLAGS) $(INCLUDES) $(DEFINES) -c $< -o $@ diff --git a/samples/Lua/HelloLua/proj.linux/.cproject b/samples/Lua/HelloLua/proj.linux/.cproject deleted file mode 100644 index 05f6db5b1d..0000000000 --- a/samples/Lua/HelloLua/proj.linux/.cproject +++ /dev/null @@ -1,436 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/samples/Lua/HelloLua/proj.linux/.project b/samples/Lua/HelloLua/proj.linux/.project deleted file mode 100644 index 8d606ff4a1..0000000000 --- a/samples/Lua/HelloLua/proj.linux/.project +++ /dev/null @@ -1,54 +0,0 @@ - - - HelloLua - - - libcocos2d - libCocosDenshion - libextension - liblua - - - - org.eclipse.cdt.managedbuilder.core.genmakebuilder - clean,full,incremental, - - - - - org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder - full,incremental, - - - - - - org.eclipse.cdt.core.cnature - org.eclipse.cdt.core.ccnature - org.eclipse.cdt.managedbuilder.core.managedBuildNature - org.eclipse.cdt.managedbuilder.core.ScannerConfigNature - - - - Classes - 2 - PARENT-1-PROJECT_LOC/Classes - - - cocos2dx_support - 2 - PARENT-4-PROJECT_LOC/scripting/lua/cocos2dx_support - - - - - 1373360284806 - - 22 - - org.eclipse.ui.ide.multiFilter - 1.0-name-matches-false-false-Lua_web_socket.* - - - - diff --git a/samples/Lua/HelloLua/proj.linux/Makefile b/samples/Lua/HelloLua/proj.linux/Makefile deleted file mode 100644 index 6a0ddf230c..0000000000 --- a/samples/Lua/HelloLua/proj.linux/Makefile +++ /dev/null @@ -1,22 +0,0 @@ -EXECUTABLE = HelloLua - -COCOS_ROOT = ../../../.. -INCLUDES = -I../Classes \ - -I$(COCOS_ROOT)/audio/include \ - -I$(COCOS_ROOT)/cocos/scripting/lua/bindings \ - -I$(COCOS_ROOT)/external/lua/lua - -SOURCES = main.cpp ../Classes/AppDelegate.cpp - -SHAREDLIBS += -lcocos2d -lcocosdenshion -llua -lextension - -include $(COCOS_ROOT)/cocos/2d/cocos2dx.mk - -$(TARGET): $(OBJECTS) $(STATICLIBS) $(COCOS_LIBS) $(CORE_MAKEFILE_LIST) - @mkdir -p $(@D) - cp -n ../../../../cocos/scripting/lua/script/* ../../../../samples/Lua/HelloLua/Resources - $(LOG_LINK)$(CXX) $(CXXFLAGS) $(OBJECTS) -o $@ $(SHAREDLIBS) $(STATICLIBS) $(LIBS) - -$(OBJ_DIR)/%.o: ../%.cpp $(CORE_MAKEFILE_LIST) - @mkdir -p $(@D) - $(LOG_CXX)$(CXX) $(CXXFLAGS) $(INCLUDES) $(DEFINES) $(VISIBILITY) -c $< -o $@ diff --git a/samples/Lua/TestLua/proj.linux/.cproject b/samples/Lua/TestLua/proj.linux/.cproject deleted file mode 100644 index 8dab88e511..0000000000 --- a/samples/Lua/TestLua/proj.linux/.cproject +++ /dev/null @@ -1,446 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/samples/Lua/TestLua/proj.linux/.project b/samples/Lua/TestLua/proj.linux/.project deleted file mode 100644 index a7e8a57215..0000000000 --- a/samples/Lua/TestLua/proj.linux/.project +++ /dev/null @@ -1,56 +0,0 @@ - - - TestLua - - - libBox2D - libChipmunk - libcocos2d - libCocosDenshion - libextension - liblua - - - - org.eclipse.cdt.managedbuilder.core.genmakebuilder - clean,full,incremental, - - - - - org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder - full,incremental, - - - - - - org.eclipse.cdt.core.cnature - org.eclipse.cdt.core.ccnature - org.eclipse.cdt.managedbuilder.core.managedBuildNature - org.eclipse.cdt.managedbuilder.core.ScannerConfigNature - - - - Classes - 2 - PARENT-1-PROJECT_LOC/Classes - - - cocos2dx_support - 2 - PARENT-4-PROJECT_LOC/scripting/lua/cocos2dx_support - - - - - 1373360472191 - - 22 - - org.eclipse.ui.ide.multiFilter - 1.0-name-matches-false-false-Lua_web_socket.* - - - - diff --git a/samples/Lua/TestLua/proj.linux/Makefile b/samples/Lua/TestLua/proj.linux/Makefile deleted file mode 100644 index 8e9246c6ee..0000000000 --- a/samples/Lua/TestLua/proj.linux/Makefile +++ /dev/null @@ -1,31 +0,0 @@ -EXECUTABLE = TestLua - -COCOS_ROOT = ../../../.. -INCLUDES = -I../Classes \ - -I$(COCOS_ROOT)/audio/include \ - -I$(COCOS_ROOT)/cocos/scripting/lua/bindings \ - -I$(COCOS_ROOT)/external/lua/lua \ - -I$(COCOS_ROOT)/external/lua/tolua \ - -I$(COCOS_ROOT)/extensions - -SOURCES = main.cpp \ -../Classes/AppDelegate.cpp \ -../Classes/lua_assetsmanager_test_sample.cpp - -SHAREDLIBS += -lcocos2d -lcocosdenshion -llua - -include $(COCOS_ROOT)/cocos/2d/cocos2dx.mk - -$(TARGET): $(OBJECTS) $(STATICLIBS) $(COCOS_LIBS) $(CORE_MAKEFILE_LIST) - @mkdir -p $(@D) - cp -R -n ../../../../samples/Cpp/TestCpp/Resources ../../../../samples/Lua/TestLua - cp -n ../../../../cocos/scripting/lua/script/* ../../../../samples/Lua/TestLua/Resources - $(LOG_LINK)$(CXX) $(CXXFLAGS) $(OBJECTS) -o $@ $(SHAREDLIBS) $(STATICLIBS) $(LIBS) - -$(OBJ_DIR)/%.o: ../%.cpp $(CORE_MAKEFILE_LIST) - @mkdir -p $(@D) - $(LOG_CXX)$(CXX) $(CXXFLAGS) $(INCLUDES) $(DEFINES) $(VISIBILITY) -c $< -o $@ - -$(OBJ_DIR)/%.o: %.cpp $(CORE_MAKEFILE_LIST) - @mkdir -p $(@D) - $(LOG_CXX)$(CXX) $(CXXFLAGS) $(INCLUDES) $(DEFINES) $(VISIBILITY) -c $< -o $@ From 2f7c41bd28cddecfd14fb41daffa27f5c00265c1 Mon Sep 17 00:00:00 2001 From: James Chen Date: Mon, 6 Jan 2014 19:42:51 -0800 Subject: [PATCH 5/6] [travis] builds linux template now. --- tools/travis-scripts/run-script.sh | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/tools/travis-scripts/run-script.sh b/tools/travis-scripts/run-script.sh index 84cec56874..0ade7a31c7 100755 --- a/tools/travis-scripts/run-script.sh +++ b/tools/travis-scripts/run-script.sh @@ -76,6 +76,23 @@ elif [ "$PLATFORM"x = "linux"x ]; then cd linux-build cmake ../.. make -j10 + cd .. + # build template + echo "Building template projects for linux ..." + cd tools/project-creator + ./create_project.py -n MyGameCpp -k com.MyCompany.AwesomeGameCpp -l cpp -p $HOME + ./create_project.py -n MyGameLua -k com.MyCompany.AwesomeGameLua -l lua -p $HOME + cd $HOME/MyGameCpp + mkdir build + cd build + cmake .. + make -j10 + + cd $HOME/MyGameLua + mkdir build + cd build + cmake .. + make -j10 elif [ "$PLATFORM"x = "emscripten"x ]; then # Generate binding glue codes From 37b6ef99e3cad411509e28114d7d51abd9b98cc6 Mon Sep 17 00:00:00 2001 From: James Chen Date: Mon, 6 Jan 2014 20:04:30 -0800 Subject: [PATCH 6/6] Wrong dir fix for travis ci. --- tools/travis-scripts/run-script.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tools/travis-scripts/run-script.sh b/tools/travis-scripts/run-script.sh index 0ade7a31c7..aa9c47f5c6 100755 --- a/tools/travis-scripts/run-script.sh +++ b/tools/travis-scripts/run-script.sh @@ -76,10 +76,9 @@ elif [ "$PLATFORM"x = "linux"x ]; then cd linux-build cmake ../.. make -j10 - cd .. # build template echo "Building template projects for linux ..." - cd tools/project-creator + cd $COCOS2DX_ROOT/tools/project-creator ./create_project.py -n MyGameCpp -k com.MyCompany.AwesomeGameCpp -l cpp -p $HOME ./create_project.py -n MyGameLua -k com.MyCompany.AwesomeGameLua -l lua -p $HOME cd $HOME/MyGameCpp