From a7dfdce6083e2934a571044bf42c5273cde759ea Mon Sep 17 00:00:00 2001
From: "spartanj@gmail.com" <spartanj@gmail.com>
Date: Wed, 25 Jan 2012 01:15:09 -0300
Subject: [PATCH] Updated project files.

---
 Makefile | 16 +++++++++-------
 ee.files | 19 +++++++++++++++++--
 2 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/Makefile b/Makefile
index 8e7de4407..8164455fc 100644
--- a/Makefile
+++ b/Makefile
@@ -13,13 +13,13 @@ export DESTLIBDIR 	= $(DESTDIR)/lib
 export DESTINCDIR 	= $(DESTDIR)/include
 
 ifeq ($(DYNAMIC), yes)
-    LIB     = libeepp.so
-    LIBNAME = $(LIBPATH)/$(LIB).$(VERSION)
-    INSTALL = && $(LN) $(LNFLAGS) $(DESTLIBDIR)/$(LIB).$(VERSION) $(DESTLIBDIR)/$(LIB)
+	LIB     = libeepp.so
+	LIBNAME = $(LIBPATH)/$(LIB).$(VERSION)
+	INSTALL = && $(LN) $(LNFLAGS) $(DESTLIBDIR)/$(LIB).$(VERSION) $(DESTLIBDIR)/$(LIB)
 else
-    LIB     = libeepp-s.a
-    LIBNAME = $(LIBPATH)/$(LIB)
-    INSTALL = 
+	LIB     = libeepp-s.a
+	LIBNAME = $(LIBPATH)/$(LIB)
+	INSTALL = 
 endif
 
 ifeq ($(LLVM_BUILD), yes)
@@ -281,7 +281,7 @@ SRCPHYSICS			= $(wildcard ./src/physics/*.cpp) $(wildcard ./src/physics/constrai
 SRCTEST     		= $(wildcard ./src/test/*.cpp)
 SRCEEIV     		= $(wildcard ./src/eeiv/*.cpp)
 SRCFLUID     		= $(wildcard ./src/fluid/*.cpp)
-SRCPARTICLES    		= $(wildcard ./src/particles/*.cpp)
+SRCPARTICLES    	= $(wildcard ./src/particles/*.cpp) $(wildcard ./src/particles/objects/*.cpp) $(wildcard ./src/particles/gameobjects/*.cpp)
 SRCBNB     			= $(wildcard ./src/bnb/*.cpp)
 SRCEMPTYWINDOW  	= $(wildcard ./src/test/empty_window/*.cpp)
 
@@ -375,6 +375,8 @@ dirs:
 	@mkdir -p $(OBJDIR)/src/fluid
 	@mkdir -p $(OBJDIR)/src/bnb
 	@mkdir -p $(OBJDIR)/src/particles
+	@mkdir -p $(OBJDIR)/src/particles/objects
+	@mkdir -p $(OBJDIR)/src/particles/gameobjects
 
 lib: dirs $(LIB)
 
diff --git a/ee.files b/ee.files
index ccac46630..44081f851 100644
--- a/ee.files
+++ b/ee.files
@@ -917,6 +917,21 @@ src/helper/android/sdl-1.3/src/render/opengles/SDL_render_gles.c
 src/helper/android/sdl-1.3/src/render/SDL_sysrender.h
 src/helper/android/sdl-1.3/src/joystick/android/SDL_sysjoystick.c
 src/particles/particles.hpp
-src/particles/cemitter.hpp
 src/particles/particles.cpp
-src/particles/cemitter.cpp
+src/particles/objects/objects.hpp
+src/particles/objects/cworldstaticobject.hpp
+src/particles/objects/cworldobject.hpp
+src/particles/objects/cworld.hpp
+src/particles/objects/cworldstaticobject.cpp
+src/particles/objects/cworldobject.cpp
+src/particles/objects/cworld.cpp
+src/particles/gameobjects/cparticle.hpp
+src/particles/gameobjects/cemitter.hpp
+src/particles/gameobjects/cattractor.hpp
+src/particles/gameobjects/cparticle.cpp
+src/particles/gameobjects/cemitter.cpp
+src/particles/gameobjects/cattractor.cpp
+src/particles/particles.hpp
+src/particles/cgameworld.hpp
+src/particles/particles.cpp
+src/particles/cgameworld.cpp