[cadcdev-svn-commits] SF.net SVN: cadcdev: [339] tiki/sdl

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

Revision: 339
Author:   atani
Date:     2006-06-08 13:44:50 -0700 (Thu, 08 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/cadcdev/?rev=339&view=rev

Log Message:
-----------
Updated SDL init_shutdown.cpp for OpenAL 20050504
Updated example Makefiles to link to Makefile.rules properly
Updated TikiTest/src/TikiTest.cpp to include tiki.h vs Tiki.h
Updated TikiTest and TikiSnake to deal with a failed Tiki::init()

Modified Paths:
--------------
    tiki/examples/TikiTest/Makefile
    tiki/examples/TikiTest/src/TikiTest.cpp
    tiki/examples/TikiTest/src/test.cpp
    tiki/examples/console/TikiSnake/Makefile
    tiki/examples/console/TikiSnake/src/snake.cpp
    tiki/sdl/Makefile.rules
    tiki/sdl/src/init_shutdown.cpp
Modified: tiki/examples/TikiTest/Makefile
===================================================================
--- tiki/examples/TikiTest/Makefile	2006-06-06 03:57:43 UTC (rev 338)
+++ tiki/examples/TikiTest/Makefile	2006-06-08 20:44:50 UTC (rev 339)
@@ -1,11 +1,11 @@
 
-CFLAGS=-I../$(TIKI_PLAT)/include -I../include
+CFLAGS=-I../../$(TIKI_PLAT)/include -I../../include
 OBJS = $(patsubst %.cpp,%.o,$(wildcard src/*.cpp))
 
 all: $(OBJS)
-	$(CXX) -L../$(TIKI_PLAT) $(OBJS) $(TIKI_BASE_LIBS) -o tikitest
+	$(CXX) -L../../$(TIKI_PLAT) $(OBJS) $(TIKI_BASE_LIBS) -o tikitest
 
 clean:
 	-rm -f $(OBJS) tikitest
 
-include ../$(TIKI_PLAT)/Makefile.rules
+include ../../$(TIKI_PLAT)/Makefile.rules

Modified: tiki/examples/TikiTest/src/TikiTest.cpp
===================================================================
--- tiki/examples/TikiTest/src/TikiTest.cpp	2006-06-06 03:57:43 UTC (rev 338)
+++ tiki/examples/TikiTest/src/TikiTest.cpp	2006-06-08 20:44:50 UTC (rev 339)
@@ -6,11 +6,11 @@
  *
  */
 
-#include <Tiki/Tiki.h>
+#include <Tiki/tiki.h>
 #include <pch.h>
 
-#if TIKI_PLAT == TIKI_WIN32
-#include <windows.h>
+#if TIKI_PLAT == TIKI_WIN32
+#include <windows.h>
 
 static char szAppName[] = "TikiTest";
 int APIENTRY WinMain(HINSTANCE hInst, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow)

Modified: tiki/examples/TikiTest/src/test.cpp
===================================================================
--- tiki/examples/TikiTest/src/test.cpp	2006-06-06 03:57:43 UTC (rev 338)
+++ tiki/examples/TikiTest/src/test.cpp	2006-06-08 20:44:50 UTC (rev 339)
@@ -232,7 +232,10 @@
 
 extern "C" int tiki_main(int argc, char **argv) {
 	// Init Tiki
-	Tiki::init(argc, argv);
+	if(!Tiki::init(argc, argv))
+	{
+		exit(-1);
+	}
 	Tiki::setName("TikiTest", NULL);
 	Tiki::GL::showCursor(false);
 	Hid::callbackReg(tkCallback, NULL);

Modified: tiki/examples/console/TikiSnake/Makefile
===================================================================
--- tiki/examples/console/TikiSnake/Makefile	2006-06-06 03:57:43 UTC (rev 338)
+++ tiki/examples/console/TikiSnake/Makefile	2006-06-08 20:44:50 UTC (rev 339)
@@ -1,11 +1,11 @@
 
-CFLAGS=-I../../$(TIKI_PLAT)/include -I../../include
+CFLAGS=-I../../../$(TIKI_PLAT)/include -I../../../include
 OBJS = $(patsubst %.cpp,%.o,$(wildcard src/*.cpp))
 
 all: $(OBJS)
-	$(CXX) -L../$(TIKI_PLAT) $(OBJS) $(TIKI_BASE_LIBS) -o tikisnake
+	$(CXX) -L../../../$(TIKI_PLAT) $(OBJS) $(TIKI_BASE_LIBS) -o tikisnake
 
 clean:
 	-rm -f $(OBJS) tikisnake
 
-include ../../$(TIKI_PLAT)/Makefile.rules
+include ../../../$(TIKI_PLAT)/Makefile.rules

Modified: tiki/examples/console/TikiSnake/src/snake.cpp
===================================================================
--- tiki/examples/console/TikiSnake/src/snake.cpp	2006-06-06 03:57:43 UTC (rev 338)
+++ tiki/examples/console/TikiSnake/src/snake.cpp	2006-06-08 20:44:50 UTC (rev 339)
@@ -62,7 +62,10 @@
 	srand(time(NULL));
 		
 	// Init Tiki
-	Tiki::init(argc, argv);
+	if(!Tiki::init(argc, argv))
+	{
+		exit(-1);
+	}
 	Tiki::setName("SnakeyGame", NULL);
 	Hid::callbackReg(tkCallback, NULL);
 

Modified: tiki/sdl/Makefile.rules
===================================================================
--- tiki/sdl/Makefile.rules	2006-06-06 03:57:43 UTC (rev 338)
+++ tiki/sdl/Makefile.rules	2006-06-08 20:44:50 UTC (rev 339)
@@ -20,4 +20,4 @@
 $(patsubst %, _clean_dir_%, $(SUBDIRS)):
 	@$(MAKE) -C $(patsubst _clean_dir_%, %, $@) clean
 
-TIKI_BASE_LIBS=-ltiki -lopenal -lalut -lGL -lGLU -lpthread -lSDL
+TIKI_BASE_LIBS=-ltiki $(shell openal-config --libs) -lGL -lGLU -lpthread -lSDL

Modified: tiki/sdl/src/init_shutdown.cpp
===================================================================
--- tiki/sdl/src/init_shutdown.cpp	2006-06-06 03:57:43 UTC (rev 338)
+++ tiki/sdl/src/init_shutdown.cpp	2006-06-08 20:44:50 UTC (rev 339)
@@ -9,6 +9,7 @@
 #include "pch.h"
 
 #include <AL/al.h>
+#include <AL/alc.h>
 #include <AL/alut.h>
 
 #include "Tiki/sound.h"
@@ -28,7 +29,7 @@
 		return false;
 	}
 
-	dev = alcOpenDevice("sdl");
+	dev = alcOpenDevice((ALubyte *)"sdl");
 	if(dev == NULL)
 	{
 		fprintf(stderr, "Unable to initialize OpenAL: %s\n", alGetError());
@@ -43,7 +44,7 @@
 		else
 		{
 			alcMakeContextCurrent(context);
-			alutInitWithoutContext(&argc, argv);
+			alutInit(&argc, argv);
 			Audio::Sound::initGlobal();
 			Audio::Stream::initGlobal();
 		}


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