[cadcdev-svn-commits] SF.net SVN: cadcdev: [508] tiki

[<at...@us...>]

Revision: 508
          http://cadcdev.svn.sourceforge.net/cadcdev/?rev=508&view=rev
Author:   atani
Date:     2007-09-04 17:49:00 -0700 (Tue, 04 Sep 2007)

Log Message:
-----------
* moving arm7_template to tikiarm7
* more svn:ignore prop edits (ignore *.nds, *.ds.gba)
* proper sizing for nds in examples

Modified Paths:
--------------
    tiki/examples/TikiTest/src/test.cpp
    tiki/examples/console/TikiSnake/src/snake.cpp
    tiki/examples/net/httpclient/src/main.cpp
    tiki/nds/Makefile
    tiki/nds/Makefile.rules
    tiki/nds/tikiarm7/Makefile

Added Paths:
-----------
    tiki/nds/tikiarm7/

Removed Paths:
-------------
    tiki/nds/arm7_template/

Property Changed:
----------------
    tiki/examples/TikiTest/
    tiki/examples/console/TikiSnake/
    tiki/examples/net/basic/
    tiki/examples/net/chat/
    tiki/examples/net/chatd/
    tiki/examples/net/httpclient/


Property changes on: tiki/examples/TikiTest
___________________________________________________________________
Name: svn:ignore
   - Debug
Release
*.user

   + Debug
Release
*.user
*.nds
*.ds.gba


Modified: tiki/examples/TikiTest/src/test.cpp
===================================================================
--- tiki/examples/TikiTest/src/test.cpp	2007-09-04 17:56:07 UTC (rev 507)
+++ tiki/examples/TikiTest/src/test.cpp	2007-09-05 00:49:00 UTC (rev 508)
@@ -259,7 +259,11 @@
 
 	plx_mat3d_mode( PLX_MAT_PROJECTION );
 	plx_mat3d_identity();
+#if TIKI_PLAT != TIKI_NDS
 	plx_mat3d_perspective( 45.0f, 640.0f / 480.0f, 0.1f, 100.0f );
+#else
+	plx_mat3d_perspective( 45.0f, 256.0f / 192.0f, 0.1f, 100.0f );
+#endif
 	plx_mat3d_mode( PLX_MAT_MODELVIEW );
 
 	while ( !quitting )


Property changes on: tiki/examples/console/TikiSnake
___________________________________________________________________
Name: svn:ignore
   - Debug
Release
*.user

   + Debug
Release
*.user
*.nds
*.ds.gba


Modified: tiki/examples/console/TikiSnake/src/snake.cpp
===================================================================
--- tiki/examples/console/TikiSnake/src/snake.cpp	2007-09-04 17:56:07 UTC (rev 507)
+++ tiki/examples/console/TikiSnake/src/snake.cpp	2007-09-05 00:49:00 UTC (rev 508)
@@ -71,8 +71,13 @@
 	//initialize the screen
 	ConsoleText *ct = new ConsoleText( 80, 25, new Texture( "pc-ascii.png", true ) );
 
+#if TIKI_PLAT != TIKI_NDS
 	ct->setSize( 640, 480 );
 	ct->translate( Vector( 320, 240, 0 ) );
+#else
+	ct->setSize( 256, 192);
+	ct->translate( Vector( 128, 96, 0 ) );
+#endif
 	ct->setAutoScroll( 0 );
 	ct->setAutoWrap( 0 );
 


Property changes on: tiki/examples/net/basic
___________________________________________________________________
Name: svn:ignore
   - Debug
Release
*.user

   + Debug
Release
*.user
*.nds
*.ds.gba



Property changes on: tiki/examples/net/chat
___________________________________________________________________
Name: svn:ignore
   - Debug
Release
*.user

   + Debug
Release
*.user
*.nds
*.ds.gba



Property changes on: tiki/examples/net/chatd
___________________________________________________________________
Name: svn:ignore
   - Debug
Release
*.user

   + Debug
Release
*.user
*.nds
*.ds.gba



Property changes on: tiki/examples/net/httpclient
___________________________________________________________________
Name: svn:ignore
   - Debug
Release
*.user

   + Debug
Release
*.user
*.nds
*.ds.gba


Modified: tiki/examples/net/httpclient/src/main.cpp
===================================================================
--- tiki/examples/net/httpclient/src/main.cpp	2007-09-04 17:56:07 UTC (rev 507)
+++ tiki/examples/net/httpclient/src/main.cpp	2007-09-05 00:49:00 UTC (rev 508)
@@ -54,8 +54,13 @@
 	RefPtr<Texture> cf = new Texture("pc-ascii.png", true);
 #endif
 	ConsoleText *console = new ConsoleText(80, 25, cf);
