diff --git a/template/multi-platform-cpp/CMakeLists.txt b/template/multi-platform-cpp/CMakeLists.txt index f94f571ef2..641364914e 100644 --- a/template/multi-platform-cpp/CMakeLists.txt +++ b/template/multi-platform-cpp/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.6) set(APP_NAME HelloCpp) project (${APP_NAME}) -include(../../build/BuildHelpers.CMakeLists.txt) +include(cocos2d/build/BuildHelpers.CMakeLists.txt) option(USE_CHIPMUNK "Use chipmunk for physics library" ON) option(USE_BOX2D "Use box2d for physics library" OFF) diff --git a/template/multi-platform-cpp/proj.linux/.cproject b/template/multi-platform-cpp/proj.linux/.cproject deleted file mode 100644 index 9c759e341f..0000000000 --- a/template/multi-platform-cpp/proj.linux/.cproject +++ /dev/null @@ -1,422 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/template/multi-platform-cpp/proj.linux/.project b/template/multi-platform-cpp/proj.linux/.project deleted file mode 100644 index 7cd8c680f4..0000000000 --- a/template/multi-platform-cpp/proj.linux/.project +++ /dev/null @@ -1,110 +0,0 @@ - - - HelloCpp - - - 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:/HelloCpp/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 - - - - - 1345106176896 - Classes/ExtensionsTest - 10 - - org.eclipse.ui.ide.multiFilter - 1.0-name-matches-true-false-EditBoxTest - - - - diff --git a/template/multi-platform-cpp/proj.linux/Makefile b/template/multi-platform-cpp/proj.linux/Makefile deleted file mode 100644 index 170b1d2c95..0000000000 --- a/template/multi-platform-cpp/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 = ../cocos2d -include $(COCOS_ROOT)/cocos2dx/proj.linux/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/template/multi-platform-cpp/proj.linux/build.sh b/template/multi-platform-cpp/proj.linux/build.sh deleted file mode 100755 index 6df1fe6bfd..0000000000 --- a/template/multi-platform-cpp/proj.linux/build.sh +++ /dev/null @@ -1,59 +0,0 @@ -#!/bin/bash - -TXTCOLOR_DEFAULT="\033[0;m" -TXTCOLOR_RED="\033[0;31m" -TXTCOLOR_GREEN="\033[0;32m" - -COCOS2DX20_TRUNK=`pwd`/../cocos2d -OUTPUT_DEBUG=$COCOS2DX20_TRUNK/lib/linux/debug/ -OUTPUT_RELEASE=$COCOS2DX20_TRUNK/lib/linux/release/ - -check_make_result() -{ - if [ 0 != $? ]; then - exit 1 - fi -} - -DEPENDS='libx11-dev' -DEPENDS+=' libxmu-dev' -DEPENDS+=' libglu1-mesa-dev' -DEPENDS+=' libgl2ps-dev' -DEPENDS+=' libxi-dev' -DEPENDS+=' libglfw-dev' -DEPENDS+=' g++' -DEPENDS+=' libzip-dev' -DEPENDS+=' libcurl4-gnutls-dev' -DEPENDS+=' libfontconfig1-dev' -DEPENDS+=' libsqlite3-dev' -DEPENDS+=' libglew-dev' - -for i in $DEPENDS; do - PKG_OK=$(dpkg-query -W --showformat='${Status}\n' $i | grep "install ok installed") - echo Checking for $i: $PKG_OK - if [ "" == "$PKG_OK" ]; then - echo -e $TXTCOLOR_GREEN"No $i. Setting up $i, please enter your password:"$TXTCOLOR_DEFAULT - sudo apt-get --force-yes --yes install $i - fi -done - -mkdir -p $OUTPUT_DEBUG -mkdir -p $OUTPUT_RELEASE - -make -C $COCOS2DX20_TRUNK/external/Box2D/proj.linux DEBUG=1 -check_make_result - -make -C $COCOS2DX20_TRUNK/external/chipmunk/proj.linux DEBUG=1 -check_make_result - -make -C $COCOS2DX20_TRUNK/cocos2dx/proj.linux DEBUG=1 -check_make_result - -make -C $COCOS2DX20_TRUNK/CocosDenshion/proj.linux DEBUG=1 -check_make_result - -make -C $COCOS2DX20_TRUNK/extensions/proj.linux DEBUG=1 -check_make_result - -make DEBUG=1 -check_make_result diff --git a/template/multi-platform-lua/CMakeLists.txt b/template/multi-platform-lua/CMakeLists.txt index 8f3f930bd4..620e90ffe1 100644 --- a/template/multi-platform-lua/CMakeLists.txt +++ b/template/multi-platform-lua/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.6) set(APP_NAME HelloLua) project (${APP_NAME}) -include(../../build/BuildHelpers.CMakeLists.txt) +include(cocos2d/build/BuildHelpers.CMakeLists.txt) option(USE_CHIPMUNK "Use chipmunk for physics library" ON) option(USE_BOX2D "Use box2d for physics library" OFF) diff --git a/template/multi-platform-lua/proj.linux/.cproject b/template/multi-platform-lua/proj.linux/.cproject deleted file mode 100644 index d0575ca9b7..0000000000 --- a/template/multi-platform-lua/proj.linux/.cproject +++ /dev/null @@ -1,411 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/template/multi-platform-lua/proj.linux/.project b/template/multi-platform-lua/proj.linux/.project deleted file mode 100644 index 54e0b8d7d3..0000000000 --- a/template/multi-platform-lua/proj.linux/.project +++ /dev/null @@ -1,44 +0,0 @@ - - - HelloLua - - - libBox2D - libChipmunk - libcocos2d - libCocosDenshion - 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 - - - diff --git a/template/multi-platform-lua/proj.linux/Makefile b/template/multi-platform-lua/proj.linux/Makefile deleted file mode 100644 index 368020726c..0000000000 --- a/template/multi-platform-lua/proj.linux/Makefile +++ /dev/null @@ -1,27 +0,0 @@ -EXECUTABLE = HelloLua - -COCOS_ROOT = ../cocos2d -INCLUDES = -I../ -I../Classes -I$(COCOS_ROOT)/audio/include \ - -I$(COCOS_ROOT)/scripting/lua/lua \ - -I$(COCOS_ROOT)/scripting/lua/tolua \ - -I$(COCOS_ROOT)/scripting/lua/cocos2dx_support - -SOURCES = main.cpp ../Classes/AppDelegate.cpp - -SHAREDLIBS += -lcocos2d -lcocosdenshion -llua -COCOS_LIBS = $(LIB_DIR)/libcocos2d.so $(LIB_DIR)/libcocosdenshion.so $(LIB_DIR)/liblua.so - -include $(COCOS_ROOT)/cocos2dx/proj.linux/cocos2dx.mk - -$(TARGET): $(OBJECTS) $(STATICLIBS) $(COCOS_LIBS) $(CORE_MAKEFILE_LIST) - @mkdir -p $(@D) - cp -n ../../../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 $@ diff --git a/tools/project-creator/README.md b/tools/project-creator/README.md index b282f0f0db..06fb84e3ba 100644 --- a/tools/project-creator/README.md +++ b/tools/project-creator/README.md @@ -7,7 +7,7 @@ Notice:The best of generate path is english path. ##1.UI * Windows: double click "create_project.pyw" file * Mac: ./create_project.pyw -* Linux: The tkinter was not installed in the linux's default python, +* Linux: The tkinter was not installed in the linux's default python,therefore, in order to use the gui operate, you have to install the tkinter libaray manually. There is another way to create project by command line. see below for details ##2.console $ cd cocos2d-x/tools/project-creator $ ./project-creator.pyw --help