|
From: <at...@us...> - 2007-09-11 17:57:58
|
Revision: 514
http://cadcdev.svn.sourceforge.net/cadcdev/?rev=514&view=rev
Author: atani
Date: 2007-09-11 10:57:54 -0700 (Tue, 11 Sep 2007)
Log Message:
-----------
change init flags to be TIKI_INIT_* to prevent conflicts with KOS
Modified Paths:
--------------
tiki/examples/net/chatd/src/ChatServer.cpp
tiki/examples/net/httpclient/src/HttpClient.cpp
tiki/include/Tiki/tiki.h
tiki/sdl/src/init_shutdown.cpp
tiki/sdl/src/plathid.cpp
tiki/src/base/init_flags_default.cpp
tiki/win32/src/init_shutdown.cpp
tiki/win32/src/platgl.cpp
Property Changed:
----------------
tiki/examples/TikiTest/
tiki/examples/console/TikiSnake/
Property changes on: tiki/examples/TikiTest
___________________________________________________________________
Name: svn:ignore
- Debug
Release
*.user
*.nds
*.ds.gba
+ Debug
Release
*.user
*.nds
*.ds.gba
*.elf
Property changes on: tiki/examples/console/TikiSnake
___________________________________________________________________
Name: svn:ignore
- Debug
Release
*.user
*.nds
*.ds.gba
+ Debug
Release
*.user
*.nds
*.ds.gba
*.elf
Modified: tiki/examples/net/chatd/src/ChatServer.cpp
===================================================================
--- tiki/examples/net/chatd/src/ChatServer.cpp 2007-09-11 16:37:50 UTC (rev 513)
+++ tiki/examples/net/chatd/src/ChatServer.cpp 2007-09-11 17:57:54 UTC (rev 514)
@@ -9,7 +9,7 @@
#include <Tiki/tiki.h>
#include <pch.h>
-TIKI_INIT_FLAGS(INIT_NONE);
+TIKI_INIT_FLAGS(TIKI_INIT_NOTHING);
#if TIKI_PLAT == TIKI_WIN32
#include <windows.h>
Modified: tiki/examples/net/httpclient/src/HttpClient.cpp
===================================================================
--- tiki/examples/net/httpclient/src/HttpClient.cpp 2007-09-11 16:37:50 UTC (rev 513)
+++ tiki/examples/net/httpclient/src/HttpClient.cpp 2007-09-11 17:57:54 UTC (rev 514)
@@ -9,6 +9,11 @@
#include <Tiki/tiki.h>
#include <pch.h>
+#if TIKI_PLAT == TIKI_DC
+extern uint8 romdisk[];
+KOS_INIT_ROMDISK(romdisk);
+#endif
+
#if TIKI_PLAT == TIKI_WIN32
#include <windows.h>
Modified: tiki/include/Tiki/tiki.h
===================================================================
--- tiki/include/Tiki/tiki.h 2007-09-11 16:37:50 UTC (rev 513)
+++ tiki/include/Tiki/tiki.h 2007-09-11 17:57:54 UTC (rev 514)
@@ -64,27 +64,27 @@
#define TIKI_INIT_FLAGS(flags) uint32 Tiki::g_tiki_init_flags = (flags);
typedef enum {
// HID options
- INIT_HID_KEYBOARD = 0x00000001,
- INIT_HID_MOUSE = 0x00000002,
- INIT_HID_JOYSTICK = 0x00000004,
- INIT_HID_DEFAULT = INIT_HID_KEYBOARD | INIT_HID_MOUSE | INIT_HID_JOYSTICK,
- INIT_HID_MASK = 0x000000FF,
+ TIKI_INIT_HID_KEYBOARD = 0x00000001,
+ TIKI_INIT_HID_MOUSE = 0x00000002,
+ TIKI_INIT_HID_JOYSTICK = 0x00000004,
+ TIKI_INIT_HID_DEFAULT = TIKI_INIT_HID_KEYBOARD | TIKI_INIT_HID_MOUSE | TIKI_INIT_HID_JOYSTICK,
+ TIKI_INIT_HID_MASK = 0x000000FF,
// Graphic related options
- INIT_VIDEO_WINDOWED = 0x00000100,
- INIT_VIDEO_FULLSCREEN = 0x00000200,
- INIT_VIDEO_CENTERED = 0x00000400,
- INIT_VIDEO_DEFAULT = INIT_VIDEO_WINDOWED | INIT_VIDEO_CENTERED,
- INIT_VIDEO_MASK = 0x0000FF00,
+ TIKI_INIT_VIDEO_WINDOWED = 0x00000100,
+ TIKI_INIT_VIDEO_FULLSCREEN = 0x00000200,
+ TIKI_INIT_VIDEO_CENTERED = 0x00000400,
+ TIKI_INIT_VIDEO_DEFAULT = TIKI_INIT_VIDEO_WINDOWED | TIKI_INIT_VIDEO_CENTERED,
+ TIKI_INIT_VIDEO_MASK = 0x0000FF00,
// Audio related options
- INIT_AUDIO_STREAM = 0x00010000,
- INIT_AUDIO_SFX = 0x00020000,
- INIT_AUDIO_DEFAULT = INIT_AUDIO_STREAM | INIT_AUDIO_SFX,
- INIT_AUDIO_MASK = 0x00FF0000,
+ TIKI_INIT_AUDIO_STREAM = 0x00010000,
+ TIKI_INIT_AUDIO_SFX = 0x00020000,
+ TIKI_INIT_AUDIO_DEFAULT = TIKI_INIT_AUDIO_STREAM | TIKI_INIT_AUDIO_SFX,
+ TIKI_INIT_AUDIO_MASK = 0x00FF0000,
- INIT_NONE = 0x00000000,
- INIT_DEFAULT = INIT_HID_DEFAULT | INIT_VIDEO_DEFAULT | INIT_AUDIO_DEFAULT,
+ TIKI_INIT_NOTHING = 0x00000000,
+ TIKI_INIT_DEFAULTS = TIKI_INIT_HID_DEFAULT | TIKI_INIT_VIDEO_DEFAULT | TIKI_INIT_AUDIO_DEFAULT,
} TIKI_INIT_FLAGS_ENUM;
}
Modified: tiki/sdl/src/init_shutdown.cpp
===================================================================
--- tiki/sdl/src/init_shutdown.cpp 2007-09-11 16:37:50 UTC (rev 513)
+++ tiki/sdl/src/init_shutdown.cpp 2007-09-11 17:57:54 UTC (rev 514)
@@ -23,7 +23,7 @@
fprintf( stderr, "Unable to initialize SDL: %s\n", SDL_GetError() );
return false;
}
- if(g_tiki_init_flags & INIT_AUDIO_MASK) {
+ if(g_tiki_init_flags & TIKI_INIT_AUDIO_MASK) {
// OpenAL team doesnt seem to increment version numbers when they make signature changes
// use the header ifdef/endif flag to figure out version since this seems to have changed
// between the compatible versions
@@ -43,14 +43,14 @@
alcProcessContext( context );
}
}
- if(g_tiki_init_flags & INIT_AUDIO_SFX) {
+ if(g_tiki_init_flags & TIKI_INIT_AUDIO_SFX) {
Audio::Sound::initGlobal();
}
- if(g_tiki_init_flags & INIT_AUDIO_STREAM) {
+ if(g_tiki_init_flags & TIKI_INIT_AUDIO_STREAM) {
Audio::Stream::initGlobal();
}
}
- if(g_tiki_init_flags & INIT_VIDEO_MASK) {
+ if(g_tiki_init_flags & TIKI_INIT_VIDEO_MASK) {
if ( SDL_SetVideoMode( 640, 480, 16, SDL_OPENGL ) == NULL ) {
fprintf( stderr, "Unable to Create OpenGL Window: %s\n", SDL_GetError() );
return false;
@@ -72,10 +72,10 @@
}
void shutdown() {
- if(g_tiki_init_flags & INIT_AUDIO_SFX) {
+ if(g_tiki_init_flags & TIKI_INIT_AUDIO_SFX) {
Audio::Sound::shutdownGlobal();
}
- if(g_tiki_init_flags & INIT_AUDIO_STREAM) {
+ if(g_tiki_init_flags & TIKI_INIT_AUDIO_STREAM) {
Audio::Stream::shutdownGlobal();
}
Hid::shutdown();
Modified: tiki/sdl/src/plathid.cpp
===================================================================
--- tiki/sdl/src/plathid.cpp 2007-09-11 16:37:50 UTC (rev 513)
+++ tiki/sdl/src/plathid.cpp 2007-09-11 17:57:54 UTC (rev 514)
@@ -64,7 +64,7 @@
bool Hid::platInit() {
char junk = '0';
- if(g_tiki_init_flags & INIT_HID_KEYBOARD) {
+ if(g_tiki_init_flags & TIKI_INIT_HID_KEYBOARD) {
Tiki::Debug::printf("Initializing Keyboard\n");
SDLkb = new KbDevice();
keybd_thread = SDL_CreateThread( HandleKeyboard, &junk );
@@ -73,7 +73,7 @@
evtKB.dev = SDLkb;
sendEvent( evtKB );
}
- if(g_tiki_init_flags & INIT_HID_MOUSE) {
+ if(g_tiki_init_flags & TIKI_INIT_HID_MOUSE) {
Tiki::Debug::printf("Initializing Mouse\n");
SDLMouse = new MouseDevice();
SDLMouse->setXY( 0, 0 );
@@ -91,14 +91,14 @@
void Hid::platShutdown() {
done = 1;
SDL_Delay( 20 );
- if(g_tiki_init_flags & INIT_HID_MOUSE) {
+ if(g_tiki_init_flags & TIKI_INIT_HID_MOUSE) {
Tiki::Debug::printf("Detaching Mouse\n");
SDL_WaitThread( mouse_thread, NULL );
Event evtMouse( Event::EvtDetach );
evtMouse.dev = SDLMouse;
sendEvent( evtMouse );
}
- if(g_tiki_init_flags & INIT_HID_KEYBOARD) {
+ if(g_tiki_init_flags & TIKI_INIT_HID_KEYBOARD) {
Tiki::Debug::printf("Detaching Keyboard\n");
SDL_WaitThread( keybd_thread, NULL );
Event evtKB( Event::EvtDetach );
Modified: tiki/src/base/init_flags_default.cpp
===================================================================
--- tiki/src/base/init_flags_default.cpp 2007-09-11 16:37:50 UTC (rev 513)
+++ tiki/src/base/init_flags_default.cpp 2007-09-11 17:57:54 UTC (rev 514)
@@ -9,4 +9,4 @@
#include "pch.h"
#include "Tiki/tiki.h"
-TIKI_INIT_FLAGS(INIT_DEFAULT);
+TIKI_INIT_FLAGS(TIKI_INIT_DEFAULTS);
Modified: tiki/win32/src/init_shutdown.cpp
===================================================================
--- tiki/win32/src/init_shutdown.cpp 2007-09-11 16:37:50 UTC (rev 513)
+++ tiki/win32/src/init_shutdown.cpp 2007-09-11 17:57:54 UTC (rev 514)
@@ -16,7 +16,7 @@
// Let us run with millisecond precision if possible.
timeBeginPeriod( 1 );
- if(g_tiki_init_flags & INIT_AUDIO_MASK) {
+ if(g_tiki_init_flags & TIKI_INIT_AUDIO_MASK) {
ALCdevice *dev = NULL;
ALCcontext *ctx = NULL;
@@ -28,15 +28,15 @@
alcProcessContext( ctx );
} // if
} // if
- if(g_tiki_init_flags & INIT_AUDIO_SFX) {
+ if(g_tiki_init_flags & TIKI_INIT_AUDIO_SFX) {
Audio::Sound::initGlobal();
}
- if(g_tiki_init_flags & INIT_AUDIO_STREAM) {
+ if(g_tiki_init_flags & TIKI_INIT_AUDIO_STREAM) {
Audio::Stream::initGlobal();
}
}
- if(g_tiki_init_flags & INIT_AUDIO_STREAM) {
+ if(g_tiki_init_flags & TIKI_INIT_VIDEO_MASK) {
GL::Plxcompat::plx_mat3d_init( 640, 480 );
}
@@ -45,10 +45,10 @@
void Tiki::shutdown() {
Hid::shutdown();
- if(g_tiki_init_flags & INIT_AUDIO_STREAM) {
+ if(g_tiki_init_flags & TIKI_INIT_AUDIO_STREAM) {
Audio::Stream::shutdownGlobal();
}
- if(g_tiki_init_flags & INIT_AUDIO_SFX) {
+ if(g_tiki_init_flags & TIKI_INIT_AUDIO_SFX) {
Audio::Sound::shutdownGlobal();
}
Modified: tiki/win32/src/platgl.cpp
===================================================================
--- tiki/win32/src/platgl.cpp 2007-09-11 16:37:50 UTC (rev 513)
+++ tiki/win32/src/platgl.cpp 2007-09-11 17:57:54 UTC (rev 514)
@@ -109,12 +109,12 @@
UINT min = WM_KEYFIRST, max = WM_MOUSELAST;
- if(g_tiki_init_flags & INIT_HID_KEYBOARD &&
- !(g_tiki_init_flags & INIT_HID_MOUSE)) {
+ if(g_tiki_init_flags & TIKI_INIT_HID_KEYBOARD &&
+ !(g_tiki_init_flags & TIKI_INIT_HID_MOUSE)) {
max = WM_KEYLAST;
}
- else if(g_tiki_init_flags & INIT_HID_MOUSE &&
- !(g_tiki_init_flags & INIT_HID_KEYBOARD)) {
+ else if(g_tiki_init_flags & TIKI_INIT_HID_MOUSE &&
+ !(g_tiki_init_flags & TIKI_INIT_HID_KEYBOARD)) {
min = WM_MOUSEFIRST;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|