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

[<c99...@us...>]

Revision: 414
          http://svn.sourceforge.net/cadcdev/?rev=414&view=rev
Author:   c99koder
Date:     2007-06-30 21:19:13 -0700 (Sat, 30 Jun 2007)

Log Message:
-----------
Tiki: Nintendo DS build fixes

Modified Paths:
--------------
    tiki/nds/Makefile
    tiki/nds/Makefile.rules
    tiki/src/base/file.cpp
    tiki/src/hid/eventcollector.cpp

Modified: tiki/nds/Makefile
===================================================================
--- tiki/nds/Makefile	2007-06-29 05:36:10 UTC (rev 413)
+++ tiki/nds/Makefile	2007-07-01 04:19:13 UTC (rev 414)
@@ -51,7 +51,7 @@
 	$(AR) ru libtiki.a $(BASE_OBJS) $(THIRD_PARTY_OBJS)
 
 clean: clean_subdirs
-	-rm -f $(BASE_OBJS) libtiki.a
+	-rm -f $(BASE_OBJS) $(THIRD_PARTY_OBJS) libtiki.a
 
 DEPSDIR=$(CURDIR)
 TIKI_DIR=$(CURDIR)/..

Modified: tiki/nds/Makefile.rules
===================================================================
--- tiki/nds/Makefile.rules	2007-06-29 05:36:10 UTC (rev 413)
+++ tiki/nds/Makefile.rules	2007-07-01 04:19:13 UTC (rev 414)
@@ -25,9 +25,9 @@
 CXXFLAGS+=-I$(TIKI_DIR)/3rdparty/libvorbis/include
 CXXFLAGS+=-I$(TIKI_DIR)/3rdparty/libvorbis/lib
 CXXFLAGS+=-DARM9
-CXXFLAGS+=-mcpu=arm9tdmi -mtune=arm9tdmi -ffast-math -mthumb -mthumb-interwork
+CXXFLAGS+=-march=armv5te -mtune=arm946e-s -fomit-frame-pointer -ffast-math -mthumb -mthumb-interwork
 CFLAGS=$(CXXFLAGS)
-CXXFLAGS+=-fno-rtti
+CXXFLAGS+=-fno-rtti -fno-exceptions
 
 LDFLAGS=-specs=ds_arm9.specs -mthumb -mthumb-interwork -mno-fpu -L$(DEVKITPRO)/lib -lgcc
 

Modified: tiki/src/base/file.cpp
===================================================================
--- tiki/src/base/file.cpp	2007-06-29 05:36:10 UTC (rev 413)
+++ tiki/src/base/file.cpp	2007-07-01 04:19:13 UTC (rev 414)
@@ -9,6 +9,9 @@
 #include "pch.h"
 #include "Tiki/file.h"
 
+#if TIKI_PLAT == TIKI_NDS
+#include <sys/param.h>
+#endif
 #include <machine/endian.h>
 
 File::File() {

Modified: tiki/src/hid/eventcollector.cpp
===================================================================
--- tiki/src/hid/eventcollector.cpp	2007-06-29 05:36:10 UTC (rev 413)
+++ tiki/src/hid/eventcollector.cpp	2007-07-01 04:19:13 UTC (rev 414)
@@ -13,7 +13,9 @@
 
 EventCollector::EventCollector(bool startListening) {
 	m_cookie = -1;
+#if TIKI_PLAT != TIKI_NDS
 	m_mutex = new Thread::Mutex();
+#endif
 	if (startListening)
 		start();
 }
@@ -24,14 +26,18 @@
 }
 
 void EventCollector::start() {
+#if TIKI_PLAT != TIKI_NDS
 	Thread::AutoLock lock(m_mutex);
+#endif
 
 	assert( m_cookie < 0 );
 	m_cookie = callbackReg(hidCallbackStatic, this);
 }
 
 void EventCollector::stop() {
+#if TIKI_PLAT != TIKI_NDS
 	Thread::AutoLock lock(m_mutex);
+#endif
 
 	assert( m_cookie >= 0 );
 	callbackUnreg(m_cookie);
@@ -41,12 +47,16 @@
 }
 
 bool EventCollector::eventsAvailable() const {
+#if TIKI_PLAT != TIKI_NDS
 	Thread::AutoLock lock(m_mutex);
+#endif
 	return !m_events.empty();
 }
 
 bool EventCollector::getEvent(Event & evtOut) {
+#if TIKI_PLAT != TIKI_NDS
 	Thread::AutoLock lock(m_mutex);
+#endif
 	if (m_events.empty())
 		return false;
 	
@@ -60,7 +70,9 @@
 }
 
 void EventCollector::hidCallback(const Event & evt) {
+#if TIKI_PLAT != TIKI_NDS
 	Thread::AutoLock lock(m_mutex);
+#endif
 	if (m_cookie >= 0)
 		m_events.push(evt);
 }


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