+#if TIKI_PLAT != TIKI_NDS
 	console->setSize(640, 480);
 	console->setTranslate( Vector( 320, 240, 0 ) );
+#else
+	console->setSize(256, 192);
+	console->setTranslate( Vector( 128, 96, 0 ) );
+#endif
 	console->setAutoWrap( true );
 	console->setAutoScroll( true );
 

Modified: tiki/nds/Makefile
===================================================================
--- tiki/nds/Makefile	2007-09-04 17:56:07 UTC (rev 507)
+++ tiki/nds/Makefile	2007-09-05 00:49:00 UTC (rev 508)
@@ -56,23 +56,20 @@
 
 clean: clean_subdirs
 	-rm -f $(BASE_OBJS) $(THIRD_PARTY_OBJS) libtiki.a
-	$(MAKE) -C arm7_template clean TOPDIR=$(CURDIR)
+	$(MAKE) -C tikiarm7 clean TOPDIR=$(CURDIR)
 	$(MAKE) TIKI_PLAT=nds -C$(CURDIR)/../examples clean
 
 examples:
 	$(MAKE) TIKI_PLAT=nds -C$(CURDIR)/../examples clean all
 
 package:
-	zip -9r ../dist/$(SVN_VERSION)/tiki-$(SVN_VERSION)-nds.zip \
-		libtiki.a \
-		arm7_template \
-		-x "*/.svn/*"
 	cd .. && \
 		zip -9ru dist/$(SVN_VERSION)/tiki-$(SVN_VERSION)-nds.zip \
 		include \
 		nds/include \
-		nds/Makefile.rules \
-		-x "*/.svn/*"
+		nds/libtiki.a \
+		nds/tikiarm7 \
+		nds/Makefile.rules
 	cp ../examples/console/TikiSnake/resources/pc-ascii.png \
 		../examples/console/TikiSnake
 	cp ../examples/net/httpclient/resources/pc-ascii.png \
@@ -92,9 +89,10 @@
 		examples/net/chatd/chatd.ds.gba \
 		examples/net/httpclient/pc-ascii.png \
 		examples/net/httpclient/httpclient.nds \
-		examples/net/httpclient/httpclient.ds.gba \
-		-x "*/.svn/*"
+		examples/net/httpclient/httpclient.ds.gba
 	rm -f ../examples/console/TikiSnake/pc-ascii.png ../examples/net/httpclient/pc-ascii.png
+	zip ../dist/$(SVN_VERSION)/tiki-$(SVN_VERSION)-nds.zip \
+		-d '*.svn*'
 
 DEPSDIR=$(CURDIR)
 include Makefile.rules

Modified: tiki/nds/Makefile.rules
===================================================================
--- tiki/nds/Makefile.rules	2007-09-04 17:56:07 UTC (rev 507)
+++ tiki/nds/Makefile.rules	2007-09-05 00:49:00 UTC (rev 508)
@@ -47,7 +47,7 @@
 NDS_CART_VERSION ?= 1
 
 define post_build
-	@$(MAKE) -C $(TIKI_DIR)/$(TIKI_PLAT)/arm7_template TOPDIR=$(CURDIR)
+	@$(MAKE) -C $(TIKI_DIR)/$(TIKI_PLAT)/tikiarm7 TOPDIR=$(CURDIR)
 	@$(DEVKITARM)/bin/arm-eabi-objcopy -O binary $@.arm9.elf $@.arm9
 	@ndstool -c $@.nds -g $(NDS_CART_CODE) $(NDS_CART_ID) "$(NDS_CART_NAME)" $(NDS_CART_VERSION) -7 tikiarm7.arm7 -9 $@.arm9
 	@dsbuild $@.nds

Copied: tiki/nds/tikiarm7 (from rev 507, tiki/nds/arm7_template)


Property changes on: tiki/nds/tikiarm7
___________________________________________________________________
Name: svn:ignore
   + build
tikiarm7.arm7.elf


Modified: tiki/nds/tikiarm7/Makefile
===================================================================
--- tiki/nds/arm7_template/Makefile	2007-09-04 17:56:07 UTC (rev 507)
+++ tiki/nds/tikiarm7/Makefile	2007-09-05 00:49:00 UTC (rev 508)
@@ -19,6 +19,11 @@
 INCLUDES	:=	include build
 DATA		:=
 TARGET		:=	tikiarm7
+
+#---------------------------------------------------------------------------------
+# set default for TOPDIR so it doesnt try to write to / (root)
+#---------------------------------------------------------------------------------
+TOPDIR		:=	$(CURDIR)
  
 #---------------------------------------------------------------------------------
 # options for code generation


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.