diff --git a/Box2D/CMakeFiles/CMakeDetermineCompilerABI_C.bin b/Box2D/CMakeFiles/CMakeDetermineCompilerABI_C.bin
deleted file mode 100755
index 7e0d0e9044..0000000000
Binary files a/Box2D/CMakeFiles/CMakeDetermineCompilerABI_C.bin and /dev/null differ
diff --git a/Box2D/CMakeFiles/CMakeDetermineCompilerABI_CXX.bin b/Box2D/CMakeFiles/CMakeDetermineCompilerABI_CXX.bin
deleted file mode 100755
index 4f4e3ebde5..0000000000
Binary files a/Box2D/CMakeFiles/CMakeDetermineCompilerABI_CXX.bin and /dev/null differ
diff --git a/Box2D/CMakeFiles/CompilerIdC/CMakeCCompilerId.c b/Box2D/CMakeFiles/CompilerIdC/CMakeCCompilerId.c
deleted file mode 100644
index 4da3198a26..0000000000
--- a/Box2D/CMakeFiles/CompilerIdC/CMakeCCompilerId.c
+++ /dev/null
@@ -1,217 +0,0 @@
-#ifdef __cplusplus
-# error "A C++ compiler has been selected for C."
-#endif
-
-#if defined(__18CXX)
-# define ID_VOID_MAIN
-#endif
-
-#if defined(__INTEL_COMPILER) || defined(__ICC)
-# define COMPILER_ID "Intel"
-
-#elif defined(__BORLANDC__)
-# define COMPILER_ID "Borland"
-
-#elif defined(__WATCOMC__)
-# define COMPILER_ID "Watcom"
-
-#elif defined(__SUNPRO_C)
-# define COMPILER_ID "SunPro"
-
-#elif defined(__HP_cc)
-# define COMPILER_ID "HP"
-
-#elif defined(__DECC)
-# define COMPILER_ID "Compaq"
-
-#elif defined(__IBMC__)
-# if defined(__COMPILER_VER__)
-#  define COMPILER_ID "zOS"
-# elif __IBMC__ >= 800
-#  define COMPILER_ID "XL"
-# else
-#  define COMPILER_ID "VisualAge"
-# endif
-
-#elif defined(__PGI)
-# define COMPILER_ID "PGI"
-
-#elif defined(__PATHSCALE__)
-# define COMPILER_ID "PathScale"
-
-#elif defined(__GNUC__)
-# define COMPILER_ID "GNU"
-
-#elif defined(_MSC_VER)
-# define COMPILER_ID "MSVC"
-
-#elif defined(__ADSPBLACKFIN__) || defined(__ADSPTS__) || defined(__ADSP21000__)
-/* Analog Devices C++ compiler for Blackfin, TigerSHARC and
-   SHARC (21000) DSPs */
-# define COMPILER_ID "ADSP"
-
-/* IAR Systems compiler for embedded systems.
-   http://www.iar.com
-   Not supported yet by CMake
-#elif defined(__IAR_SYSTEMS_ICC__)
-# define COMPILER_ID "IAR" */
-
-/* sdcc, the small devices C compiler for embedded systems,
-   http://sdcc.sourceforge.net  */
-#elif defined(SDCC)
-# define COMPILER_ID "SDCC"
-
-#elif defined(_SGI_COMPILER_VERSION) || defined(_COMPILER_VERSION)
-# define COMPILER_ID "MIPSpro"
-
-/* This compiler is either not known or is too old to define an
-   identification macro.  Try to identify the platform and guess that
-   it is the native compiler.  */
-#elif defined(__sgi)
-# define COMPILER_ID "MIPSpro"
-
-#elif defined(__hpux) || defined(__hpua)
-# define COMPILER_ID "HP"
-
-#else /* unknown compiler */
-# define COMPILER_ID ""
-
-#endif
-
-/* Construct the string literal in pieces to prevent the source from
-   getting matched.  Store it in a pointer rather than an array
-   because some compilers will just produce instructions to fill the
-   array rather than assigning a pointer to a static array.  */
-char* info_compiler = "INFO" ":" "compiler[" COMPILER_ID "]";
-
-/* Identify known platforms by name.  */
-#if defined(__linux) || defined(__linux__) || defined(linux)
-# define PLATFORM_ID "Linux"
-
-#elif defined(__CYGWIN__)
-# define PLATFORM_ID "Cygwin"
-
-#elif defined(__MINGW32__)
-# define PLATFORM_ID "MinGW"
-
-#elif defined(__APPLE__)
-# define PLATFORM_ID "Darwin"
-
-#elif defined(_WIN32) || defined(__WIN32__) || defined(WIN32)
-# define PLATFORM_ID "Windows"
-
-#elif defined(__FreeBSD__) || defined(__FreeBSD)
-# define PLATFORM_ID "FreeBSD"
-
-#elif defined(__NetBSD__) || defined(__NetBSD)
-# define PLATFORM_ID "NetBSD"
-
-#elif defined(__OpenBSD__) || defined(__OPENBSD)
-# define PLATFORM_ID "OpenBSD"
-
-#elif defined(__sun) || defined(sun)
-# define PLATFORM_ID "SunOS"
-
-#elif defined(_AIX) || defined(__AIX) || defined(__AIX__) || defined(__aix) || defined(__aix__)
-# define PLATFORM_ID "AIX"
-
-#elif defined(__sgi) || defined(__sgi__) || defined(_SGI)
-# define PLATFORM_ID "IRIX"
-
-#elif defined(__hpux) || defined(__hpux__)
-# define PLATFORM_ID "HP-UX"
-
-#elif defined(__HAIKU) || defined(__HAIKU__) || defined(_HAIKU)
-# define PLATFORM_ID "Haiku"
-/* Haiku also defines __BEOS__ so we must 
-   put it prior to the check for __BEOS__
-*/
-
-#elif defined(__BeOS) || defined(__BEOS__) || defined(_BEOS)
-# define PLATFORM_ID "BeOS"
-
-#elif defined(__QNX__) || defined(__QNXNTO__)
-# define PLATFORM_ID "QNX"
-
-#elif defined(__tru64) || defined(_tru64) || defined(__TRU64__)
-# define PLATFORM_ID "Tru64"
-
-#elif defined(__riscos) || defined(__riscos__)
-# define PLATFORM_ID "RISCos"
-
-#elif defined(__sinix) || defined(__sinix__) || defined(__SINIX__)
-# define PLATFORM_ID "SINIX"
-
-#elif defined(__UNIX_SV__)
-# define PLATFORM_ID "UNIX_SV"
-
-#elif defined(__bsdos__)
-# define PLATFORM_ID "BSDOS"
-
-#elif defined(_MPRAS) || defined(MPRAS)
-# define PLATFORM_ID "MP-RAS"
-
-#elif defined(__osf) || defined(__osf__)
-# define PLATFORM_ID "OSF1"
-
-#elif defined(_SCO_SV) || defined(SCO_SV) || defined(sco_sv)
-# define PLATFORM_ID "SCO_SV"
-
-#elif defined(__ultrix) || defined(__ultrix__) || defined(_ULTRIX)
-# define PLATFORM_ID "ULTRIX"
-
-#elif defined(__XENIX__) || defined(_XENIX) || defined(XENIX)
-# define PLATFORM_ID "Xenix"
-
-#else /* unknown platform */
-# define PLATFORM_ID ""
-
-#endif
-
-/* For windows compilers MSVC and Intel we can determine
-   the architecture of the compiler being used.  This is becase
-   the compilers do not have flags that can change the architecture,
-   but rather depend on which compiler is being used
-*/
-#if defined(_WIN32) && defined(_MSC_VER)
-# if defined(_M_IA64)
-#  define ARCHITECTURE_ID "IA64"
-
-# elif defined(_M_X64) || defined(_M_AMD64)
-#  define ARCHITECTURE_ID "x64" 
-
-# elif defined(_M_IX86)
-#  define ARCHITECTURE_ID "X86"
-
-# else /* unknown architecture */
-#  define ARCHITECTURE_ID ""
-# endif
-
-#else
-#  define ARCHITECTURE_ID ""
-#endif
-
-/* Construct the string literal in pieces to prevent the source from
-   getting matched.  Store it in a pointer rather than an array
-   because some compilers will just produce instructions to fill the
-   array rather than assigning a pointer to a static array.  */
-char* info_platform = "INFO" ":" "platform[" PLATFORM_ID "]";
-char* info_arch = "INFO" ":" "arch[" ARCHITECTURE_ID "]";
-
-
-
-/*--------------------------------------------------------------------------*/
-
-#ifdef ID_VOID_MAIN
-void main() {}
-#else
-int main(int argc, char* argv[])
-{
-  int require = 0;
-  require += info_compiler[argc];
-  require += info_platform[argc];
-  require += info_arch[argc];
-  (void)argv;
-  return require;
-}
-#endif
diff --git a/Box2D/CMakeFiles/CompilerIdC/a.out b/Box2D/CMakeFiles/CompilerIdC/a.out
deleted file mode 100755
index 779cd3f771..0000000000
Binary files a/Box2D/CMakeFiles/CompilerIdC/a.out and /dev/null differ
diff --git a/Box2D/CMakeFiles/CompilerIdCXX/CMakeCXXCompilerId.cpp b/Box2D/CMakeFiles/CompilerIdCXX/CMakeCXXCompilerId.cpp
deleted file mode 100644
index 2d16102299..0000000000
--- a/Box2D/CMakeFiles/CompilerIdCXX/CMakeCXXCompilerId.cpp
+++ /dev/null
@@ -1,203 +0,0 @@
-/* This source file must have a .cpp extension so that all C++ compilers
-   recognize the extension without flags.  Borland does not know .cxx for
-   example.  */
-#ifndef __cplusplus
-# error "A C compiler has been selected for C++."
-#endif
-
-#if defined(__COMO__)
-# define COMPILER_ID "Comeau"
-
-#elif defined(__INTEL_COMPILER) || defined(__ICC)
-# define COMPILER_ID "Intel"
-
-#elif defined(__BORLANDC__)
-# define COMPILER_ID "Borland"
-
-#elif defined(__WATCOMC__)
-# define COMPILER_ID "Watcom"
-
-#elif defined(__SUNPRO_CC)
-# define COMPILER_ID "SunPro"
-
-#elif defined(__HP_aCC)
-# define COMPILER_ID "HP"
-
-#elif defined(__DECCXX)
-# define COMPILER_ID "Compaq"
-
-#elif defined(__IBMCPP__)
-# if defined(__COMPILER_VER__)
-#  define COMPILER_ID "zOS"
-# elif __IBMCPP__ >= 800
-#  define COMPILER_ID "XL"
-# else
-#  define COMPILER_ID "VisualAge"
-# endif
-
-#elif defined(__PGI)
-# define COMPILER_ID "PGI"
-
-#elif defined(__PATHSCALE__)
-# define COMPILER_ID "PathScale"
-
-#elif defined(__GNUC__)
-# define COMPILER_ID "GNU"
-
-#elif defined(_MSC_VER)
-# define COMPILER_ID "MSVC"
-
-#elif defined(__ADSPBLACKFIN__) || defined(__ADSPTS__) || defined(__ADSP21000__)
-/* Analog Devices C++ compiler for Blackfin, TigerSHARC and
-   SHARC (21000) DSPs */
-# define COMPILER_ID "ADSP"
-
-#elif defined(_SGI_COMPILER_VERSION) || defined(_COMPILER_VERSION)
-# define COMPILER_ID "MIPSpro"
-
-/* This compiler is either not known or is too old to define an
-   identification macro.  Try to identify the platform and guess that
-   it is the native compiler.  */
-#elif defined(__sgi)
-# define COMPILER_ID "MIPSpro"
-
-#elif defined(__hpux) || defined(__hpua)
-# define COMPILER_ID "HP"
-
-#else /* unknown compiler */
-# define COMPILER_ID ""
-
-#endif
-
-/* Construct the string literal in pieces to prevent the source from
-   getting matched.  Store it in a pointer rather than an array
-   because some compilers will just produce instructions to fill the
-   array rather than assigning a pointer to a static array.  */
-char* info_compiler = "INFO" ":" "compiler[" COMPILER_ID "]";
-
-/* Identify known platforms by name.  */
-#if defined(__linux) || defined(__linux__) || defined(linux)
-# define PLATFORM_ID "Linux"
-
-#elif defined(__CYGWIN__)
-# define PLATFORM_ID "Cygwin"
-
-#elif defined(__MINGW32__)
-# define PLATFORM_ID "MinGW"
-
-#elif defined(__APPLE__)
-# define PLATFORM_ID "Darwin"
-
-#elif defined(_WIN32) || defined(__WIN32__) || defined(WIN32)
-# define PLATFORM_ID "Windows"
-
-#elif defined(__FreeBSD__) || defined(__FreeBSD)
-# define PLATFORM_ID "FreeBSD"
-
-#elif defined(__NetBSD__) || defined(__NetBSD)
-# define PLATFORM_ID "NetBSD"
-
-#elif defined(__OpenBSD__) || defined(__OPENBSD)
-# define PLATFORM_ID "OpenBSD"
-
-#elif defined(__sun) || defined(sun)
-# define PLATFORM_ID "SunOS"
-
-#elif defined(_AIX) || defined(__AIX) || defined(__AIX__) || defined(__aix) || defined(__aix__)
-# define PLATFORM_ID "AIX"
-
-#elif defined(__sgi) || defined(__sgi__) || defined(_SGI)
-# define PLATFORM_ID "IRIX"
-
-#elif defined(__hpux) || defined(__hpux__)
-# define PLATFORM_ID "HP-UX"
-
-#elif defined(__HAIKU) || defined(__HAIKU__) || defined(_HAIKU)
-# define PLATFORM_ID "Haiku"
-/* Haiku also defines __BEOS__ so we must 
-   put it prior to the check for __BEOS__
-*/
-
-#elif defined(__BeOS) || defined(__BEOS__) || defined(_BEOS)
-# define PLATFORM_ID "BeOS"
-
-#elif defined(__QNX__) || defined(__QNXNTO__)
-# define PLATFORM_ID "QNX"
-
-#elif defined(__tru64) || defined(_tru64) || defined(__TRU64__)
-# define PLATFORM_ID "Tru64"
-
-#elif defined(__riscos) || defined(__riscos__)
-# define PLATFORM_ID "RISCos"
-
-#elif defined(__sinix) || defined(__sinix__) || defined(__SINIX__)
-# define PLATFORM_ID "SINIX"
-
-#elif defined(__UNIX_SV__)
-# define PLATFORM_ID "UNIX_SV"
-
-#elif defined(__bsdos__)
-# define PLATFORM_ID "BSDOS"
-
-#elif defined(_MPRAS) || defined(MPRAS)
-# define PLATFORM_ID "MP-RAS"
-
-#elif defined(__osf) || defined(__osf__)
-# define PLATFORM_ID "OSF1"
-
-#elif defined(_SCO_SV) || defined(SCO_SV) || defined(sco_sv)
-# define PLATFORM_ID "SCO_SV"
-
-#elif defined(__ultrix) || defined(__ultrix__) || defined(_ULTRIX)
-# define PLATFORM_ID "ULTRIX"
-
-#elif defined(__XENIX__) || defined(_XENIX) || defined(XENIX)
-# define PLATFORM_ID "Xenix"
-
-#else /* unknown platform */
-# define PLATFORM_ID ""
-
-#endif
-
-/* For windows compilers MSVC and Intel we can determine
-   the architecture of the compiler being used.  This is becase
-   the compilers do not have flags that can change the architecture,
-   but rather depend on which compiler is being used
-*/
-#if defined(_WIN32) && defined(_MSC_VER)
-# if defined(_M_IA64)
-#  define ARCHITECTURE_ID "IA64"
-
-# elif defined(_M_X64) || defined(_M_AMD64)
-#  define ARCHITECTURE_ID "x64" 
-
-# elif defined(_M_IX86)
-#  define ARCHITECTURE_ID "X86"
-
-# else /* unknown architecture */
-#  define ARCHITECTURE_ID ""
-# endif
-
-#else
-#  define ARCHITECTURE_ID ""
-#endif
-
-/* Construct the string literal in pieces to prevent the source from
-   getting matched.  Store it in a pointer rather than an array
-   because some compilers will just produce instructions to fill the
-   array rather than assigning a pointer to a static array.  */
-char* info_platform = "INFO" ":" "platform[" PLATFORM_ID "]";
-char* info_arch = "INFO" ":" "arch[" ARCHITECTURE_ID "]";
-
-
-
-/*--------------------------------------------------------------------------*/
-
-int main(int argc, char* argv[])
-{
-  int require = 0;
-  require += info_compiler[argc];
-  require += info_platform[argc];
-  (void)argv;
-  return require;
-}
diff --git a/Box2D/CMakeFiles/CompilerIdCXX/a.out b/Box2D/CMakeFiles/CompilerIdCXX/a.out
deleted file mode 100755
index f7c70b1761..0000000000
Binary files a/Box2D/CMakeFiles/CompilerIdCXX/a.out and /dev/null differ
diff --git a/Box2D/CMakeFiles/Makefile2 b/Box2D/CMakeFiles/Makefile2
deleted file mode 100644
index 22bd649c3b..0000000000
--- a/Box2D/CMakeFiles/Makefile2
+++ /dev/null
@@ -1,61 +0,0 @@
-# CMAKE generated file: DO NOT EDIT!
-# Generated by "Unix Makefiles" Generator, CMake Version 2.8
-
-# Default target executed when no arguments are given to make.
-default_target: all
-.PHONY : default_target
-
-# The main recursive all target
-all:
-.PHONY : all
-
-# The main recursive preinstall target
-preinstall:
-.PHONY : preinstall
-
-#=============================================================================
-# Special targets provided by cmake.
-
-# Disable implicit rules so canoncical targets will work.
-.SUFFIXES:
-
-# Remove some rules from gmake that .SUFFIXES does not remove.
-SUFFIXES =
-
-.SUFFIXES: .hpux_make_needs_suffix_list
-
-# Suppress display of executed commands.
-$(VERBOSE).SILENT:
-
-# A target that is always out of date.
-cmake_force:
-.PHONY : cmake_force
-
-#=============================================================================
-# Set environment variables for the build.
-
-# The shell in which to execute make rules.
-SHELL = /bin/sh
-
-# The CMake executable.
-CMAKE_COMMAND = /usr/bin/cmake
-
-# The command to remove a file.
-RM = /usr/bin/cmake -E remove -f
-
-# The top-level source directory on which CMake was run.
-CMAKE_SOURCE_DIR = /home/laschweinski/git/cocos2d-x/Box2D
-
-# The top-level build directory on which CMake was run.
-CMAKE_BINARY_DIR = /home/laschweinski/git/cocos2d-x/Box2D
-
-#=============================================================================
-# Special targets to cleanup operation of make.
-
-# Special rule to run CMake to check the build system integrity.
-# No rule that depends on this can have commands that come from listfiles
-# because they might be regenerated.
-cmake_check_build_system:
-	$(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
-.PHONY : cmake_check_build_system
-
diff --git a/Box2D/CMakeFiles/TargetDirectories.txt b/Box2D/CMakeFiles/TargetDirectories.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/Box2D/CMakeFiles/cmake.check_cache b/Box2D/CMakeFiles/cmake.check_cache
deleted file mode 100644
index 3dccd73172..0000000000
--- a/Box2D/CMakeFiles/cmake.check_cache
+++ /dev/null
@@ -1 +0,0 @@
-# This file is generated by cmake for dependency checking of the CMakeCache.txt file
diff --git a/Box2D/CMakeFiles/progress.marks b/Box2D/CMakeFiles/progress.marks
deleted file mode 100644
index 573541ac97..0000000000
--- a/Box2D/CMakeFiles/progress.marks
+++ /dev/null
@@ -1 +0,0 @@
-0
diff --git a/Box2D/lib/linux/libBox2D.a.REMOVED.git-id b/Box2D/lib/linux/libBox2D.a.REMOVED.git-id
deleted file mode 100644
index 35f0d7f894..0000000000
--- a/Box2D/lib/linux/libBox2D.a.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-05569f7633bf44a60894b602d7c1b94d85daba60
\ No newline at end of file
diff --git a/Box2D/proj.linux/Makefile b/Box2D/proj.linux/Makefile
new file mode 100644
index 0000000000..18c2b8d1f5
--- /dev/null
+++ b/Box2D/proj.linux/Makefile
@@ -0,0 +1,62 @@
+CC      = gcc
+CXX     = g++
+AR      = ar
+TARGET	= libBox2D.a
+CCFLAGS = -Wall -g -O2 
+CXXFLAGS = -Wall -g -O2 
+ARFLAGS = cr
+
+INCLUDES = -I../../
+
+DEFINES = -DLINUX
+
+OBJECTS = ../Collision/b2BroadPhase.o \
+        ../Collision/b2CollideCircle.o \
+        ../Collision/b2CollidePolygon.o \
+        ../Collision/b2Collision.o \
+        ../Collision/b2Distance.o \
+        ../Collision/b2DynamicTree.o \
+        ../Collision/b2TimeOfImpact.o \
+        ../Collision/Shapes/b2CircleShape.o \
+        ../Collision/Shapes/b2PolygonShape.o \
+        ../Common/b2BlockAllocator.o \
+        ../Common/b2Math.o \
+        ../Common/b2Settings.o \
+        ../Common/b2StackAllocator.o \
+        ../Dynamics/b2Body.o \
+        ../Dynamics/b2ContactManager.o \
+        ../Dynamics/b2Fixture.o \
+        ../Dynamics/b2Island.o \
+        ../Dynamics/b2World.o \
+        ../Dynamics/b2WorldCallbacks.o \
+        ../Dynamics/Contacts/b2CircleContact.o \
+        ../Dynamics/Contacts/b2Contact.o \
+        ../Dynamics/Contacts/b2ContactSolver.o \
+        ../Dynamics/Contacts/b2PolygonAndCircleContact.o \
+        ../Dynamics/Contacts/b2PolygonContact.o \
+        ../Dynamics/Contacts/b2TOISolver.o \
+        ../Dynamics/Joints/b2DistanceJoint.o \
+        ../Dynamics/Joints/b2FrictionJoint.o \
+        ../Dynamics/Joints/b2GearJoint.o \
+        ../Dynamics/Joints/b2Joint.o \
+        ../Dynamics/Joints/b2LineJoint.o \
+        ../Dynamics/Joints/b2MouseJoint.o \
+        ../Dynamics/Joints/b2PrismaticJoint.o \
+        ../Dynamics/Joints/b2PulleyJoint.o \
+        ../Dynamics/Joints/b2RevoluteJoint.o \
+        ../Dynamics/Joints/b2WeldJoint.o 
+
+
+####### Build rules
+$(TARGET): $(OBJECTS) 
+	$(AR) $(ARFLAGS) $(TARGET) $(OBJECTS)  
+	
+####### Compile
+%.o: %.cpp
+	$(CXX) $(CXXFLAGS) $(INCLUDES) $(DEFINES) -c $< -o $@
+
+%.o: %.c
+	$(CC) $(CCFLAGS) $(INCLUDES) $(DEFINES) -c $< -o $@
+		
+clean: 
+	rm -f $(OBJECTS) $(TARGET) core
\ No newline at end of file
diff --git a/CocosDenshion/proj.linux/Makefile b/CocosDenshion/proj.linux/Makefile
new file mode 100644
index 0000000000..1314de74a0
--- /dev/null
+++ b/CocosDenshion/proj.linux/Makefile
@@ -0,0 +1,33 @@
+CC      = gcc
+CXX     = g++
+TARGET	= libCocosDenshion.so
+CCFLAGS = -Wall -g -O2 
+CXXFLAGS = -Wall -g -O2 
+VISIBILITY = 
+
+INCLUDES = -I.. \
+		-I../include \
+		-I../third_party/fmod/api/inc 
+
+DEFINES = -DLINUX
+
+OBJECTS =   ../Linux/FmodAudioPlayer.o \
+            ../Linux/SimpleAudioEngine.o \
+
+
+STATICLIBS = 
+SHAREDLIBS = -lfmodex
+
+####### Build rules
+$(TARGET): $(OBJECTS) 
+	$(CXX) $(CXXFLAGS) $(INCLUDES) $(DEFINES) $(OBJECTS) -shared -o $(TARGET) $(SHAREDLIBS) $(STATICLIBS)
+	
+####### Compile
+%.o: %.cpp
+	$(CXX) $(CXXFLAGS) $(INCLUDES) $(DEFINES) $(VISIBILITY) -c $< -o $@
+
+%.o: %.c
+	$(CC) $(CCFLAGS) $(INCLUDES) $(DEFINES) $(VISIBILITY) -c $< -o $@
+		
+clean: 
+	rm -f $(OBJECTS) $(TARGET) core
\ No newline at end of file
diff --git a/HelloWorld/Linux/Makefile b/HelloWorld/Linux/Makefile
new file mode 100644
index 0000000000..d0c050ce80
--- /dev/null
+++ b/HelloWorld/Linux/Makefile
@@ -0,0 +1,37 @@
+CC      = gcc
+CXX     = g++
+TARGET	= HelloWorld
+CCFLAGS = -Wall -g -O2 
+CXXFLAGS = -Wall -g -O2 
+VISIBILITY = 
+
+INCLUDES = -I../../cocos2dx/platform/third_party/linux \
+            -I../../cocos2dx/include \
+            -I../../cocos2dx \
+            -I../../cocos2dx/platform \
+            -I../../CocosDenshion/include \
+            -I../Classes/
+
+DEFINES = -DLINUX
+
+OBJECTS = ./main.o \
+        ../Classes/AppDelegate.o \
+        ../Classes/HelloWorldScene.o 
+
+STATICLIBS =  
+SHAREDLIBS = -L../../lib/linux/Debug -lcocos2d -lrt -lz -lcocosdenshion -Wl,-rpath,../../lib/linux/Debug/
+
+$(shell ../../build-linux.sh $<)
+####### Build rules
+$(TARGET): $(OBJECTS) 
+	$(CXX) $(CXXFLAGS) $(INCLUDES) $(DEFINES) $(OBJECTS) -o $(TARGET) $(SHAREDLIBS) $(STATICLIBS)
+	
+####### Compile
+%.o: %.cpp
+	$(CXX) $(CXXFLAGS) $(INCLUDES) $(DEFINES) $(VISIBILITY) -c $< -o $@
+
+%.o: %.c
+	$(CC) $(CCFLAGS) $(INCLUDES) $(DEFINES) $(VISIBILITY) -c $< -o $@
+		
+clean: 
+	rm -f $(OBJECTS) $(TARGET) core
diff --git a/build-linux.sh b/build-linux.sh
new file mode 100644
index 0000000000..cfdc4f75f1
--- /dev/null
+++ b/build-linux.sh
@@ -0,0 +1,51 @@
+#!/bin/sh
+#p=$(dirname $_)
+#echo "$p"
+
+path=$(dirname $0)
+path=${path/\./$(pwd)}
+echo $path
+
+if [ ! -d "lib" ]; then
+mkdir "lib"
+fi
+
+if [ ! -d "lib/linux" ]; then
+mkdir "lib/linux"
+fi
+
+if [ ! -d "lib/linux/Debug" ]; then
+mkdir "lib/linux/Debug"
+fi
+
+if [ ! -d "lib/linux/Release" ]; then
+mkdir "lib/linux/Release"
+fi
+
+if [ $# -ne 0 ]; then
+	if [ $1 = "clean" ]; then
+		cd $p/cocos2dx/proj.linux
+		make clean
+
+		cd ../../
+		cd $p/CocosDenshion/proj.linux
+		make clean
+
+		cd ../../
+		rm -r lib/linux/Debug/*.so
+	fi
+	
+else
+	cd $p/cocos2dx/proj.linux
+	make
+
+	cp -f libcocos2d.so ../../lib/linux/Debug
+	cd ../../
+	cd $p/CocosDenshion/proj.linux
+	make
+
+	cp -f libCocosDenshion.so ../../lib/linux/Debug
+
+	cd ../../
+fi
+
diff --git a/chipmunk/CMakeCache.txt b/chipmunk/CMakeCache.txt
deleted file mode 100644
index 2cfa1b587f..0000000000
--- a/chipmunk/CMakeCache.txt
+++ /dev/null
@@ -1,305 +0,0 @@
-# This is the CMakeCache file.
-# For build in directory: /home/laschweinski/git/cocos2d-x/chipmunk
-# It was generated by CMake: /usr/bin/cmake
-# You can edit this file to change values found and used by cmake.
-# If you do not want to change any of the values, simply exit the editor.
-# If you do want to change a value, simply edit, save, and exit the editor.
-# The syntax for the file is as follows:
-# KEY:TYPE=VALUE
-# KEY is the name of a variable in the cache.
-# TYPE is a hint to GUI's for the type of VALUE, DO NOT EDIT TYPE!.
-# VALUE is the current value for the KEY.
-
-########################
-# EXTERNAL cache entries
-########################
-
-//Build the demo applications
-BUILD_DEMOS:BOOL=ON
-
-//Build and install the Ruby extension
-BUILD_RUBY_EXT:BOOL=OFF
-
-//Build and install the shared library
-BUILD_SHARED:BOOL=ON
-
-//Build as static library
-BUILD_STATIC:BOOL=ON
-
-//Path to a program.
-CMAKE_AR:FILEPATH=/usr/bin/ar
-
-//Choose the type of build, options are: None(CMAKE_CXX_FLAGS or
-// CMAKE_C_FLAGS used) Debug Release RelWithDebInfo MinSizeRel.
-CMAKE_BUILD_TYPE:STRING=
-
-//Enable/Disable color output during build.
-CMAKE_COLOR_MAKEFILE:BOOL=ON
-
-//CXX compiler.
-CMAKE_CXX_COMPILER:FILEPATH=/usr/bin/c++
-
-//Flags used by the compiler during all build types.
-CMAKE_CXX_FLAGS:STRING=
-
-//Flags used by the compiler during debug builds.
-CMAKE_CXX_FLAGS_DEBUG:STRING=-g
-
-//Flags used by the compiler during release minsize builds.
-CMAKE_CXX_FLAGS_MINSIZEREL:STRING=-Os -DNDEBUG
-
-//Flags used by the compiler during release builds (/MD /Ob1 /Oi
-// /Ot /Oy /Gs will produce slightly less optimized but smaller
-// files).
-CMAKE_CXX_FLAGS_RELEASE:STRING=-O3 -DNDEBUG
-
-//Flags used by the compiler during Release with Debug Info builds.
-CMAKE_CXX_FLAGS_RELWITHDEBINFO:STRING=-O2 -g
-
-//C compiler.
-CMAKE_C_COMPILER:FILEPATH=/usr/bin/gcc
-
-//Flags used by the compiler during all build types.
-CMAKE_C_FLAGS:STRING=
-
-//Flags used by the compiler during debug builds.
-CMAKE_C_FLAGS_DEBUG:STRING=-g
-
-//Flags used by the compiler during release minsize builds.
-CMAKE_C_FLAGS_MINSIZEREL:STRING=-Os -DNDEBUG
-
-//Flags used by the compiler during release builds (/MD /Ob1 /Oi
-// /Ot /Oy /Gs will produce slightly less optimized but smaller
-// files).
-CMAKE_C_FLAGS_RELEASE:STRING=-O3 -DNDEBUG
-
-//Flags used by the compiler during Release with Debug Info builds.
-CMAKE_C_FLAGS_RELWITHDEBINFO:STRING=-O2 -g
-
-//Flags used by the linker.
-CMAKE_EXE_LINKER_FLAGS:STRING=
-
-//Flags used by the linker during debug builds.
-CMAKE_EXE_LINKER_FLAGS_DEBUG:STRING=
-
-//Flags used by the linker during release minsize builds.
-CMAKE_EXE_LINKER_FLAGS_MINSIZEREL:STRING=
-
-//Flags used by the linker during release builds.
-CMAKE_EXE_LINKER_FLAGS_RELEASE:STRING=
-
-//Flags used by the linker during Release with Debug Info builds.
-CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO:STRING=
-
-//Install path prefix, prepended onto install directories.
-CMAKE_INSTALL_PREFIX:PATH=/usr/local
-
-//Path to a program.
-CMAKE_LINKER:FILEPATH=/usr/bin/ld
-
-//Path to a program.
-CMAKE_MAKE_PROGRAM:FILEPATH=/usr/bin/make
-
-//Flags used by the linker during the creation of modules.
-CMAKE_MODULE_LINKER_FLAGS:STRING=
-
-//Flags used by the linker during debug builds.
-CMAKE_MODULE_LINKER_FLAGS_DEBUG:STRING=
-
-//Flags used by the linker during release minsize builds.
-CMAKE_MODULE_LINKER_FLAGS_MINSIZEREL:STRING=
-
-//Flags used by the linker during release builds.
-CMAKE_MODULE_LINKER_FLAGS_RELEASE:STRING=
-
-//Flags used by the linker during Release with Debug Info builds.
-CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO:STRING=
-
-//Path to a program.
-CMAKE_NM:FILEPATH=/usr/bin/nm
-
-//Path to a program.
-CMAKE_OBJCOPY:FILEPATH=/usr/bin/objcopy
-
-//Path to a program.
-CMAKE_OBJDUMP:FILEPATH=/usr/bin/objdump
-
-//Value Computed by CMake
-CMAKE_PROJECT_NAME:STATIC=chipmunk
-
-//Path to a program.
-CMAKE_RANLIB:FILEPATH=/usr/bin/ranlib
-
-//Flags used by the linker during the creation of dll's.
-CMAKE_SHARED_LINKER_FLAGS:STRING=
-
-//Flags used by the linker during debug builds.
-CMAKE_SHARED_LINKER_FLAGS_DEBUG:STRING=
-
-//Flags used by the linker during release minsize builds.
-CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL:STRING=
-
-//Flags used by the linker during release builds.
-CMAKE_SHARED_LINKER_FLAGS_RELEASE:STRING=
-
-//Flags used by the linker during Release with Debug Info builds.
-CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO:STRING=
-
-//If set, runtime paths are not added when using shared libraries.
-CMAKE_SKIP_RPATH:BOOL=NO
-
-//Path to a program.
-CMAKE_STRIP:FILEPATH=/usr/bin/strip
-
-//If true, cmake will use relative paths in makefiles and projects.
-CMAKE_USE_RELATIVE_PATHS:BOOL=OFF
-
-//If this value is on, makefiles will be generated without the
-// .SILENT directive, and all commands will be echoed to the console
-// during the make.  This is useful for debugging only. With Visual
-// Studio IDE projects all commands are done without /nologo.
-CMAKE_VERBOSE_MAKEFILE:BOOL=FALSE
-
-//Install the demo applications
-INSTALL_DEMOS:BOOL=OFF
-
-//Install the static library
-INSTALL_STATIC:BOOL=ON
-
-//Value Computed by CMake
-chipmunk_BINARY_DIR:STATIC=/home/laschweinski/git/cocos2d-x/chipmunk
-
-//Dependencies for target
-chipmunk_LIB_DEPENDS:STATIC=
-
-//Value Computed by CMake
-chipmunk_SOURCE_DIR:STATIC=/home/laschweinski/git/cocos2d-x/chipmunk
-
-//Dependencies for target
-chipmunk_static_LIB_DEPENDS:STATIC=
-
-
-########################
-# INTERNAL cache entries
-########################
-
-//ADVANCED property for variable: CMAKE_AR
-CMAKE_AR-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_BUILD_TOOL
-CMAKE_BUILD_TOOL-ADVANCED:INTERNAL=1
-//What is the target build tool cmake is generating for.
-CMAKE_BUILD_TOOL:INTERNAL=/usr/bin/make
-//This is the directory where this CMakeCache.txt was created
-CMAKE_CACHEFILE_DIR:INTERNAL=/home/laschweinski/git/cocos2d-x/chipmunk
-//Major version of cmake used to create the current loaded cache
-CMAKE_CACHE_MAJOR_VERSION:INTERNAL=2
-//Minor version of cmake used to create the current loaded cache
-CMAKE_CACHE_MINOR_VERSION:INTERNAL=8
-//Patch version of cmake used to create the current loaded cache
-CMAKE_CACHE_PATCH_VERSION:INTERNAL=1
-//ADVANCED property for variable: CMAKE_COLOR_MAKEFILE
-CMAKE_COLOR_MAKEFILE-ADVANCED:INTERNAL=1
-//Path to CMake executable.
-CMAKE_COMMAND:INTERNAL=/usr/bin/cmake
-//Path to cpack program executable.
-CMAKE_CPACK_COMMAND:INTERNAL=/usr/bin/cpack
-//Path to ctest program executable.
-CMAKE_CTEST_COMMAND:INTERNAL=/usr/bin/ctest
-//ADVANCED property for variable: CMAKE_CXX_COMPILER
-CMAKE_CXX_COMPILER-ADVANCED:INTERNAL=1
-CMAKE_CXX_COMPILER_WORKS:INTERNAL=1
-//ADVANCED property for variable: CMAKE_CXX_FLAGS
-CMAKE_CXX_FLAGS-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_CXX_FLAGS_DEBUG
-CMAKE_CXX_FLAGS_DEBUG-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_CXX_FLAGS_MINSIZEREL
-CMAKE_CXX_FLAGS_MINSIZEREL-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_CXX_FLAGS_RELEASE
-CMAKE_CXX_FLAGS_RELEASE-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_CXX_FLAGS_RELWITHDEBINFO
-CMAKE_CXX_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_C_COMPILER
-CMAKE_C_COMPILER-ADVANCED:INTERNAL=1
-CMAKE_C_COMPILER_WORKS:INTERNAL=1
-//ADVANCED property for variable: CMAKE_C_FLAGS
-CMAKE_C_FLAGS-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_C_FLAGS_DEBUG
-CMAKE_C_FLAGS_DEBUG-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_C_FLAGS_MINSIZEREL
-CMAKE_C_FLAGS_MINSIZEREL-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_C_FLAGS_RELEASE
-CMAKE_C_FLAGS_RELEASE-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_C_FLAGS_RELWITHDEBINFO
-CMAKE_C_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1
-//Result of TRY_COMPILE
-CMAKE_DETERMINE_CXX_ABI_COMPILED:INTERNAL=TRUE
-//Result of TRY_COMPILE
-CMAKE_DETERMINE_C_ABI_COMPILED:INTERNAL=TRUE
-//Path to cache edit program executable.
-CMAKE_EDIT_COMMAND:INTERNAL=/usr/bin/cmake-gui
-//Executable file format
-CMAKE_EXECUTABLE_FORMAT:INTERNAL=ELF
-//ADVANCED property for variable: CMAKE_EXE_LINKER_FLAGS
-CMAKE_EXE_LINKER_FLAGS-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_EXE_LINKER_FLAGS_DEBUG
-CMAKE_EXE_LINKER_FLAGS_DEBUG-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_EXE_LINKER_FLAGS_MINSIZEREL
-CMAKE_EXE_LINKER_FLAGS_MINSIZEREL-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_EXE_LINKER_FLAGS_RELEASE
-CMAKE_EXE_LINKER_FLAGS_RELEASE-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO
-CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1
-//Name of generator.
-CMAKE_GENERATOR:INTERNAL=Unix Makefiles
-//Start directory with the top level CMakeLists.txt file for this
-// project
-CMAKE_HOME_DIRECTORY:INTERNAL=/home/laschweinski/git/cocos2d-x/chipmunk
-//Install .so files without execute permission.
-CMAKE_INSTALL_SO_NO_EXE:INTERNAL=1
-//ADVANCED property for variable: CMAKE_LINKER
-CMAKE_LINKER-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_MAKE_PROGRAM
-CMAKE_MAKE_PROGRAM-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_MODULE_LINKER_FLAGS
-CMAKE_MODULE_LINKER_FLAGS-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_MODULE_LINKER_FLAGS_DEBUG
-CMAKE_MODULE_LINKER_FLAGS_DEBUG-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_MODULE_LINKER_FLAGS_MINSIZEREL
-CMAKE_MODULE_LINKER_FLAGS_MINSIZEREL-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_MODULE_LINKER_FLAGS_RELEASE
-CMAKE_MODULE_LINKER_FLAGS_RELEASE-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO
-CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_NM
-CMAKE_NM-ADVANCED:INTERNAL=1
-//number of local generators
-CMAKE_NUMBER_OF_LOCAL_GENERATORS:INTERNAL=2
-//ADVANCED property for variable: CMAKE_OBJCOPY
-CMAKE_OBJCOPY-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_OBJDUMP
-CMAKE_OBJDUMP-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_RANLIB
-CMAKE_RANLIB-ADVANCED:INTERNAL=1
-//Path to CMake installation.
-CMAKE_ROOT:INTERNAL=/usr/share/cmake-2.8
-//ADVANCED property for variable: CMAKE_SHARED_LINKER_FLAGS
-CMAKE_SHARED_LINKER_FLAGS-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_SHARED_LINKER_FLAGS_DEBUG
-CMAKE_SHARED_LINKER_FLAGS_DEBUG-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL
-CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_SHARED_LINKER_FLAGS_RELEASE
-CMAKE_SHARED_LINKER_FLAGS_RELEASE-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO
-CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_SKIP_RPATH
-CMAKE_SKIP_RPATH-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_STRIP
-CMAKE_STRIP-ADVANCED:INTERNAL=1
-//uname command
-CMAKE_UNAME:INTERNAL=/bin/uname
-//ADVANCED property for variable: CMAKE_USE_RELATIVE_PATHS
-CMAKE_USE_RELATIVE_PATHS-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_VERBOSE_MAKEFILE
-CMAKE_VERBOSE_MAKEFILE-ADVANCED:INTERNAL=1
-
diff --git a/chipmunk/CMakeFiles/CMakeCCompiler.cmake b/chipmunk/CMakeFiles/CMakeCCompiler.cmake
deleted file mode 100644
index 7b5998e26a..0000000000
--- a/chipmunk/CMakeFiles/CMakeCCompiler.cmake
+++ /dev/null
@@ -1,44 +0,0 @@
-SET(CMAKE_C_COMPILER "/usr/bin/gcc")
-SET(CMAKE_C_COMPILER_ARG1 "")
-SET(CMAKE_C_COMPILER_ID "GNU")
-SET(CMAKE_C_PLATFORM_ID "Linux")
-
-SET(CMAKE_AR "/usr/bin/ar")
-SET(CMAKE_RANLIB "/usr/bin/ranlib")
-SET(CMAKE_LINKER "/usr/bin/ld")
-SET(CMAKE_COMPILER_IS_GNUCC 1)
-SET(CMAKE_C_COMPILER_LOADED 1)
-SET(CMAKE_COMPILER_IS_MINGW )
-SET(CMAKE_COMPILER_IS_CYGWIN )
-IF(CMAKE_COMPILER_IS_CYGWIN)
-  SET(CYGWIN 1)
-  SET(UNIX 1)
-ENDIF(CMAKE_COMPILER_IS_CYGWIN)
-
-SET(CMAKE_C_COMPILER_ENV_VAR "CC")
-
-IF(CMAKE_COMPILER_IS_MINGW)
-  SET(MINGW 1)
-ENDIF(CMAKE_COMPILER_IS_MINGW)
-SET(CMAKE_C_COMPILER_ID_RUN 1)
-SET(CMAKE_C_SOURCE_FILE_EXTENSIONS c)
-SET(CMAKE_C_IGNORE_EXTENSIONS h;H;o;O;obj;OBJ;def;DEF;rc;RC)
-SET(CMAKE_C_LINKER_PREFERENCE 10)
-
-# Save compiler ABI information.
-SET(CMAKE_C_SIZEOF_DATA_PTR "4")
-SET(CMAKE_C_COMPILER_ABI "ELF")
-
-IF(CMAKE_C_SIZEOF_DATA_PTR)
-  SET(CMAKE_SIZEOF_VOID_P "${CMAKE_C_SIZEOF_DATA_PTR}")
-ENDIF(CMAKE_C_SIZEOF_DATA_PTR)
-
-IF(CMAKE_C_COMPILER_ABI)
-  SET(CMAKE_INTERNAL_PLATFORM_ABI "${CMAKE_C_COMPILER_ABI}")
-ENDIF(CMAKE_C_COMPILER_ABI)
-
-SET(CMAKE_C_HAS_ISYSROOT "")
-
-
-SET(CMAKE_C_IMPLICIT_LINK_LIBRARIES "c")
-SET(CMAKE_C_IMPLICIT_LINK_DIRECTORIES "/usr/lib/gcc/i486-linux-gnu/4.4.3;/usr/lib;/lib;/usr/lib/i486-linux-gnu")
diff --git a/chipmunk/CMakeFiles/CMakeCXXCompiler.cmake b/chipmunk/CMakeFiles/CMakeCXXCompiler.cmake
deleted file mode 100644
index 6d65d1cc97..0000000000
--- a/chipmunk/CMakeFiles/CMakeCXXCompiler.cmake
+++ /dev/null
@@ -1,45 +0,0 @@
-SET(CMAKE_CXX_COMPILER "/usr/bin/c++")
-SET(CMAKE_CXX_COMPILER_ARG1 "")
-SET(CMAKE_CXX_COMPILER_ID "GNU")
-SET(CMAKE_CXX_PLATFORM_ID "Linux")
-
-SET(CMAKE_AR "/usr/bin/ar")
-SET(CMAKE_RANLIB "/usr/bin/ranlib")
-SET(CMAKE_LINKER "/usr/bin/ld")
-SET(CMAKE_COMPILER_IS_GNUCXX 1)
-SET(CMAKE_CXX_COMPILER_LOADED 1)
-SET(CMAKE_COMPILER_IS_MINGW )
-SET(CMAKE_COMPILER_IS_CYGWIN )
-IF(CMAKE_COMPILER_IS_CYGWIN)
-  SET(CYGWIN 1)
-  SET(UNIX 1)
-ENDIF(CMAKE_COMPILER_IS_CYGWIN)
-
-SET(CMAKE_CXX_COMPILER_ENV_VAR "CXX")
-
-IF(CMAKE_COMPILER_IS_MINGW)
-  SET(MINGW 1)
-ENDIF(CMAKE_COMPILER_IS_MINGW)
-SET(CMAKE_CXX_COMPILER_ID_RUN 1)
-SET(CMAKE_CXX_IGNORE_EXTENSIONS inl;h;H;o;O;obj;OBJ;def;DEF;rc;RC)
-SET(CMAKE_CXX_SOURCE_FILE_EXTENSIONS C;M;c++;cc;cpp;cxx;m;mm)
-SET(CMAKE_CXX_LINKER_PREFERENCE 30)
-SET(CMAKE_CXX_LINKER_PREFERENCE_PROPAGATES 1)
-
-# Save compiler ABI information.
-SET(CMAKE_CXX_SIZEOF_DATA_PTR "4")
-SET(CMAKE_CXX_COMPILER_ABI "ELF")
-
-IF(CMAKE_CXX_SIZEOF_DATA_PTR)
-  SET(CMAKE_SIZEOF_VOID_P "${CMAKE_CXX_SIZEOF_DATA_PTR}")
-ENDIF(CMAKE_CXX_SIZEOF_DATA_PTR)
-
-IF(CMAKE_CXX_COMPILER_ABI)
-  SET(CMAKE_INTERNAL_PLATFORM_ABI "${CMAKE_CXX_COMPILER_ABI}")
-ENDIF(CMAKE_CXX_COMPILER_ABI)
-
-SET(CMAKE_CXX_HAS_ISYSROOT "")
-
-
-SET(CMAKE_CXX_IMPLICIT_LINK_LIBRARIES "stdc++;m;c")
-SET(CMAKE_CXX_IMPLICIT_LINK_DIRECTORIES "/usr/lib/gcc/i486-linux-gnu/4.4.3;/usr/lib;/lib;/usr/lib/i486-linux-gnu")
diff --git a/chipmunk/CMakeFiles/CMakeDetermineCompilerABI_C.bin b/chipmunk/CMakeFiles/CMakeDetermineCompilerABI_C.bin
deleted file mode 100755
index 7e0d0e9044..0000000000
Binary files a/chipmunk/CMakeFiles/CMakeDetermineCompilerABI_C.bin and /dev/null differ
diff --git a/chipmunk/CMakeFiles/CMakeDetermineCompilerABI_CXX.bin b/chipmunk/CMakeFiles/CMakeDetermineCompilerABI_CXX.bin
deleted file mode 100755
index 4f4e3ebde5..0000000000
Binary files a/chipmunk/CMakeFiles/CMakeDetermineCompilerABI_CXX.bin and /dev/null differ
diff --git a/chipmunk/CMakeFiles/CMakeDirectoryInformation.cmake b/chipmunk/CMakeFiles/CMakeDirectoryInformation.cmake
deleted file mode 100644
index 1abec71c2e..0000000000
--- a/chipmunk/CMakeFiles/CMakeDirectoryInformation.cmake
+++ /dev/null
@@ -1,21 +0,0 @@
-# CMAKE generated file: DO NOT EDIT!
-# Generated by "Unix Makefiles" Generator, CMake Version 2.8
-
-# Relative path conversion top directories.
-SET(CMAKE_RELATIVE_PATH_TOP_SOURCE "/home/laschweinski/git/cocos2d-x/chipmunk")
-SET(CMAKE_RELATIVE_PATH_TOP_BINARY "/home/laschweinski/git/cocos2d-x/chipmunk")
-
-# Force unix paths in dependencies.
-SET(CMAKE_FORCE_UNIX_PATHS 1)
-
-# The C and CXX include file search paths:
-SET(CMAKE_C_INCLUDE_PATH
-  )
-SET(CMAKE_CXX_INCLUDE_PATH ${CMAKE_C_INCLUDE_PATH})
-SET(CMAKE_Fortran_INCLUDE_PATH ${CMAKE_C_INCLUDE_PATH})
-
-# The C and CXX include file regular expressions for this directory.
-SET(CMAKE_C_INCLUDE_REGEX_SCAN "^.*$")
-SET(CMAKE_C_INCLUDE_REGEX_COMPLAIN "^$")
-SET(CMAKE_CXX_INCLUDE_REGEX_SCAN ${CMAKE_C_INCLUDE_REGEX_SCAN})
-SET(CMAKE_CXX_INCLUDE_REGEX_COMPLAIN ${CMAKE_C_INCLUDE_REGEX_COMPLAIN})
diff --git a/chipmunk/CMakeFiles/CMakeSystem.cmake b/chipmunk/CMakeFiles/CMakeSystem.cmake
deleted file mode 100644
index 310a96e7ff..0000000000
--- a/chipmunk/CMakeFiles/CMakeSystem.cmake
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-SET(CMAKE_SYSTEM "Linux-2.6.32-21-generic")
-SET(CMAKE_SYSTEM_NAME "Linux")
-SET(CMAKE_SYSTEM_VERSION "2.6.32-21-generic")
-SET(CMAKE_SYSTEM_PROCESSOR "i686")
-
-SET(CMAKE_HOST_SYSTEM "Linux-2.6.32-21-generic")
-SET(CMAKE_HOST_SYSTEM_NAME "Linux")
-SET(CMAKE_HOST_SYSTEM_VERSION "2.6.32-21-generic")
-SET(CMAKE_HOST_SYSTEM_PROCESSOR "i686")
-
-SET(CMAKE_CROSSCOMPILING "FALSE")
-
-SET(CMAKE_SYSTEM_LOADED 1)
diff --git a/chipmunk/CMakeFiles/CompilerIdC/CMakeCCompilerId.c b/chipmunk/CMakeFiles/CompilerIdC/CMakeCCompilerId.c
deleted file mode 100644
index 4da3198a26..0000000000
--- a/chipmunk/CMakeFiles/CompilerIdC/CMakeCCompilerId.c
+++ /dev/null
@@ -1,217 +0,0 @@
-#ifdef __cplusplus
-# error "A C++ compiler has been selected for C."
-#endif
-
-#if defined(__18CXX)
-# define ID_VOID_MAIN
-#endif
-
-#if defined(__INTEL_COMPILER) || defined(__ICC)
-# define COMPILER_ID "Intel"
-
-#elif defined(__BORLANDC__)
-# define COMPILER_ID "Borland"
-
-#elif defined(__WATCOMC__)
-# define COMPILER_ID "Watcom"
-
-#elif defined(__SUNPRO_C)
-# define COMPILER_ID "SunPro"
-
-#elif defined(__HP_cc)
-# define COMPILER_ID "HP"
-
-#elif defined(__DECC)
-# define COMPILER_ID "Compaq"
-
-#elif defined(__IBMC__)
-# if defined(__COMPILER_VER__)
-#  define COMPILER_ID "zOS"
-# elif __IBMC__ >= 800
-#  define COMPILER_ID "XL"
-# else
-#  define COMPILER_ID "VisualAge"
-# endif
-
-#elif defined(__PGI)
-# define COMPILER_ID "PGI"
-
-#elif defined(__PATHSCALE__)
-# define COMPILER_ID "PathScale"
-
-#elif defined(__GNUC__)
-# define COMPILER_ID "GNU"
-
-#elif defined(_MSC_VER)
-# define COMPILER_ID "MSVC"
-
-#elif defined(__ADSPBLACKFIN__) || defined(__ADSPTS__) || defined(__ADSP21000__)
-/* Analog Devices C++ compiler for Blackfin, TigerSHARC and
-   SHARC (21000) DSPs */
-# define COMPILER_ID "ADSP"
-
-/* IAR Systems compiler for embedded systems.
-   http://www.iar.com
-   Not supported yet by CMake
-#elif defined(__IAR_SYSTEMS_ICC__)
-# define COMPILER_ID "IAR" */
-
-/* sdcc, the small devices C compiler for embedded systems,
-   http://sdcc.sourceforge.net  */
-#elif defined(SDCC)
-# define COMPILER_ID "SDCC"
-
-#elif defined(_SGI_COMPILER_VERSION) || defined(_COMPILER_VERSION)
-# define COMPILER_ID "MIPSpro"
-
-/* This compiler is either not known or is too old to define an
-   identification macro.  Try to identify the platform and guess that
-   it is the native compiler.  */
-#elif defined(__sgi)
-# define COMPILER_ID "MIPSpro"
-
-#elif defined(__hpux) || defined(__hpua)
-# define COMPILER_ID "HP"
-
-#else /* unknown compiler */
-# define COMPILER_ID ""
-
-#endif
-
-/* Construct the string literal in pieces to prevent the source from
-   getting matched.  Store it in a pointer rather than an array
-   because some compilers will just produce instructions to fill the
-   array rather than assigning a pointer to a static array.  */
-char* info_compiler = "INFO" ":" "compiler[" COMPILER_ID "]";
-
-/* Identify known platforms by name.  */
-#if defined(__linux) || defined(__linux__) || defined(linux)
-# define PLATFORM_ID "Linux"
-
-#elif defined(__CYGWIN__)
-# define PLATFORM_ID "Cygwin"
-
-#elif defined(__MINGW32__)
-# define PLATFORM_ID "MinGW"
-
-#elif defined(__APPLE__)
-# define PLATFORM_ID "Darwin"
-
-#elif defined(_WIN32) || defined(__WIN32__) || defined(WIN32)
-# define PLATFORM_ID "Windows"
-
-#elif defined(__FreeBSD__) || defined(__FreeBSD)
-# define PLATFORM_ID "FreeBSD"
-
-#elif defined(__NetBSD__) || defined(__NetBSD)
-# define PLATFORM_ID "NetBSD"
-
-#elif defined(__OpenBSD__) || defined(__OPENBSD)
-# define PLATFORM_ID "OpenBSD"
-
-#elif defined(__sun) || defined(sun)
-# define PLATFORM_ID "SunOS"
-
-#elif defined(_AIX) || defined(__AIX) || defined(__AIX__) || defined(__aix) || defined(__aix__)
-# define PLATFORM_ID "AIX"
-
-#elif defined(__sgi) || defined(__sgi__) || defined(_SGI)
-# define PLATFORM_ID "IRIX"
-
-#elif defined(__hpux) || defined(__hpux__)
-# define PLATFORM_ID "HP-UX"
-
-#elif defined(__HAIKU) || defined(__HAIKU__) || defined(_HAIKU)
-# define PLATFORM_ID "Haiku"
-/* Haiku also defines __BEOS__ so we must 
-   put it prior to the check for __BEOS__
-*/
-
-#elif defined(__BeOS) || defined(__BEOS__) || defined(_BEOS)
-# define PLATFORM_ID "BeOS"
-
-#elif defined(__QNX__) || defined(__QNXNTO__)
-# define PLATFORM_ID "QNX"
-
-#elif defined(__tru64) || defined(_tru64) || defined(__TRU64__)
-# define PLATFORM_ID "Tru64"
-
-#elif defined(__riscos) || defined(__riscos__)
-# define PLATFORM_ID "RISCos"
-
-#elif defined(__sinix) || defined(__sinix__) || defined(__SINIX__)
-# define PLATFORM_ID "SINIX"
-
-#elif defined(__UNIX_SV__)
-# define PLATFORM_ID "UNIX_SV"
-
-#elif defined(__bsdos__)
-# define PLATFORM_ID "BSDOS"
-
-#elif defined(_MPRAS) || defined(MPRAS)
-# define PLATFORM_ID "MP-RAS"
-
-#elif defined(__osf) || defined(__osf__)
-# define PLATFORM_ID "OSF1"
-
-#elif defined(_SCO_SV) || defined(SCO_SV) || defined(sco_sv)
-# define PLATFORM_ID "SCO_SV"
-
-#elif defined(__ultrix) || defined(__ultrix__) || defined(_ULTRIX)
-# define PLATFORM_ID "ULTRIX"
-
-#elif defined(__XENIX__) || defined(_XENIX) || defined(XENIX)
-# define PLATFORM_ID "Xenix"
-
-#else /* unknown platform */
-# define PLATFORM_ID ""
-
-#endif
-
-/* For windows compilers MSVC and Intel we can determine
-   the architecture of the compiler being used.  This is becase
-   the compilers do not have flags that can change the architecture,
-   but rather depend on which compiler is being used
-*/
-#if defined(_WIN32) && defined(_MSC_VER)
-# if defined(_M_IA64)
-#  define ARCHITECTURE_ID "IA64"
-
-# elif defined(_M_X64) || defined(_M_AMD64)
-#  define ARCHITECTURE_ID "x64" 
-
-# elif defined(_M_IX86)
-#  define ARCHITECTURE_ID "X86"
-
-# else /* unknown architecture */
-#  define ARCHITECTURE_ID ""
-# endif
-
-#else
-#  define ARCHITECTURE_ID ""
-#endif
-
-/* Construct the string literal in pieces to prevent the source from
-   getting matched.  Store it in a pointer rather than an array
-   because some compilers will just produce instructions to fill the
-   array rather than assigning a pointer to a static array.  */
-char* info_platform = "INFO" ":" "platform[" PLATFORM_ID "]";
-char* info_arch = "INFO" ":" "arch[" ARCHITECTURE_ID "]";
-
-
-
-/*--------------------------------------------------------------------------*/
-
-#ifdef ID_VOID_MAIN
-void main() {}
-#else
-int main(int argc, char* argv[])
-{
-  int require = 0;
-  require += info_compiler[argc];
-  require += info_platform[argc];
-  require += info_arch[argc];
-  (void)argv;
-  return require;
-}
-#endif
diff --git a/chipmunk/CMakeFiles/CompilerIdCXX/CMakeCXXCompilerId.cpp b/chipmunk/CMakeFiles/CompilerIdCXX/CMakeCXXCompilerId.cpp
deleted file mode 100644
index 2d16102299..0000000000
--- a/chipmunk/CMakeFiles/CompilerIdCXX/CMakeCXXCompilerId.cpp
+++ /dev/null
@@ -1,203 +0,0 @@
-/* This source file must have a .cpp extension so that all C++ compilers
-   recognize the extension without flags.  Borland does not know .cxx for
-   example.  */
-#ifndef __cplusplus
-# error "A C compiler has been selected for C++."
-#endif
-
-#if defined(__COMO__)
-# define COMPILER_ID "Comeau"
-
-#elif defined(__INTEL_COMPILER) || defined(__ICC)
-# define COMPILER_ID "Intel"
-
-#elif defined(__BORLANDC__)
-# define COMPILER_ID "Borland"
-
-#elif defined(__WATCOMC__)
-# define COMPILER_ID "Watcom"
-
-#elif defined(__SUNPRO_CC)
-# define COMPILER_ID "SunPro"
-
-#elif defined(__HP_aCC)
-# define COMPILER_ID "HP"
-
-#elif defined(__DECCXX)
-# define COMPILER_ID "Compaq"
-
-#elif defined(__IBMCPP__)
-# if defined(__COMPILER_VER__)
-#  define COMPILER_ID "zOS"
-# elif __IBMCPP__ >= 800
-#  define COMPILER_ID "XL"
-# else
-#  define COMPILER_ID "VisualAge"
-# endif
-
-#elif defined(__PGI)
-# define COMPILER_ID "PGI"
-
-#elif defined(__PATHSCALE__)
-# define COMPILER_ID "PathScale"
-
-#elif defined(__GNUC__)
-# define COMPILER_ID "GNU"
-
-#elif defined(_MSC_VER)
-# define COMPILER_ID "MSVC"
-
-#elif defined(__ADSPBLACKFIN__) || defined(__ADSPTS__) || defined(__ADSP21000__)
-/* Analog Devices C++ compiler for Blackfin, TigerSHARC and
-   SHARC (21000) DSPs */
-# define COMPILER_ID "ADSP"
-
-#elif defined(_SGI_COMPILER_VERSION) || defined(_COMPILER_VERSION)
-# define COMPILER_ID "MIPSpro"
-
-/* This compiler is either not known or is too old to define an
-   identification macro.  Try to identify the platform and guess that
-   it is the native compiler.  */
-#elif defined(__sgi)
-# define COMPILER_ID "MIPSpro"
-
-#elif defined(__hpux) || defined(__hpua)
-# define COMPILER_ID "HP"
-
-#else /* unknown compiler */
-# define COMPILER_ID ""
-
-#endif
-
-/* Construct the string literal in pieces to prevent the source from
-   getting matched.  Store it in a pointer rather than an array
-   because some compilers will just produce instructions to fill the
-   array rather than assigning a pointer to a static array.  */
-char* info_compiler = "INFO" ":" "compiler[" COMPILER_ID "]";
-
-/* Identify known platforms by name.  */
-#if defined(__linux) || defined(__linux__) || defined(linux)
-# define PLATFORM_ID "Linux"
-
-#elif defined(__CYGWIN__)
-# define PLATFORM_ID "Cygwin"
-
-#elif defined(__MINGW32__)
-# define PLATFORM_ID "MinGW"
-
-#elif defined(__APPLE__)
-# define PLATFORM_ID "Darwin"
-
-#elif defined(_WIN32) || defined(__WIN32__) || defined(WIN32)
-# define PLATFORM_ID "Windows"
-
-#elif defined(__FreeBSD__) || defined(__FreeBSD)
-# define PLATFORM_ID "FreeBSD"
-
-#elif defined(__NetBSD__) || defined(__NetBSD)
-# define PLATFORM_ID "NetBSD"
-
-#elif defined(__OpenBSD__) || defined(__OPENBSD)
-# define PLATFORM_ID "OpenBSD"
-
-#elif defined(__sun) || defined(sun)
-# define PLATFORM_ID "SunOS"
-
-#elif defined(_AIX) || defined(__AIX) || defined(__AIX__) || defined(__aix) || defined(__aix__)
-# define PLATFORM_ID "AIX"
-
-#elif defined(__sgi) || defined(__sgi__) || defined(_SGI)
-# define PLATFORM_ID "IRIX"
-
-#elif defined(__hpux) || defined(__hpux__)
-# define PLATFORM_ID "HP-UX"
-
-#elif defined(__HAIKU) || defined(__HAIKU__) || defined(_HAIKU)
-# define PLATFORM_ID "Haiku"
-/* Haiku also defines __BEOS__ so we must 
-   put it prior to the check for __BEOS__
-*/
-
-#elif defined(__BeOS) || defined(__BEOS__) || defined(_BEOS)
-# define PLATFORM_ID "BeOS"
-
-#elif defined(__QNX__) || defined(__QNXNTO__)
-# define PLATFORM_ID "QNX"
-
-#elif defined(__tru64) || defined(_tru64) || defined(__TRU64__)
-# define PLATFORM_ID "Tru64"
-
-#elif defined(__riscos) || defined(__riscos__)
-# define PLATFORM_ID "RISCos"
-
-#elif defined(__sinix) || defined(__sinix__) || defined(__SINIX__)
-# define PLATFORM_ID "SINIX"
-
-#elif defined(__UNIX_SV__)
-# define PLATFORM_ID "UNIX_SV"
-
-#elif defined(__bsdos__)
-# define PLATFORM_ID "BSDOS"
-
-#elif defined(_MPRAS) || defined(MPRAS)
-# define PLATFORM_ID "MP-RAS"
-
-#elif defined(__osf) || defined(__osf__)
-# define PLATFORM_ID "OSF1"
-
-#elif defined(_SCO_SV) || defined(SCO_SV) || defined(sco_sv)
-# define PLATFORM_ID "SCO_SV"
-
-#elif defined(__ultrix) || defined(__ultrix__) || defined(_ULTRIX)
-# define PLATFORM_ID "ULTRIX"
-
-#elif defined(__XENIX__) || defined(_XENIX) || defined(XENIX)
-# define PLATFORM_ID "Xenix"
-
-#else /* unknown platform */
-# define PLATFORM_ID ""
-
-#endif
-
-/* For windows compilers MSVC and Intel we can determine
-   the architecture of the compiler being used.  This is becase
-   the compilers do not have flags that can change the architecture,
-   but rather depend on which compiler is being used
-*/
-#if defined(_WIN32) && defined(_MSC_VER)
-# if defined(_M_IA64)
-#  define ARCHITECTURE_ID "IA64"
-
-# elif defined(_M_X64) || defined(_M_AMD64)
-#  define ARCHITECTURE_ID "x64" 
-
-# elif defined(_M_IX86)
-#  define ARCHITECTURE_ID "X86"
-
-# else /* unknown architecture */
-#  define ARCHITECTURE_ID ""
-# endif
-
-#else
-#  define ARCHITECTURE_ID ""
-#endif
-
-/* Construct the string literal in pieces to prevent the source from
-   getting matched.  Store it in a pointer rather than an array
-   because some compilers will just produce instructions to fill the
-   array rather than assigning a pointer to a static array.  */
-char* info_platform = "INFO" ":" "platform[" PLATFORM_ID "]";
-char* info_arch = "INFO" ":" "arch[" ARCHITECTURE_ID "]";
-
-
-
-/*--------------------------------------------------------------------------*/
-
-int main(int argc, char* argv[])
-{
-  int require = 0;
-  require += info_compiler[argc];
-  require += info_platform[argc];
-  (void)argv;
-  return require;
-}
diff --git a/chipmunk/CMakeFiles/Makefile.cmake b/chipmunk/CMakeFiles/Makefile.cmake
deleted file mode 100644
index fd6fdfbb51..0000000000
--- a/chipmunk/CMakeFiles/Makefile.cmake
+++ /dev/null
@@ -1,46 +0,0 @@
-# CMAKE generated file: DO NOT EDIT!
-# Generated by "Unix Makefiles" Generator, CMake Version 2.8
-
-# The generator used is:
-SET(CMAKE_DEPENDS_GENERATOR "Unix Makefiles")
-
-# The top level Makefile was generated from the following files:
-SET(CMAKE_MAKEFILE_DEPENDS
-  "CMakeCache.txt"
-  "CMakeFiles/CMakeCCompiler.cmake"
-  "CMakeFiles/CMakeCXXCompiler.cmake"
-  "CMakeFiles/CMakeSystem.cmake"
-  "CMakeLists.txt"
-  "src/CMakeLists.txt"
-  "/usr/share/cmake-2.8/Modules/CMakeCInformation.cmake"
-  "/usr/share/cmake-2.8/Modules/CMakeCXXInformation.cmake"
-  "/usr/share/cmake-2.8/Modules/CMakeCommonLanguageInclude.cmake"
-  "/usr/share/cmake-2.8/Modules/CMakeGenericSystem.cmake"
-  "/usr/share/cmake-2.8/Modules/CMakeSystemSpecificInformation.cmake"
-  "/usr/share/cmake-2.8/Modules/Compiler/GNU-C.cmake"
-  "/usr/share/cmake-2.8/Modules/Compiler/GNU-CXX.cmake"
-  "/usr/share/cmake-2.8/Modules/Compiler/GNU.cmake"
-  "/usr/share/cmake-2.8/Modules/Platform/Linux-GNU-C.cmake"
-  "/usr/share/cmake-2.8/Modules/Platform/Linux-GNU-CXX.cmake"
-  "/usr/share/cmake-2.8/Modules/Platform/Linux-GNU.cmake"
-  "/usr/share/cmake-2.8/Modules/Platform/Linux.cmake"
-  "/usr/share/cmake-2.8/Modules/Platform/UnixPaths.cmake"
-  )
-
-# The corresponding makefile is:
-SET(CMAKE_MAKEFILE_OUTPUTS
-  "Makefile"
-  "CMakeFiles/cmake.check_cache"
-  )
-
-# Byproducts of CMake generate step:
-SET(CMAKE_MAKEFILE_PRODUCTS
-  "CMakeFiles/CMakeDirectoryInformation.cmake"
-  "src/CMakeFiles/CMakeDirectoryInformation.cmake"
-  )
-
-# Dependency information for all targets:
-SET(CMAKE_DEPEND_INFO_FILES
-  "src/CMakeFiles/chipmunk.dir/DependInfo.cmake"
-  "src/CMakeFiles/chipmunk_static.dir/DependInfo.cmake"
-  )
diff --git a/chipmunk/CMakeFiles/TargetDirectories.txt b/chipmunk/CMakeFiles/TargetDirectories.txt
deleted file mode 100644
index 8a69dfaca9..0000000000
--- a/chipmunk/CMakeFiles/TargetDirectories.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-/home/laschweinski/git/cocos2d-x/chipmunk/src/CMakeFiles/chipmunk.dir
-/home/laschweinski/git/cocos2d-x/chipmunk/src/CMakeFiles/chipmunk_static.dir
diff --git a/chipmunk/CMakeFiles/cmake.check_cache b/chipmunk/CMakeFiles/cmake.check_cache
deleted file mode 100644
index 3dccd73172..0000000000
--- a/chipmunk/CMakeFiles/cmake.check_cache
+++ /dev/null
@@ -1 +0,0 @@
-# This file is generated by cmake for dependency checking of the CMakeCache.txt file
diff --git a/chipmunk/CMakeFiles/progress.marks b/chipmunk/CMakeFiles/progress.marks
deleted file mode 100644
index 0691f67b20..0000000000
--- a/chipmunk/CMakeFiles/progress.marks
+++ /dev/null
@@ -1 +0,0 @@
-52
diff --git a/chipmunk/CMakeLists.txt b/chipmunk/CMakeLists.txt
deleted file mode 100644
index 2f964701bb..0000000000
--- a/chipmunk/CMakeLists.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-cmake_minimum_required(VERSION 2.6)
-cmake_policy(SET CMP0001 NEW) # don't use MAKE_BACKWARDS_COMPATIBILITY but policies instead
-
-project(chipmunk)
-
-# to change the prefix, run cmake with the parameter:
-#   -D CMAKE_INSTALL_PREFIX=/my/prefix
-
-# to change the build type, run cmake with the parameter:
-#   -D CMAKE_BUILD_TYPE=<build-type>
-# run "cmake --help-variable CMAKE_BUILD_TYPE" for details
-set(CMAKE_BUILD_TYPE Release)
-
-# other options for the build, you can i.e. activate the ruby bindings by passing
-#   -D BUILD_RUBY_EXT=ON
-# to cmake. Other options analog
-option(BUILD_SHARED "Build and install the shared library" ON)
-option(BUILD_STATIC "Build as static library" ON)
-option(INSTALL_STATIC "Install the static library" ON)
-
-
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99") # allways use gnu99
-set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -ffast-math") # extend release-profile with fast-math
-set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wall") # extend debug-profile with -Wall
-
-add_subdirectory(src)
-
diff --git a/chipmunk/Makefile b/chipmunk/Makefile
deleted file mode 100644
index 767216e2fc..0000000000
--- a/chipmunk/Makefile
+++ /dev/null
@@ -1,195 +0,0 @@
-# CMAKE generated file: DO NOT EDIT!
-# Generated by "Unix Makefiles" Generator, CMake Version 2.8
-
-# Default target executed when no arguments are given to make.
-default_target: all
-.PHONY : default_target
-
-#=============================================================================
-# Special targets provided by cmake.
-
-# Disable implicit rules so canoncical targets will work.
-.SUFFIXES:
-
-# Remove some rules from gmake that .SUFFIXES does not remove.
-SUFFIXES =
-
-.SUFFIXES: .hpux_make_needs_suffix_list
-
-# Suppress display of executed commands.
-$(VERBOSE).SILENT:
-
-# A target that is always out of date.
-cmake_force:
-.PHONY : cmake_force
-
-#=============================================================================
-# Set environment variables for the build.
-
-# The shell in which to execute make rules.
-SHELL = /bin/sh
-
-# The CMake executable.
-CMAKE_COMMAND = /usr/bin/cmake
-
-# The command to remove a file.
-RM = /usr/bin/cmake -E remove -f
-
-# The program to use to edit the cache.
-CMAKE_EDIT_COMMAND = /usr/bin/cmake-gui
-
-# The top-level source directory on which CMake was run.
-CMAKE_SOURCE_DIR = /home/laschweinski/git/cocos2d-x/chipmunk
-
-# The top-level build directory on which CMake was run.
-CMAKE_BINARY_DIR = /home/laschweinski/git/cocos2d-x/chipmunk
-
-#=============================================================================
-# Targets provided globally by CMake.
-
-# Special rule for the target edit_cache
-edit_cache:
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake cache editor..."
-	/usr/bin/cmake-gui -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
-.PHONY : edit_cache
-
-# Special rule for the target edit_cache
-edit_cache/fast: edit_cache
-.PHONY : edit_cache/fast
-
-# Special rule for the target install
-install: preinstall
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
-	/usr/bin/cmake -P cmake_install.cmake
-.PHONY : install
-
-# Special rule for the target install
-install/fast: preinstall/fast
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
-	/usr/bin/cmake -P cmake_install.cmake
-.PHONY : install/fast
-
-# Special rule for the target install/local
-install/local: preinstall
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing only the local directory..."
-	/usr/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
-.PHONY : install/local
-
-# Special rule for the target install/local
-install/local/fast: install/local
-.PHONY : install/local/fast
-
-# Special rule for the target install/strip
-install/strip: preinstall
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing the project stripped..."
-	/usr/bin/cmake -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake
-.PHONY : install/strip
-
-# Special rule for the target install/strip
-install/strip/fast: install/strip
-.PHONY : install/strip/fast
-
-# Special rule for the target list_install_components
-list_install_components:
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Available install components are: \"Unspecified\""
-.PHONY : list_install_components
-
-# Special rule for the target list_install_components
-list_install_components/fast: list_install_components
-.PHONY : list_install_components/fast
-
-# Special rule for the target rebuild_cache
-rebuild_cache:
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."
-	/usr/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
-.PHONY : rebuild_cache
-
-# Special rule for the target rebuild_cache
-rebuild_cache/fast: rebuild_cache
-.PHONY : rebuild_cache/fast
-
-# The main all target
-all: cmake_check_build_system
-	$(CMAKE_COMMAND) -E cmake_progress_start /home/laschweinski/git/cocos2d-x/chipmunk/CMakeFiles /home/laschweinski/git/cocos2d-x/chipmunk/CMakeFiles/progress.marks
-	$(MAKE) -f CMakeFiles/Makefile2 all
-	$(CMAKE_COMMAND) -E cmake_progress_start /home/laschweinski/git/cocos2d-x/chipmunk/CMakeFiles 0
-.PHONY : all
-
-# The main clean target
-clean:
-	$(MAKE) -f CMakeFiles/Makefile2 clean
-.PHONY : clean
-
-# The main clean target
-clean/fast: clean
-.PHONY : clean/fast
-
-# Prepare targets for installation.
-preinstall: all
-	$(MAKE) -f CMakeFiles/Makefile2 preinstall
-.PHONY : preinstall
-
-# Prepare targets for installation.
-preinstall/fast:
-	$(MAKE) -f CMakeFiles/Makefile2 preinstall
-.PHONY : preinstall/fast
-
-# clear depends
-depend:
-	$(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
-.PHONY : depend
-
-#=============================================================================
-# Target rules for targets named chipmunk
-
-# Build rule for target.
-chipmunk: cmake_check_build_system
-	$(MAKE) -f CMakeFiles/Makefile2 chipmunk
-.PHONY : chipmunk
-
-# fast build rule for target.
-chipmunk/fast:
-	$(MAKE) -f src/CMakeFiles/chipmunk.dir/build.make src/CMakeFiles/chipmunk.dir/build
-.PHONY : chipmunk/fast
-
-#=============================================================================
-# Target rules for targets named chipmunk_static
-
-# Build rule for target.
-chipmunk_static: cmake_check_build_system
-	$(MAKE) -f CMakeFiles/Makefile2 chipmunk_static
-.PHONY : chipmunk_static
-
-# fast build rule for target.
-chipmunk_static/fast:
-	$(MAKE) -f src/CMakeFiles/chipmunk_static.dir/build.make src/CMakeFiles/chipmunk_static.dir/build
-.PHONY : chipmunk_static/fast
-
-# Help Target
-help:
-	@echo "The following are some of the valid targets for this Makefile:"
-	@echo "... all (the default if no target is provided)"
-	@echo "... clean"
-	@echo "... depend"
-	@echo "... edit_cache"
-	@echo "... install"
-	@echo "... install/local"
-	@echo "... install/strip"
-	@echo "... list_install_components"
-	@echo "... rebuild_cache"
-	@echo "... chipmunk"
-	@echo "... chipmunk_static"
-.PHONY : help
-
-
-
-#=============================================================================
-# Special targets to cleanup operation of make.
-
-# Special rule to run CMake to check the build system integrity.
-# No rule that depends on this can have commands that come from listfiles
-# because they might be regenerated.
-cmake_check_build_system:
-	$(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
-.PHONY : cmake_check_build_system
-
diff --git a/chipmunk/cmake_install.cmake b/chipmunk/cmake_install.cmake
deleted file mode 100644
index 809dd40d49..0000000000
--- a/chipmunk/cmake_install.cmake
+++ /dev/null
@@ -1,50 +0,0 @@
-# Install script for directory: /home/laschweinski/git/cocos2d-x/chipmunk
-
-# Set the install prefix
-IF(NOT DEFINED CMAKE_INSTALL_PREFIX)
-  SET(CMAKE_INSTALL_PREFIX "/usr/local")
-ENDIF(NOT DEFINED CMAKE_INSTALL_PREFIX)
-STRING(REGEX REPLACE "/$" "" CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}")
-
-# Set the install configuration name.
-IF(NOT DEFINED CMAKE_INSTALL_CONFIG_NAME)
-  IF(BUILD_TYPE)
-    STRING(REGEX REPLACE "^[^A-Za-z0-9_]+" ""
-           CMAKE_INSTALL_CONFIG_NAME "${BUILD_TYPE}")
-  ELSE(BUILD_TYPE)
-    SET(CMAKE_INSTALL_CONFIG_NAME "Release")
-  ENDIF(BUILD_TYPE)
-  MESSAGE(STATUS "Install configuration: \"${CMAKE_INSTALL_CONFIG_NAME}\"")
-ENDIF(NOT DEFINED CMAKE_INSTALL_CONFIG_NAME)
-
-# Set the component getting installed.
-IF(NOT CMAKE_INSTALL_COMPONENT)
-  IF(COMPONENT)
-    MESSAGE(STATUS "Install component: \"${COMPONENT}\"")
-    SET(CMAKE_INSTALL_COMPONENT "${COMPONENT}")
-  ELSE(COMPONENT)
-    SET(CMAKE_INSTALL_COMPONENT)
-  ENDIF(COMPONENT)
-ENDIF(NOT CMAKE_INSTALL_COMPONENT)
-
-# Install shared libraries without execute permission?
-IF(NOT DEFINED CMAKE_INSTALL_SO_NO_EXE)
-  SET(CMAKE_INSTALL_SO_NO_EXE "1")
-ENDIF(NOT DEFINED CMAKE_INSTALL_SO_NO_EXE)
-
-IF(NOT CMAKE_INSTALL_LOCAL_ONLY)
-  # Include the install script for each subdirectory.
-  INCLUDE("/home/laschweinski/git/cocos2d-x/chipmunk/src/cmake_install.cmake")
-
-ENDIF(NOT CMAKE_INSTALL_LOCAL_ONLY)
-
-IF(CMAKE_INSTALL_COMPONENT)
-  SET(CMAKE_INSTALL_MANIFEST "install_manifest_${CMAKE_INSTALL_COMPONENT}.txt")
-ELSE(CMAKE_INSTALL_COMPONENT)
-  SET(CMAKE_INSTALL_MANIFEST "install_manifest.txt")
-ENDIF(CMAKE_INSTALL_COMPONENT)
-
-FILE(WRITE "/home/laschweinski/git/cocos2d-x/chipmunk/${CMAKE_INSTALL_MANIFEST}" "")
-FOREACH(file ${CMAKE_INSTALL_MANIFEST_FILES})
-  FILE(APPEND "/home/laschweinski/git/cocos2d-x/chipmunk/${CMAKE_INSTALL_MANIFEST}" "${file}\n")
-ENDFOREACH(file)
diff --git a/chipmunk/lib/linux/libchipmunk.a.REMOVED.git-id b/chipmunk/lib/linux/libchipmunk.a.REMOVED.git-id
deleted file mode 100644
index 2ed4d402a5..0000000000
--- a/chipmunk/lib/linux/libchipmunk.a.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-6c804dd2e0af59d8022260167299ec8806a8629c
\ No newline at end of file
diff --git a/chipmunk/proj.linux/Makefile b/chipmunk/proj.linux/Makefile
new file mode 100644
index 0000000000..6ac7c29246
--- /dev/null
+++ b/chipmunk/proj.linux/Makefile
@@ -0,0 +1,53 @@
+CC      = gcc
+CXX     = g++
+AR      = ar
+TARGET	= libchipmunk.a
+CCFLAGS = -Wall -g -O2 -std=c99
+CXXFLAGS = -Wall -g -O2 
+ARFLAGS = cr
+
+INCLUDES = -I../include/chipmunk
+
+DEFINES = -DLINUX
+
+OBJECTS = ../src/chipmunk.o \
+../src/cpArbiter.o \
+../src/cpArray.o \
+../src/cpBB.o \
+../src/cpBody.o \
+../src/cpCollision.o \
+../src/cpHashSet.o \
+../src/cpPolyShape.o \
+../src/cpShape.o \
+../src/cpSpace.o \
+../src/cpSpaceComponent.o \
+../src/cpSpaceHash.o \
+../src/cpSpaceQuery.o \
+../src/cpSpaceStep.o \
+../src/cpVect.o \
+../src/constraints/cpConstraint.o \
+../src/constraints/cpDampedRotarySpring.o \
+../src/constraints/cpDampedSpring.o \
+../src/constraints/cpGearJoint.o \
+../src/constraints/cpGrooveJoint.o \
+../src/constraints/cpPinJoint.o \
+../src/constraints/cpPivotJoint.o \
+../src/constraints/cpRatchetJoint.o \
+../src/constraints/cpRotaryLimitJoint.o \
+../src/constraints/cpSimpleMotor.o \
+../src/constraints/cpSlideJoint.o 
+
+
+####### Build rules
+$(TARGET): $(OBJECTS) 
+	$(AR) $(ARFLAGS) $(TARGET) $(OBJECTS)  
+	
+####### Compile
+%.o: %.cpp
+	$(CXX) $(CXXFLAGS) $(INCLUDES) $(DEFINES) -c $< -o $@
+
+%.o: %.c
+	$(CC) $(CCFLAGS) $(INCLUDES) $(DEFINES) -c $< -o $@
+		
+clean: 
+	rm -f $(OBJECTS) $(TARGET) core
\ No newline at end of file
diff --git a/cocos2dx/proj.linux/Makefile b/cocos2dx/proj.linux/Makefile
new file mode 100644
index 0000000000..b307ba533e
--- /dev/null
+++ b/cocos2dx/proj.linux/Makefile
@@ -0,0 +1,132 @@
+CC      = gcc
+CXX     = g++
+TARGET	= libcocos2d.so
+CCFLAGS = -Wall -g -O2 
+CXXFLAGS = -Wall -g -O2 
+VISIBILITY = 
+
+INCLUDES = -I.. \
+					-I../platform/third_party/linux/libfreetype2 \
+					-I../include \
+					-I../platform \
+					-I../platform/third_party/linux/libpng \
+					-I../platform/third_party/linux/libxml2 \
+					-I../platform/third_party/linux/libjpeg 
+
+DEFINES = -DLINUX
+
+OBJECTS = ../actions/CCAction.o \
+					../actions/CCActionCamera.o \
+					../actions/CCActionEase.o \
+					../actions/CCActionGrid.o \
+					../actions/CCActionGrid3D.o \
+					../actions/CCActionInstant.o \
+					../actions/CCActionInterval.o \
+					../actions/CCActionManager.o \
+					../actions/CCActionPageTurn3D.o \
+					../actions/CCActionProgressTimer.o \
+					../actions/CCActionTiledGrid.o \
+					../base_nodes/CCAtlasNode.o \
+					../base_nodes/CCNode.o \
+					../cocoa/CCAffineTransform.o \
+					../cocoa/CCAutoreleasePool.o \
+					../cocoa/CCData.o \
+					../cocoa/CCGeometry.o \
+					../cocoa/CCNS.o \
+					../cocoa/CCObject.o \
+					../cocoa/CCSet.o \
+					../cocoa/CCZone.o \
+					../effects/CCGrabber.o \
+					../effects/CCGrid.o \
+					../keypad_dispatcher/CCKeypadDelegate.o \
+					../keypad_dispatcher/CCKeypadDispatcher.o \
+					../label_nodes/CCLabelAtlas.o \
+					../label_nodes/CCLabelBMFont.o \
+					../label_nodes/CCLabelTTF.o \
+					../layers_scenes_transitions_nodes/CCLayer.o \
+					../layers_scenes_transitions_nodes/CCScene.o \
+					../layers_scenes_transitions_nodes/CCTransition.o \
+					../layers_scenes_transitions_nodes/CCTransitionPageTurn.o \
+					../layers_scenes_transitions_nodes/CCTransitionRadial.o \
+					../menu_nodes/CCMenu.o \
+					../menu_nodes/CCMenuItem.o \
+					../misc_nodes/CCMotionStreak.o \
+					../misc_nodes/CCProgressTimer.o \
+					../misc_nodes/CCRenderTexture.o \
+					../misc_nodes/CCRibbon.o \
+					../particle_nodes/CCParticleExamples.o \
+					../particle_nodes/CCParticleSystem.o \
+					../particle_nodes/CCParticleSystemQuad.o \
+					../platform/CCCommon.o \
+					../platform/CCFileUtils.o \
+					../platform/CCGL.o \
+					../platform/CCImage.o \
+					../platform/CCSAXParser.o \
+					../platform/CCStdC.o \
+					../platform/CCThread.o \
+					../platform/platform.o \
+					../platform/Linux/CCAplication_linux.o \
+					../platform/Linux/CCEGLView_linux.o \
+					../platform/Linux/CCFileUtils_Linux.o \
+					../platform/Linux/CCImage_Linux.o \
+					../script_support/CCScriptSupport.o \
+					../sprite_nodes/CCAnimation.o \
+					../sprite_nodes/CCAnimationCache.o \
+					../sprite_nodes/CCSprite.o \
+					../sprite_nodes/CCSpriteBatchNode.o \
+					../sprite_nodes/CCSpriteFrame.o \
+					../sprite_nodes/CCSpriteFrameCache.o \
+					../support/CCArray.o \
+					../support/CCPointExtension.o \
+					../support/CCProfiling.o \
+					../support/CCUserDefault.o \
+					../support/TransformUtils.o \
+					../support/base64.o \
+					../support/ccUtils.o \
+					../support/image_support/TGAlib.o \
+					../support/zip_support/ZipUtils.o \
+					../support/zip_support/ioapi.o \
+					../support/zip_support/unzip.o \
+					../text_input_node/CCIMEDispatcher.o \
+					../text_input_node/CCTextFieldTTF.o \
+					../textures/CCTexture2D.o \
+					../textures/CCTextureAtlas.o \
+					../textures/CCTextureCache.o \
+					../textures/CCTexturePVR.o \
+					../tileMap_parallax_nodes/CCParallaxNode.o \
+					../tileMap_parallax_nodes/CCTMXLayer.o \
+					../tileMap_parallax_nodes/CCTMXObjectGroup.o \
+					../tileMap_parallax_nodes/CCTMXTiledMap.o \
+					../tileMap_parallax_nodes/CCTMXXMLParser.o \
+					../tileMap_parallax_nodes/CCTileMapAtlas.o \
+					../touch_dispatcher/CCTouchDispatcher.o \
+					../touch_dispatcher/CCTouchHandler.o \
+					../CCCamera.o \
+					../CCConfiguration.o \
+					../CCDirector.o \
+					../CCDrawingPrimitives.o \
+					../CCScheduler.o \
+					../cocos2d.o 
+
+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 
+						
+SHAREDLIBS = -lglfw -lGL
+
+####### Build rules
+$(TARGET): $(OBJECTS) 
+	$(CXX) $(CXXFLAGS) $(INCLUDES) $(DEFINES) $(OBJECTS) -shared -o $(TARGET) $(SHAREDLIBS) $(STATICLIBS)
+	
+####### Compile
+%.o: %.cpp
+	$(CXX) $(CXXFLAGS) $(INCLUDES) $(DEFINES) $(VISIBILITY) -c $< -o $@
+
+%.o: %.c
+	$(CC) $(CCFLAGS) $(INCLUDES) $(DEFINES) $(VISIBILITY) -c $< -o $@
+		
+clean: 
+	rm -f $(OBJECTS) $(TARGET) core
\ No newline at end of file
diff --git a/post.sh b/post.sh
index d6573ef609..ab05b1271e 100644
--- a/post.sh
+++ b/post.sh
@@ -12,4 +12,32 @@ fi
 echo "mode: $modeDir"
 echo "mode: $libDir"
 
+if [ ! -d "lib" ]; then
+mkdir "lib"
+fi
+
+if [ ! -d "lib/linux" ]; then
+mkdir "lib/linux"
+fi
+
+if [ ! -d "lib/android" ]; then
+mkdir "lib/android"
+fi
+
+if [ ! -d "lib/linux/Debug" ]; then
+mkdir "lib/linux/Debug"
+fi
+
+if [ ! -d "lib/linux/Release" ]; then
+mkdir "lib/linux/Release"
+fi
+
+if [ ! -d "lib/android/Debug" ]; then
+mkdir "lib/android/Debug"
+fi
+
+if [ ! -d "lib/android/Release" ]; then
+mkdir "lib/android/Release"
+fi
+
 test -e ../$3/lib$1.so&&  cp ../$3/lib$1.so ../../../lib/$libDir/$modeDir/lib$2.so 
diff --git a/tests/test.linux/Makefile b/tests/test.linux/Makefile
new file mode 100644
index 0000000000..f4fcdb620f
--- /dev/null
+++ b/tests/test.linux/Makefile
@@ -0,0 +1,124 @@
+CC      = gcc
+CXX     = g++
+TARGET	= cocos2dx-test
+CCFLAGS = -Wall -g -O2 
+CXXFLAGS = -Wall -g -O2 
+VISIBILITY = 
+
+INCLUDES = -I../ \
+					-I../../cocos2dx/platform/third_party/linux \
+					-I../../cocos2dx/include \
+					-I../../cocos2dx \
+					-I../../cocos2dx/platform \
+					-I../../CocosDenshion/include \
+					-I../../chipmunk/include/chipmunk \
+					-I../../ 
+
+DEFINES = -DLINUX
+
+OBJECTS = ../tests/AccelerometerTest/AccelerometerTest.o \
+					../tests/ActionManagerTest/ActionManagerTest.o \
+					../tests/ActionsTest/ActionsTest.o \
+					../tests/Box2DTest/Box2dTest.o \
+					../tests/Box2DTestBed/Box2dView.o \
+					../tests/Box2DTestBed/GLES-Render.o \
+					../tests/Box2DTestBed/Test.o \
+					../tests/Box2DTestBed/TestEntries.o \
+					../tests/BugsTest/Bug-1159.o \
+					../tests/BugsTest/Bug-1174.o \
+					../tests/BugsTest/Bug-350.o \
+					../tests/BugsTest/Bug-422.o \
+					../tests/BugsTest/Bug-624.o \
+					../tests/BugsTest/Bug-886.o \
+					../tests/BugsTest/Bug-899.o \
+					../tests/BugsTest/Bug-914.o \
+					../tests/BugsTest/Bug-458/Bug-458.o \
+					../tests/BugsTest/Bug-458/QuestionContainerSprite.o \
+					../tests/BugsTest/BugsTest.o \
+					../tests/ChipmunkTest/Bounce.o \
+					../tests/ChipmunkTest/Joints.o \
+					../tests/ChipmunkTest/LogoSmash.o \
+					../tests/ChipmunkTest/MagnetsElectric.o \
+					../tests/ChipmunkTest/OneWay.o \
+					../tests/ChipmunkTest/Planet.o \
+					../tests/ChipmunkTest/Player.o \
+					../tests/ChipmunkTest/Plink.o \
+					../tests/ChipmunkTest/Pump.o \
+					../tests/ChipmunkTest/PyramidStack.o \
+					../tests/ChipmunkTest/PyramidTopple.o \
+					../tests/ChipmunkTest/Query.o \
+					../tests/ChipmunkTest/Sensors.o \
+					../tests/ChipmunkTest/Simple.o \
+					../tests/ChipmunkTest/Springies.o \
+					../tests/ChipmunkTest/Tank.o \
+					../tests/ChipmunkTest/TheoJansen.o \
+					../tests/ChipmunkTest/Tumble.o \
+					../tests/ChipmunkTest/UnsafeOps.o \
+					../tests/ChipmunkTest/cocos2dChipmunkDemo.o \
+					../tests/ChipmunkTest/drawSpace.o \
+					../tests/ClickAndMoveTest/ClickAndMoveTest.o \
+					../tests/CocosDenshionTest/CocosDenshionTest.o \
+					../tests/CocosNodeTest/CocosNodeTest.o \
+					../tests/CurlTest/CurlTest.o \
+					../tests/CurrentLanguageTest/CurrentLanguageTest.o \
+					../tests/DirectorTest/DirectorTest.o \
+					../tests/DrawPrimitivesTest/DrawPrimitivesTest.o \
+					../tests/EaseActionsTest/EaseActionsTest.o \
+					../tests/EffectsAdvancedTest/EffectsAdvancedTest.o \
+					../tests/EffectsTest/EffectsTest.o \
+					../tests/FontTest/FontTest.o \
+					../tests/HiResTest/HiResTest.o \
+					../tests/IntervalTest/IntervalTest.o \
+					../tests/KeypadTest/KeypadTest.o \
+					../tests/LabelTest/LabelTest.o \
+					../tests/LayerTest/LayerTest.o \
+					../tests/MenuTest/MenuTest.o \
+					../tests/MotionStreakTest/MotionStreakTest.o \
+					../tests/ParallaxTest/ParallaxTest.o \
+					../tests/ParticleTest/ParticleTest.o \
+					../tests/PerformanceTest/PerformanceNodeChildrenTest.o \
+					../tests/PerformanceTest/PerformanceParticleTest.o \
+					../tests/PerformanceTest/PerformanceSpriteTest.o \
+					../tests/PerformanceTest/PerformanceTest.o \
+					../tests/PerformanceTest/PerformanceTextureTest.o \
+					../tests/PerformanceTest/PerformanceTouchesTest.o \
+					../tests/ProgressActionsTest/ProgressActionsTest.o \
+					../tests/RenderTextureTest/RenderTextureTest.o \
+					../tests/RotateWorldTest/RotateWorldTest.o \
+					../tests/SceneTest/SceneTest.o \
+					../tests/SchedulerTest/SchedulerTest.o \
+					../tests/SpriteTest/SpriteTest.o \
+					../tests/TextInputTest/TextInputTest.o \
+					../tests/Texture2dTest/Texture2dTest.o \
+					../tests/TileMapTest/TileMapTest.o \
+					../tests/TouchesTest/Ball.o \
+					../tests/TouchesTest/Paddle.o \
+					../tests/TouchesTest/TouchesTest.o \
+					../tests/TransitionsTest/TransitionsTest.o \
+					../tests/UserDefaultTest/UserDefaultTest.o \
+					../tests/ZwoptexTest/ZwoptexTest.o \
+					../tests/controller.o \
+					../tests/testBasic.o \
+					../AppDelegate.o \
+					./main.o 
+					
+STATICLIBS_DIR = ../../cocos2dx/platform/third_party/linux/libraries
+STATICLIBS =  ../../Box2D/lib/linux/libBox2D.a \
+							../../chipmunk/lib/linux/libchipmunk.a \
+							$(STATICLIBS_DIR)/libcurl.a 
+							
+SHAREDLIBS = -L../../lib/linux/Debug -lcocos2d -lrt -lz -lcocosdenshion -Wl,-rpath,../../lib/linux/Debug/
+
+####### Build rules
+$(TARGET): $(OBJECTS) 
+	$(CXX) $(CXXFLAGS) $(INCLUDES) $(DEFINES) $(OBJECTS) -o $(TARGET) $(SHAREDLIBS) $(STATICLIBS)
+	
+####### Compile
+%.o: %.cpp
+	$(CXX) $(CXXFLAGS) $(INCLUDES) $(DEFINES) $(VISIBILITY) -c $< -o $@
+
+%.o: %.c
+	$(CC) $(CCFLAGS) $(INCLUDES) $(DEFINES) $(VISIBILITY) -c $< -o $@
+		
+clean: 
+	rm -f $(OBJECTS) $(TARGET) core
\ No newline at end of file