From e811b70b744d10033a773cd47ef4e8463bb48b4e Mon Sep 17 00:00:00 2001
From: "spartanj@gmail.com" <spartanj@gmail.com>
Date: Tue, 28 Feb 2012 11:59:15 -0300
Subject: [PATCH] Changed the ABI for android. Changed the default project
 compiled in android. Changed the empty window to show a couple of primitives.

---
 android-project/jni/Android.mk         | 28 ++------------------------
 android-project/jni/Application.mk     |  1 +
 src/test/empty_window/empty_window.cpp | 22 ++++++++++++++++++++
 3 files changed, 25 insertions(+), 26 deletions(-)

diff --git a/android-project/jni/Android.mk b/android-project/jni/Android.mk
index 92870f75f..f9b2c039a 100644
--- a/android-project/jni/Android.mk
+++ b/android-project/jni/Android.mk
@@ -178,36 +178,12 @@ LOCAL_LDLIBS := $(EE_GLES_LINK) -ldl -llog
 include $(BUILD_STATIC_LIBRARY)
 #**************** SDL 2 ***************
 
-#**************** eetest ****************
-include $(CLEAR_VARS)
-
-LOCAL_PATH := $(MY_PATH)/test
-
-LOCAL_LDLIBS 	:= $(MY_LDLIBS)
-
-LOCAL_CFLAGS	:= $(MY_C_FLAGS)
-
-LOCAL_MODULE := eetest
-
-LOCAL_C_INCLUDES := $(MY_C_INCLUDES)
-
-LOCAL_SRC_FILES := \
-	../$(MY_SDL_MAIN_PATH) \
-	*.cpp
-
-LOCAL_SRC_FILES := $(foreach F, $(CORE_SRCS), $(addprefix $(dir $(F)),$(notdir $(wildcard $(LOCAL_PATH)/$(F)))))
-
-LOCAL_SHARED_LIBRARIES := eepp
-
-include $(BUILD_SHARED_LIBRARY)
-#**************** eetest ****************
-
 #************* empty_window *************
 include $(CLEAR_VARS)
 
 LOCAL_PATH := $(MY_PATH)/test/empty_window
 
-LOCAL_MODULE := empty_window
+LOCAL_MODULE := main
 
 LOCAL_LDLIBS 	:= $(MY_LDLIBS)
 
@@ -305,7 +281,7 @@ include $(CLEAR_VARS)
 
 LOCAL_PATH := $(MY_PATH)/rhythm
 
-LOCAL_MODULE := main
+LOCAL_MODULE := rhythm
 
 LOCAL_LDLIBS 	:= $(MY_LDLIBS)
 
diff --git a/android-project/jni/Application.mk b/android-project/jni/Application.mk
index 357774e76..86692d309 100644
--- a/android-project/jni/Application.mk
+++ b/android-project/jni/Application.mk
@@ -14,3 +14,4 @@ APP_LDLIBS			:= -llog $(EE_GLES_LINK) -lm -lz
 APP_CFLAGS			:= -DDEBUG										# arm-linux-androideabi-4.4.3 crashes in -O0 mode on SDL sources
 APP_PLATFORM		:= android-7
 APP_MODULES			:= main
+#APP_ABI				:= armeabi-v7a
diff --git a/src/test/empty_window/empty_window.cpp b/src/test/empty_window/empty_window.cpp
index 612496a28..9a1372bee 100644
--- a/src/test/empty_window/empty_window.cpp
+++ b/src/test/empty_window/empty_window.cpp
@@ -6,12 +6,17 @@ EE_MAIN_FUNC int main (int argc, char * argv [])
 	// Create a new window
 	cWindow * win = cEngine::instance()->CreateWindow( WindowSettings( 800, 600, 32, WindowStyle::Default, "", "eepp - Empty Window" ), ContextSettings(  ) );
 
+	// Set window background color
+	win->BackColor( eeColor( 50, 50, 50 ) );
+
 	// Check if created
 	if ( win->Created() )
 	{
 		// Get input pointer
 		cInput * imp = win->GetInput();
 
+		eeFloat ang = 0;
+
 		// Application loop
 		while ( win->Running() )
 		{
@@ -25,6 +30,23 @@ EE_MAIN_FUNC int main (int argc, char * argv [])
 				win->Close();
 			}
 
+			ang += cEngine::instance()->Elapsed() * 0.01;
+
+			// Create an instance of the primitive renderer
+			cPrimitives p;
+
+			// Set the primitive color
+			p.SetColor( eeColorA( 0, 150, 0, 150 ) );
+
+			// Draw a rectangle
+			p.DrawRectangle( 100, 100, win->GetWidth() - 200, win->GetHeight() - 200, ang );
+
+			// Change the color
+			p.SetColor( eeColorA( 0, 255, 0, 150 ) );
+
+			// Draw a circle
+			p.DrawCircle( win->GetWidth() / 2, win->GetHeight() / 2, 200 );
+
 			// Draw frame
 			win->Display();