Menu
▾
▴
[cadcdev-svn-commits] SF.net SVN: cadcdev: [506] tiki
|
From: <at...@us...> - 2007-09-04 17:24:56
|
Revision: 506
http://cadcdev.svn.sourceforge.net/cadcdev/?rev=506&view=rev
Author: atani
Date: 2007-09-04 10:24:54 -0700 (Tue, 04 Sep 2007)
Log Message:
-----------
* various updates to svn:ignore props
* platforms now use proper filenames (dc -> elf, nds -> nds and ds.gba)
* platforms now able to build romdisk and post_build steps
* package targets updated to include new names for example files
Modified Paths:
--------------
tiki/Makefile
tiki/dc/Makefile
tiki/dc/Makefile.rules
tiki/examples/TikiTest/Makefile
tiki/examples/console/TikiSnake/Makefile
tiki/examples/console/TikiSnake/src/TikiSnake.cpp
tiki/examples/net/basic/Makefile
tiki/examples/net/chat/Makefile
tiki/examples/net/chatd/Makefile
tiki/examples/net/httpclient/Makefile
tiki/examples/net/httpclient/src/main.cpp
tiki/nds/Makefile
tiki/nds/Makefile.rules
tiki/sdl/Makefile
tiki/sdl/Makefile.rules
Added Paths:
-----------
tiki/examples/Makefile
tiki/examples/console/Makefile
tiki/examples/net/Makefile
Property Changed:
----------------
tiki/
tiki/3rdparty/libjpeg/
tiki/3rdparty/libogg/src/
tiki/3rdparty/libpng/
tiki/3rdparty/libvorbis/lib/
tiki/3rdparty/tinyxml/
tiki/3rdparty/zlib/
tiki/dc/
tiki/examples/TikiTest/src/
tiki/examples/console/TikiSnake/src/
tiki/examples/net/basic/src/
tiki/examples/net/chat/src/
tiki/examples/net/chatd/src/
tiki/examples/net/httpclient/src/
tiki/nds/
tiki/nds/src/
tiki/nds/src/audio/
tiki/sdl/
tiki/src/audio/
tiki/src/audio/oggvorbis/
tiki/src/base/
tiki/src/gl/
tiki/src/gl/anims/
tiki/src/gl/drawables/
tiki/src/gl/triggers/
tiki/src/hid/
tiki/src/image/
tiki/src/math/
tiki/src/net/
tiki/src/net/http/
tiki/src/net/util/
tiki/src/thread/
Property changes on: tiki
___________________________________________________________________
Name: svn:ignore
+ dist
Property changes on: tiki/3rdparty/libjpeg
___________________________________________________________________
Name: svn:ignore
+ *.d
Property changes on: tiki/3rdparty/libogg/src
___________________________________________________________________
Name: svn:ignore
+ *.d
Property changes on: tiki/3rdparty/libpng
___________________________________________________________________
Name: svn:ignore
+ *.d
Property changes on: tiki/3rdparty/libvorbis/lib
___________________________________________________________________
Name: svn:ignore
+ *.d
Property changes on: tiki/3rdparty/tinyxml
___________________________________________________________________
Name: svn:ignore
+ *.d
Property changes on: tiki/3rdparty/zlib
___________________________________________________________________
Name: svn:ignore
+ *.d
Modified: tiki/Makefile
===================================================================
--- tiki/Makefile 2007-09-03 18:44:28 UTC (rev 505)
+++ tiki/Makefile 2007-09-04 17:24:54 UTC (rev 506)
@@ -23,4 +23,4 @@
dist_copy:
scp -rq dist/$(SVN_VERSION) tr...@at...:public_html/snapshots/tiki
-.PHONY: win32 dc gp2x osx sdl nds
+.PHONY: win32 dc osx sdl nds
Property changes on: tiki/dc
___________________________________________________________________
Name: svn:ignore
+ libtiki.a
Modified: tiki/dc/Makefile
===================================================================
--- tiki/dc/Makefile 2007-09-03 18:44:28 UTC (rev 505)
+++ tiki/dc/Makefile 2007-09-04 17:24:54 UTC (rev 506)
@@ -22,10 +22,10 @@
clean: clean_subdirs
-rm -f $(BASE_OBJS) libtiki.a
+ $(MAKE) TIKI_PLAT=dc -C$(CURDIR)/../examples clean
examples:
- $(MAKE) TIKI_PLAT=dc TIKI_DIR=$(CURDIR)/../ -C$(CURDIR)/../examples/TikiTest
- $(MAKE) TIKI_PLAT=dc TIKI_DIR=$(CURDIR)/../ -C$(CURDIR)/../examples/console/TikiSnake
+ $(MAKE) TIKI_PLAT=dc -C$(CURDIR)/../examples clean all
package:
zip -9r ../dist/$(SVN_VERSION)/tiki-$(SVN_VERSION)-dc.zip libtiki.a
@@ -37,8 +37,8 @@
-x "*/.svn/*"
cd .. && \
zip -9ru dist/$(SVN_VERSION)/tiki-$(SVN_VERSION)-dc.zip \
- examples/TikiTest/tikitest \
- examples/console/TikiSnake/tikisnake \
+ examples/TikiTest/tikitest.elf \
+ examples/console/TikiSnake/tikisnake.elf \
-x "*/.svn/*"
include Makefile.rules
Modified: tiki/dc/Makefile.rules
===================================================================
--- tiki/dc/Makefile.rules 2007-09-03 18:44:28 UTC (rev 505)
+++ tiki/dc/Makefile.rules 2007-09-04 17:24:54 UTC (rev 506)
@@ -23,3 +23,21 @@
TIKI_BASE_LIBS=-ltiki -ljpeg -loggvorbisplay -lpng -lz -lgl -lm
CXX=kos-c++
CC=kos-cc
+
+PLATFORM_BINARY_EXT=.elf
+ROMDISK_OBJ=
+
+ifdef ROMDISK_DIR
+define build_romdisk
+ $(KOS_GENROMFS) -f romdisk.img -d $(ROMDISK_DIR) -v -x .svn
+ $(KOS_BASE)/utils/bin2o/bin2o romdisk.img romdisk romdisk.o
+ @rm -f romdisk.img
+endef
+ROMDISK_OBJ := romdisk.o
+else
+define build_romdisk
+endef
+endif
+
+define post_build
+endef
Added: tiki/examples/Makefile
===================================================================
--- tiki/examples/Makefile (rev 0)
+++ tiki/examples/Makefile 2007-09-04 17:24:54 UTC (rev 506)
@@ -0,0 +1,8 @@
+
+SUBDIRS = TikiTest console net
+
+TIKI_DIR ?= $(CURDIR)/../
+include $(TIKI_DIR)$(TIKI_PLAT)/Makefile.rules
+
+all: subdirs
+clean: clean_subdirs
Modified: tiki/examples/TikiTest/Makefile
===================================================================
--- tiki/examples/TikiTest/Makefile 2007-09-03 18:44:28 UTC (rev 505)
+++ tiki/examples/TikiTest/Makefile 2007-09-04 17:24:54 UTC (rev 506)
@@ -1,13 +1,27 @@
-TIKI_DIR=../../
+
CFLAGS=-I$(TIKI_DIR)$(TIKI_PLAT)/include -I$(TIKI_DIR)include
OBJS = $(patsubst %.cpp,%.o,$(wildcard src/*.cpp))
-all: $(OBJS)
- $(CXX) $(LDFLAGS) -L$(TIKI_DIR)$(TIKI_PLAT) -L$(TIKI_DIR)$(TIKI_PLAT)/lib $(OBJS) $(TIKI_BASE_LIBS) -o tikitest
+ifeq ($(TIKI_PLAT),nds)
+NDS_CART_CODE ?= TKTS
+NDS_CART_ID ?= TK
+NDS_CART_NAME ?= TikiTest
+NDS_CART_VERSION ?= 1
+endif
+all: tikitest
+tikitest: $(OBJS)
+ $(build_romdisk)
+ $(CXX) $(LDFLAGS) -L$(TIKI_DIR)$(TIKI_PLAT) -L$(TIKI_DIR)$(TIKI_PLAT)/lib $(OBJS) $(TIKI_BASE_LIBS) -o tikitest$(PLATFORM_BINARY_EXT) $(ROMDISK_OBJ)
+ $(post_build)
+
clean:
- -rm -f $(OBJS) tikitest
+ -rm -f $(OBJS) tikitest$(PLATFORM_BINARY_EXT) $(ROMDISK_OBJ)
+ifeq ($(TIKI_PLAT),nds)
+ -rm -f tikitest.nds tikitest.ds.gba
+endif
+TIKI_DIR ?= $(CURDIR)/../../
DEPSDIR=$(CURDIR)
include $(TIKI_DIR)$(TIKI_PLAT)/Makefile.rules
Property changes on: tiki/examples/TikiTest/src
___________________________________________________________________
Name: svn:ignore
+ *.d
Added: tiki/examples/console/Makefile
===================================================================
--- tiki/examples/console/Makefile (rev 0)
+++ tiki/examples/console/Makefile 2007-09-04 17:24:54 UTC (rev 506)
@@ -0,0 +1,8 @@
+
+SUBDIRS = TikiSnake
+
+TIKI_DIR ?= $(CURDIR)/../../
+include $(TIKI_DIR)$(TIKI_PLAT)/Makefile.rules
+
+all: subdirs
+clean: clean_subdirs
Modified: tiki/examples/console/TikiSnake/Makefile
===================================================================
--- tiki/examples/console/TikiSnake/Makefile 2007-09-03 18:44:28 UTC (rev 505)
+++ tiki/examples/console/TikiSnake/Makefile 2007-09-04 17:24:54 UTC (rev 506)
@@ -1,12 +1,28 @@
-CFLAGS=-I../../../$(TIKI_PLAT)/include -I../../../include
+TIKI_DIR ?= ../../../
+CFLAGS = -I../../../$(TIKI_PLAT)/include -I../../../include
OBJS = $(patsubst %.cpp,%.o,$(wildcard src/*.cpp))
+ROMDISK_DIR = resources
-all: $(OBJS)
- $(CXX) $(LDFLAGS) -L$(TIKI_DIR)$(TIKI_PLAT) -L$(TIKI_DIR)$(TIKI_PLAT)/lib $(OBJS) $(TIKI_BASE_LIBS) -o tikisnake
+ifeq ($(TIKI_PLAT),nds)
+NDS_CART_CODE ?= TKSK
+NDS_CART_ID ?= TK
+NDS_CART_NAME ?= TikiSnake
+NDS_CART_VERSION ?= 1
+endif
+all: tikisnake
+
+tikisnake: $(OBJS)
+ $(build_romdisk)
+ $(CXX) $(LDFLAGS) -L$(TIKI_DIR)$(TIKI_PLAT) -L$(TIKI_DIR)$(TIKI_PLAT)/lib $(OBJS) $(TIKI_BASE_LIBS) -o tikisnake$(PLATFORM_BINARY_EXT) $(ROMDISK_OBJ)
+ $(post_build)
+
clean:
- -rm -f $(OBJS) tikisnake
+ -rm -f $(OBJS) tikisnake$(PLATFORM_BINARY_EXT) $(ROMDISK_OBJ)
+ifeq ($(TIKI_PLAT),nds)
+ -rm -f tikisnake.nds tikisnake.ds.gba
+endif
DEPSDIR=$(CURDIR)
-include ../../../$(TIKI_PLAT)/Makefile.rules
+include $(TIKI_DIR)/$(TIKI_PLAT)/Makefile.rules
Property changes on: tiki/examples/console/TikiSnake/src
___________________________________________________________________
Name: svn:ignore
+ *.d
Modified: tiki/examples/console/TikiSnake/src/TikiSnake.cpp
===================================================================
--- tiki/examples/console/TikiSnake/src/TikiSnake.cpp 2007-09-03 18:44:28 UTC (rev 505)
+++ tiki/examples/console/TikiSnake/src/TikiSnake.cpp 2007-09-04 17:24:54 UTC (rev 506)
@@ -8,6 +8,11 @@
#include <Tiki/tiki.h>
+#if TIKI_PLAT == TIKI_DC
+extern uint8 romdisk[];
+KOS_INIT_ROMDISK(romdisk);
+#endif
+
#if TIKI_PLAT == TIKI_WIN32
#include <windows.h>
#include "pch.h"
Added: tiki/examples/net/Makefile
===================================================================
--- tiki/examples/net/Makefile (rev 0)
+++ tiki/examples/net/Makefile 2007-09-04 17:24:54 UTC (rev 506)
@@ -0,0 +1,12 @@
+
+ifneq ($(TIKI_PLAT),dc)
+SUBDIRS = basic chat chatd httpclient
+else
+SUBDIRS =
+endif
+
+TIKI_DIR ?= $(CURDIR)/../../
+include $(TIKI_DIR)$(TIKI_PLAT)/Makefile.rules
+
+all: subdirs
+clean: clean_subdirs
Modified: tiki/examples/net/basic/Makefile
===================================================================
--- tiki/examples/net/basic/Makefile 2007-09-03 18:44:28 UTC (rev 505)
+++ tiki/examples/net/basic/Makefile 2007-09-04 17:24:54 UTC (rev 506)
@@ -1,13 +1,26 @@
-TIKI_DIR=../../../
-CFLAGS=-I$(TIKI_DIR)$(TIKI_PLAT)/include -I$(TIKI_DIR)include
+TIKI_DIR ?= ../../../
+CFLAGS = -I$(TIKI_DIR)$(TIKI_PLAT)/include -I$(TIKI_DIR)include
OBJS = $(patsubst %.cpp,%.o,$(wildcard src/*.cpp))
-all: $(OBJS)
- $(CXX) $(LDFLAGS) -L$(TIKI_DIR)$(TIKI_PLAT) -L$(TIKI_DIR)$(TIKI_PLAT)/lib $(OBJS) $(TIKI_BASE_LIBS) -o basic
+ifeq ($(TIKI_PLAT),nds)
+NDS_CART_CODE ?= TKNB
+NDS_CART_ID ?= TK
+NDS_CART_NAME ?= TikiBasicNet
+NDS_CART_VERSION ?= 1
+endif
+all: basic
+basic: $(OBJS)
+ $(build_romdisk)
+ $(CXX) $(LDFLAGS) -L$(TIKI_DIR)$(TIKI_PLAT) -L$(TIKI_DIR)$(TIKI_PLAT)/lib $(OBJS) $(TIKI_BASE_LIBS) -o basic$(PLATFORM_BINARY_EXT) $(ROMDISK_OBJ)
+ $(post_build)
+
clean:
- -rm -f $(OBJS) basic
+ -rm -f $(OBJS) basic$(PLATFORM_BINARY_EXT) $(ROMDISK_OBJ)
+ifeq ($(TIKI_PLAT),nds)
+ -rm -f basic.nds basic.ds.gba
+endif
DEPSDIR=$(CURDIR)
include $(TIKI_DIR)$(TIKI_PLAT)/Makefile.rules
Property changes on: tiki/examples/net/basic/src
___________________________________________________________________
Name: svn:ignore
+ *.d
Modified: tiki/examples/net/chat/Makefile
===================================================================
--- tiki/examples/net/chat/Makefile 2007-09-03 18:44:28 UTC (rev 505)
+++ tiki/examples/net/chat/Makefile 2007-09-04 17:24:54 UTC (rev 506)
@@ -1,13 +1,26 @@
-TIKI_DIR=../../../
-CFLAGS=-I$(TIKI_DIR)$(TIKI_PLAT)/include -I$(TIKI_DIR)include
+TIKI_DIR ?= ../../../
+CFLAGS = -I$(TIKI_DIR)$(TIKI_PLAT)/include -I$(TIKI_DIR)include
OBJS = $(patsubst %.cpp,%.o,$(wildcard src/*.cpp))
-all: $(OBJS)
- $(CXX) $(LDFLAGS) -L$(TIKI_DIR)$(TIKI_PLAT) -L$(TIKI_DIR)$(TIKI_PLAT)/lib $(OBJS) $(TIKI_BASE_LIBS) -o chat
+ifeq ($(TIKI_PLAT),nds)
+NDS_CART_CODE ?= TKCH
+NDS_CART_ID ?= TK
+NDS_CART_NAME ?= TikiChat
+NDS_CART_VERSION ?= 1
+endif
+all: chat
+chat: $(OBJS)
+ $(build_romdisk)
+ $(CXX) $(LDFLAGS) -L$(TIKI_DIR)$(TIKI_PLAT) -L$(TIKI_DIR)$(TIKI_PLAT)/lib $(OBJS) $(TIKI_BASE_LIBS) -o chat$(PLATFORM_BINARY_EXT) $(ROMDISK_OBJ)
+ $(post_build)
+
clean:
- -rm -f $(OBJS) chat
+ -rm -f $(OBJS) chat$(PLATFORM_BINARY_EXT) $(ROMDISK_OBJ)
+ifeq ($(TIKI_PLAT),nds)
+ -rm -f chat.nds chat.ds.gba
+endif
DEPSDIR=$(CURDIR)
include $(TIKI_DIR)$(TIKI_PLAT)/Makefile.rules
Property changes on: tiki/examples/net/chat/src
___________________________________________________________________
Name: svn:ignore
+ *.d
Modified: tiki/examples/net/chatd/Makefile
===================================================================
--- tiki/examples/net/chatd/Makefile 2007-09-03 18:44:28 UTC (rev 505)
+++ tiki/examples/net/chatd/Makefile 2007-09-04 17:24:54 UTC (rev 506)
@@ -1,13 +1,26 @@
-TIKI_DIR=../../../
-CFLAGS=-I$(TIKI_DIR)$(TIKI_PLAT)/include -I$(TIKI_DIR)include
+TIKI_DIR ?= ../../../
+CFLAGS = -I$(TIKI_DIR)$(TIKI_PLAT)/include -I$(TIKI_DIR)include
OBJS = $(patsubst %.cpp,%.o,$(wildcard src/*.cpp))
-all: $(OBJS)
- $(CXX) $(LDFLAGS) -L$(TIKI_DIR)$(TIKI_PLAT) -L$(TIKI_DIR)$(TIKI_PLAT)/lib $(OBJS) $(TIKI_BASE_LIBS) -o chatd
+ifeq ($(TIKI_PLAT),nds)
+NDS_CART_CODE ?= TKCD
+NDS_CART_ID ?= TK
+NDS_CART_NAME ?= TikiChatd
+NDS_CART_VERSION ?= 1
+endif
+all: chatd
+chatd: $(OBJS)
+ $(build_romdisk)
+ $(CXX) $(LDFLAGS) -L$(TIKI_DIR)$(TIKI_PLAT) -L$(TIKI_DIR)$(TIKI_PLAT)/lib $(OBJS) $(TIKI_BASE_LIBS) -o chatd$(PLATFORM_BINARY_EXT) $(ROMDISK_OBJ)
+ $(post_build)
+
clean:
- -rm -f $(OBJS) chatd
+ -rm -f $(OBJS) chatd$(PLATFORM_BINARY_EXT) $(ROMDISK_OBJ)
+ifeq ($(TIKI_PLAT),nds)
+ -rm -f chatd.nds chatd.ds.gba
+endif
DEPSDIR=$(CURDIR)
include $(TIKI_DIR)$(TIKI_PLAT)/Makefile.rules
Property changes on: tiki/examples/net/chatd/src
___________________________________________________________________
Name: svn:ignore
+ *.d
Modified: tiki/examples/net/httpclient/Makefile
===================================================================
--- tiki/examples/net/httpclient/Makefile 2007-09-03 18:44:28 UTC (rev 505)
+++ tiki/examples/net/httpclient/Makefile 2007-09-04 17:24:54 UTC (rev 506)
@@ -1,13 +1,27 @@
-TIKI_DIR=../../../
-CFLAGS=-I$(TIKI_DIR)$(TIKI_PLAT)/include -I$(TIKI_DIR)include
+TIKI_DIR ?= ../../../
+CFLAGS = -I$(TIKI_DIR)$(TIKI_PLAT)/include -I$(TIKI_DIR)include
OBJS = $(patsubst %.cpp,%.o,$(wildcard src/*.cpp))
+ROMDISK_DIR=resources
-all: $(OBJS)
- $(CXX) $(LDFLAGS) -L$(TIKI_DIR)$(TIKI_PLAT) -L$(TIKI_DIR)$(TIKI_PLAT)/lib $(OBJS) $(TIKI_BASE_LIBS) -o httpclient
+ifeq ($(TIKI_PLAT),nds)
+NDS_CART_CODE ?= TKHT
+NDS_CART_ID ?= TK
+NDS_CART_NAME ?= TikiHttpTest
+NDS_CART_VERSION ?= 1
+endif
+all: httpclient
+httpclient: $(OBJS)
+ $(build_romdisk)
+ $(CXX) $(LDFLAGS) -L$(TIKI_DIR)$(TIKI_PLAT) -L$(TIKI_DIR)$(TIKI_PLAT)/lib $(OBJS) $(TIKI_BASE_LIBS) -o httpclient$(PLATFORM_BINARY_EXT) $(ROMDISK_OBJ)
+ $(post_build)
+
clean:
- -rm -f $(OBJS) httpclient
+ -rm -f $(OBJS) httpclient$(PLATFORM_BINARY_EXT) $(ROMDISK_OBJ)
+ifeq ($(TIKI_PLAT),nds)
+ -rm -f httpclient.nds httpclient.ds.gba
+endif
DEPSDIR=$(CURDIR)
include $(TIKI_DIR)$(TIKI_PLAT)/Makefile.rules
Property changes on: tiki/examples/net/httpclient/src
___________________________________________________________________
Name: svn:ignore
+ *.d
Modified: tiki/examples/net/httpclient/src/main.cpp
===================================================================
--- tiki/examples/net/httpclient/src/main.cpp 2007-09-03 18:44:28 UTC (rev 505)
+++ tiki/examples/net/httpclient/src/main.cpp 2007-09-04 17:24:54 UTC (rev 506)
@@ -51,7 +51,7 @@
#if TIKI_PLAT == TIKI_DC
RefPtr<Texture> cf = new Texture("/rd/pc-ascii.png", true);
#else
- RefPtr<Texture> cf = new Texture("resources/pc-ascii.png", true);
+ RefPtr<Texture> cf = new Texture("pc-ascii.png", true);
#endif
ConsoleText *console = new ConsoleText(80, 25, cf);
console->setSize(640, 480);
Property changes on: tiki/nds
___________________________________________________________________
Name: svn:ignore
+ libtiki.a
Modified: tiki/nds/Makefile
===================================================================
--- tiki/nds/Makefile 2007-09-03 18:44:28 UTC (rev 505)
+++ tiki/nds/Makefile 2007-09-04 17:24:54 UTC (rev 506)
@@ -56,14 +56,11 @@
clean: clean_subdirs
-rm -f $(BASE_OBJS) $(THIRD_PARTY_OBJS) libtiki.a
+ $(MAKE) -C arm7_template clean TOPDIR=$(CURDIR)
+ $(MAKE) TIKI_PLAT=nds -C$(CURDIR)/../examples clean
examples:
- $(MAKE) TIKI_PLAT=nds TIKI_DIR=$(CURDIR)/../ -C$(CURDIR)/../examples/TikiTest
- $(MAKE) TIKI_PLAT=nds TIKI_DIR=$(CURDIR)/../ -C$(CURDIR)/../examples/console/TikiSnake
- $(MAKE) TIKI_PLAT=nds TIKI_DIR=$(CURDIR)/../ -C$(CURDIR)/../examples/net/basic
- $(MAKE) TIKI_PLAT=nds TIKI_DIR=$(CURDIR)/../ -C$(CURDIR)/../examples/net/chat
- $(MAKE) TIKI_PLAT=nds TIKI_DIR=$(CURDIR)/../ -C$(CURDIR)/../examples/net/chatd
- $(MAKE) TIKI_PLAT=nds TIKI_DIR=$(CURDIR)/../ -C$(CURDIR)/../examples/net/httpclient
+ $(MAKE) TIKI_PLAT=nds -C$(CURDIR)/../examples clean all
package:
zip -9r ../dist/$(SVN_VERSION)/tiki-$(SVN_VERSION)-nds.zip \
@@ -76,12 +73,28 @@
nds/include \
nds/Makefile.rules \
-x "*/.svn/*"
+ cp ../examples/console/TikiSnake/resources/pc-ascii.png \
+ ../examples/console/TikiSnake
+ cp ../examples/net/httpclient/resources/pc-ascii.png \
+ ../examples/net/httpclient
cd .. && \
zip -9ru dist/$(SVN_VERSION)/tiki-$(SVN_VERSION)-nds.zip \
- examples/TikiTest/tikitest \
- examples/console/TikiSnake/tikisnake \
+ examples/TikiTest/tikitest.nds \
+ examples/TikiTest/tikitest.ds.gba \
+ examples/console/TikiSnake/pc-ascii.png \
+ examples/console/TikiSnake/tikisnake.nds \
+ examples/console/TikiSnake/tikisnake.ds.gba \
+ examples/net/basic/basic.nds \
+ examples/net/basic/basic.ds.gba \
+ examples/net/chat/chat.nds \
+ examples/net/chat/chat.ds.gba \
+ examples/net/chatd/chatd.nds \
+ 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/*"
+ rm -f ../examples/console/TikiSnake/pc-ascii.png ../examples/net/httpclient/pc-ascii.png
DEPSDIR=$(CURDIR)
-TIKI_DIR=$(CURDIR)/..
include Makefile.rules
Modified: tiki/nds/Makefile.rules
===================================================================
--- tiki/nds/Makefile.rules 2007-09-03 18:44:28 UTC (rev 505)
+++ tiki/nds/Makefile.rules 2007-09-04 17:24:54 UTC (rev 506)
@@ -8,14 +8,13 @@
$(patsubst %, _clean_dir_%, $(SUBDIRS)):
@$(MAKE) -C $(patsubst _clean_dir_%, %, $@) clean
-ifeq ($(strip $(DEVKITPRO)),)
-$(error "Please set DEVKITPRO in your environment. export DEVKITPRO=<path to>devkitARM)
+ifeq ($(strip $(DEVKITARM)),)
+$(error "Please set DEVKITARM in your environment. export DEVKITARM=<path to>devkitARM)
endif
-TIKI_BASE_LIBS=-ltiki -L$(DEVKITPRO)/libnds/lib -ldswifi9 -lfat -lnds9
+TIKI_BASE_LIBS=-ltiki -L$(DEVKITARM)/libnds/lib -ldswifi9 -lfat -lnds9
-
-CXXFLAGS=-I$(DEVKITPRO)/libnds/include
+CXXFLAGS=-I$(DEVKITARM)/libnds/include
CXXFLAGS+=-I$(TIKI_DIR)/include
CXXFLAGS+=-I$(TIKI_DIR)/nds/include -g
CXXFLAGS+=-I$(TIKI_DIR)/3rdparty/zlib
@@ -33,3 +32,23 @@
LDFLAGS=-specs=ds_arm9.specs -mthumb -mthumb-interwork -mno-fpu -L$(DEVKITPRO)/lib -lgcc
include $(DEVKITARM)/ds_rules
+
+PLATFORM_BINARY_EXT = .arm9.elf
+
+define build_romdisk
+endef
+
+NDS_CART_CODE ?= TIKI
+NDS_CART_ID ?= TK
+NDS_CART_NAME ?= Tiki Example
+NDS_CART_VERSION ?= 1
+
+define post_build
+ @$(MAKE) -C $(TIKI_DIR)/$(TIKI_PLAT)/arm7_template 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
+ @rm -f $@.arm9
+ @rm -f tikiarm7.arm7
+ @rm -f $@.arm9.elf
+endef
Property changes on: tiki/nds/src
___________________________________________________________________
Name: svn:ignore
+ *.d
Property changes on: tiki/nds/src/audio
___________________________________________________________________
Name: svn:ignore
+ *.d
Property changes on: tiki/sdl
___________________________________________________________________
Name: svn:ignore
+ TikiSDL.layout
TikiSDL.depend
libtiki.a
bin
obj
Modified: tiki/sdl/Makefile
===================================================================
--- tiki/sdl/Makefile 2007-09-03 18:44:28 UTC (rev 505)
+++ tiki/sdl/Makefile 2007-09-04 17:24:54 UTC (rev 506)
@@ -57,14 +57,10 @@
clean: clean_subdirs
-rm -f $(BASE_OBJS) $(THIRD_PARTY_OBJS) libtiki.a
+ $(MAKE) TIKI_PLAT=sdl -C$(CURDIR)/../examples clean
examples:
- $(MAKE) TIKI_PLAT=sdl TIKI_DIR=$(CURDIR)/../ -C$(CURDIR)/../examples/TikiTest
- $(MAKE) TIKI_PLAT=sdl TIKI_DIR=$(CURDIR)/../ -C$(CURDIR)/../examples/console/TikiSnake
- $(MAKE) TIKI_PLAT=sdl TIKI_DIR=$(CURDIR)/../ -C$(CURDIR)/../examples/net/basic
- $(MAKE) TIKI_PLAT=sdl TIKI_DIR=$(CURDIR)/../ -C$(CURDIR)/../examples/net/chatd
- $(MAKE) TIKI_PLAT=sdl TIKI_DIR=$(CURDIR)/../ -C$(CURDIR)/../examples/net/chat
- $(MAKE) TIKI_PLAT=sdl TIKI_DIR=$(CURDIR)/../ -C$(CURDIR)/../examples/net/httpclient
+ $(MAKE) TIKI_PLAT=sdl -C$(CURDIR)/../examples clean all
package:
tar -cvf ../dist/$(SVN_VERSION)/tiki-$(SVN_VERSION)-sdl.tar libtiki.a
@@ -75,12 +71,19 @@
--exclude .svn
cp ../examples/console/TikiSnake/resources/pc-ascii.png \
../examples/console/TikiSnake
+ cp ../examples/net/httpclient/resources/pc-ascii.png \
+ ../examples/net/httpclient
tar -uvf ../dist/$(SVN_VERSION)/tiki-$(SVN_VERSION)-sdl.tar -C ../ \
examples/TikiTest/tikitest \
+ examples/net/basic/basic \
+ examples/net/chat/chat \
+ examples/net/chatd/chatd \
+ examples/net/httpclient/httpclient \
+ examples/net/httpclient/pc-ascii.png \
examples/console/TikiSnake/tikisnake \
examples/console/TikiSnake/pc-ascii.png \
--exclude .svn
- rm -f ../examples/console/TikiSnake/pc-ascii.png
+ rm -f ../examples/console/TikiSnake/pc-ascii.png ../examples/net/httpclient/pc-ascii.png
gzip ../dist/$(SVN_VERSION)/tiki-$(SVN_VERSION)-sdl.tar
include Makefile.rules
Modified: tiki/sdl/Makefile.rules
===================================================================
--- tiki/sdl/Makefile.rules 2007-09-03 18:44:28 UTC (rev 505)
+++ tiki/sdl/Makefile.rules 2007-09-04 17:24:54 UTC (rev 506)
@@ -21,3 +21,12 @@
@$(MAKE) -C $(patsubst _clean_dir_%, %, $@) clean
TIKI_BASE_LIBS=-ltiki $(shell openal-config --libs) -lGL -lGLU $(shell sdl-config --libs)
+
+PLATFORM_BINARY_EXT =
+ROMDISK_OBJ =
+
+define build_romdisk
+endef
+
+define post_build
+endef
Property changes on: tiki/src/audio
___________________________________________________________________
Name: svn:ignore
+ *.d
Property changes on: tiki/src/audio/oggvorbis
___________________________________________________________________
Name: svn:ignore
+ *.d
Property changes on: tiki/src/base
___________________________________________________________________
Name: svn:ignore
+ *.d
Property changes on: tiki/src/gl
___________________________________________________________________
Name: svn:ignore
+ *.d
Property changes on: tiki/src/gl/anims
___________________________________________________________________
Name: svn:ignore
+ *.d
Property changes on: tiki/src/gl/drawables
___________________________________________________________________
Name: svn:ignore
+ *.d
Property changes on: tiki/src/gl/triggers
___________________________________________________________________
Name: svn:ignore
+ *.d
Property changes on: tiki/src/hid
___________________________________________________________________
Name: svn:ignore
+ *.d
Property changes on: tiki/src/image
___________________________________________________________________
Name: svn:ignore
+ *.d
Property changes on: tiki/src/math
___________________________________________________________________
Name: svn:ignore
+ *.d
Property changes on: tiki/src/net
___________________________________________________________________
Name: svn:ignore
+ *.d
Property changes on: tiki/src/net/http
___________________________________________________________________
Name: svn:ignore
+ *.d
Property changes on: tiki/src/net/util
___________________________________________________________________
Name: svn:ignore
+ *.d
Property changes on: tiki/src/thread
___________________________________________________________________
Name: svn:ignore
+ *.d
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
