diff options
author | Kent Mein <mein@cs.umn.edu> | 2002-12-16 15:02:24 +0300 |
---|---|---|
committer | Kent Mein <mein@cs.umn.edu> | 2002-12-16 15:02:24 +0300 |
commit | 8b9b761e978369658b3afea8e3cd1822ce4a3cf1 (patch) | |
tree | 5291d4d6b219a328bfeae63409f0e1191fb1a087 | |
parent | cca22768dcfc91288f52874334a42efa72fa81b0 (diff) |
Created a Makefile and got it actually to compile :)
Kent
--
mein@cs.umn.edu
-rw-r--r-- | intern/bmfont/test/Makefile | 63 | ||||
-rw-r--r-- | intern/bmfont/test/simpletest/BMF_Test.cpp (renamed from intern/bmfont/test/BMF_Test.cpp) | 30 | ||||
-rw-r--r-- | intern/bmfont/test/simpletest/Makefile | 45 |
3 files changed, 123 insertions, 15 deletions
diff --git a/intern/bmfont/test/Makefile b/intern/bmfont/test/Makefile new file mode 100644 index 00000000000..f7e0f927722 --- /dev/null +++ b/intern/bmfont/test/Makefile @@ -0,0 +1,63 @@ +# ***** BEGIN GPL/BL DUAL LICENSE BLOCK ***** +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. The Blender +# Foundation also sells licenses for use in proprietary software under +# the Blender License. See http://www.blender.org/BL/ for information +# about this. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software Foundation, +# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# +# The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. +# All rights reserved. +# +# The Original Code is: all of this file. +# +# Contributor(s): none yet. +# +# ***** END GPL/BL DUAL LICENSE BLOCK ***** +# Test the bmfont module +# + +LIBNAME = bmfont +SOURCEDIR = intern/$(LIBNAME)/test +DIR = $(OCGDIR)/$(SOURCEDIR) +DIRS = simpletest + +include nan_subdirs.mk +include nan_compile.mk +include nan_link.mk + +TESTLIBS = $(OCGDIR)/intern/$(LIBNAME)/$(DEBUG_DIR)lib$(LIBNAME).a +TESTLIBS += $(NAN_STRING)/lib/$(DEBUG_DIR)libstring.a +TESTLIBS += $(LCGDIR)/ghost/$(DEBUG_DIR)lib/libghost.a + + +ifeq ($(OS),$(findstring $(OS), "beos darwin linux freebsd openbsd")) + TESTLIBS += -L/usr/X11R6/lib -lglut -pthread +endif + +ifeq ($(OS),$(findstring $(OS), "solaris")) + TESTLIBS += -L/usr/openwin/lib -lglut -lX11 -lGL -lGLU -lXmu +endif + + +all debug:: + @echo "****> linking $@ in $(SOURCEDIR)" + $(CCC) $(LDFLAGS) -o $(DIR)/$(DEBUG_DIR)BMF_Test $(DIR)/BMF_Test.o $(TESTLIBS) + +clean:: + $(RM) $(DIR)/BMF_Test $(DIR)/debug/BMF_Test + +test:: $(DIR)/BMF_Test + $(DIR)/BMF_Test $(NAN_TEST_VERBOSITY) + diff --git a/intern/bmfont/test/BMF_Test.cpp b/intern/bmfont/test/simpletest/BMF_Test.cpp index 8dbd4b3ce75..00f7bc30f45 100644 --- a/intern/bmfont/test/BMF_Test.cpp +++ b/intern/bmfont/test/simpletest/BMF_Test.cpp @@ -44,6 +44,9 @@ #include <config.h> #endif +#define FALSE 0 +#define TRUE 1 + #if defined(WIN32) || defined(__APPLE__) #ifdef WIN32 #include <windows.h> @@ -75,7 +78,7 @@ static void drawGL() GLint x = 10, y = 10; ::glRasterPos2i(x, y); - BMF_FontPtr font = BMF_GetFont(BMF_kHelvetica10); + BMF_Font *font = BMF_GetFont(BMF_kHelvetica10); BMF_DrawString(font, "Helvetica 10 point"); y += 14; ::glRasterPos2i(x, y); @@ -148,7 +151,7 @@ Application::Application(GHOST_ISystem* system) // Create the main window STR_String title1 ("gears - main window"); - m_mainWindow = system->createWindow(title1, 10, 64, 320, 200, GHOST_kWindowStateNormal, GHOST_kDrawingContextTypeOpenGL); + m_mainWindow = system->createWindow(title1, 10, 64, 320, 200, GHOST_kWindowStateNormal, GHOST_kDrawingContextTypeOpenGL,FALSE); if (!m_mainWindow) { std::cout << "could not create main window\n"; exit(-1); @@ -163,15 +166,13 @@ bool Application::processEvent(GHOST_IEvent* event) switch (event->getType()) { case GHOST_kEventWindowClose: { - GHOST_TEventWindowData* windowData = (GHOST_TEventWindowData*)((GHOST_IEvent*)event)->getData(); - GHOST_IWindow* window = windowData->window; - if (window == m_mainWindow) { + GHOST_IWindow* window2 = event->getWindow(); + if (window2 == m_mainWindow) { exit(0); + } else { + m_system->disposeWindow(window2); } - else { - m_system->disposeWindow(window); - } - } + } break; case GHOST_kEventWindowActivate: @@ -182,13 +183,12 @@ bool Application::processEvent(GHOST_IEvent* event) break; case GHOST_kEventWindowUpdate: { - GHOST_TEventWindowData* windowData = (GHOST_TEventWindowData*)((GHOST_IEvent*)event)->getData(); - GHOST_IWindow* window = windowData->window; - if (!m_system->validWindow(window)) break; + GHOST_IWindow* window2 = event->getWindow(); + if (!m_system->validWindow(window2)) break; { - setViewPortGL(window); + setViewPortGL(window2); drawGL(); - window->swapBuffers(); + window2->swapBuffers(); } } break; @@ -216,7 +216,7 @@ int main(int /*argc*/, char** /*argv*/) // Enter main loop while (!app.m_exitRequested) { - fSystem->processEvents(); + fSystem->processEvents(TRUE); fSystem->dispatchEvents(); } } diff --git a/intern/bmfont/test/simpletest/Makefile b/intern/bmfont/test/simpletest/Makefile new file mode 100644 index 00000000000..190a39f0e9b --- /dev/null +++ b/intern/bmfont/test/simpletest/Makefile @@ -0,0 +1,45 @@ +# ***** BEGIN GPL/BL DUAL LICENSE BLOCK ***** +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. The Blender +# Foundation also sells licenses for use in proprietary software under +# the Blender License. See http://www.blender.org/BL/ for information +# about this. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software Foundation, +# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# +# The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. +# All rights reserved. +# +# The Original Code is: all of this file. +# +# Contributor(s): none yet. +# +# ***** END GPL/BL DUAL LICENSE BLOCK ***** +# Test the bmfont module +# + +LIBNAME = bmfont +DIR = $(OCGDIR)/intern/$(LIBNAME)/test + +# we don't want a library here, only object files: +ALLTARGETS = $(OBJS) + +include nan_compile.mk + +CCFLAGS += $(LEVEL_2_CPP_WARNINGS) + +CPPFLAGS = -I../.. +CPPFLAGS += -I../../intern +CPPFLAGS += -I$(OPENGL_HEADERS) +CPPFLAGS += -I$(NAN_STRING)/include +CPPFLAGS += -I$(NAN_GHOST)/include |