[mupen64plus-core] 184/310: Imported Upstream version 1.99.5+117+a5698f5f67c1

[Sven Eckelmann]

This is an automated email from the git hooks/post-receive script.

ecsv-guest pushed a commit to branch armhf_test
in repository mupen64plus-core.

commit 4afe34ea0631f12f75286e221736a1e82f8f0e49
Author: Sven Eckelmann <sven at narfation.org>
Date:   Sun Oct 7 14:21:47 2012 +0200

    Imported Upstream version 1.99.5+117+a5698f5f67c1
---
 projects/msvc8/mupen64plus-core.vcproj |  4 ++--
 projects/unix/Makefile                 | 33 +++++++++++++++++++---------
 src/osd/osd.h                          | 39 ++++++++++++++++++++++++++++++++++
 3 files changed, 64 insertions(+), 12 deletions(-)

diff --git a/projects/msvc8/mupen64plus-core.vcproj b/projects/msvc8/mupen64plus-core.vcproj
index 7daf781..a688dfb 100644
--- a/projects/msvc8/mupen64plus-core.vcproj
+++ b/projects/msvc8/mupen64plus-core.vcproj
@@ -41,7 +41,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\src;..\..\..\mupen64plus-win32-deps\SDL-1.2.14\include;..\..\..\mupen64plus-win32-deps\zlib-1.2.3\include;..\..\..\mupen64plus-win32-deps\libpng-1.2.37\include;..\..\..\mupen64plus-win32-deps\freetype-2.3.5-1\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;DYNAREC;inline=__inline"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;DYNAREC;inline=__inline;M64P_OSD"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -120,7 +120,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories="..\..\src;..\..\..\mupen64plus-win32-deps\SDL-1.2.14\include;..\..\..\mupen64plus-win32-deps\zlib-1.2.3\include;..\..\..\mupen64plus-win32-deps\libpng-1.2.37\include;..\..\..\mupen64plus-win32-deps\freetype-2.3.5-1\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;DYNAREC;inline=__inline"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;DYNAREC;inline=__inline;M64P_OSD"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
diff --git a/projects/unix/Makefile b/projects/unix/Makefile
index b4c3b66..cad33bc 100644
--- a/projects/unix/Makefile
+++ b/projects/unix/Makefile
@@ -176,14 +176,8 @@ endif
 ifeq ($(shell pkg-config --modversion freetype2 2>/dev/null),)
   $(error No FreeType 2 development libraries found!)
 endif
-ifeq ($(shell pkg-config --modversion gl 2>/dev/null),)
-  $(error No OpenGL development libraries found!)
-endif
-ifeq ($(shell pkg-config --modversion glu 2>/dev/null),)
-  $(error No OpenGL utility development libraries found!)
-endif
-CFLAGS += $(shell pkg-config --cflags libpng zlib freetype2 gl glu)
-LDLIBS +=  $(shell pkg-config --libs libpng zlib freetype2 gl glu)
+CFLAGS += $(shell pkg-config --cflags libpng zlib freetype2)
+LDLIBS +=  $(shell pkg-config --libs libpng zlib freetype2)
 
 # test for presence of SDL
 ifeq ($(shell which sdl-config 2>/dev/null),)
@@ -192,6 +186,20 @@ endif
 CFLAGS	+= $(shell sdl-config --cflags)
 LDLIBS	+= $(shell sdl-config --libs)
 
+OSD ?= 1
+ifeq ($(OSD), 1)
+  CFLAGS += -DM64P_OSD
+  ifeq ($(shell pkg-config --modversion gl 2>/dev/null),)
+    $(error No OpenGL development libraries found!)
+  endif
+  ifeq ($(shell pkg-config --modversion glu 2>/dev/null),)
+    $(error No OpenGL utility development libraries found!)
+  endif
+
+  CFLAGS += $(shell pkg-config --cflags gl glu)
+  LDLIBS +=  $(shell pkg-config --libs gl glu)
+endif
+
 # set base program pointers and flags
 CC       ?= gcc
 CXX      ?= g++
@@ -311,10 +319,14 @@ SOURCE = \
 	$(SRCDIR)/r4300/pure_interp.c \
 	$(SRCDIR)/r4300/recomp.c \
 	$(SRCDIR)/r4300/reset.c \
-	$(SRCDIR)/osd/OGLFT.cpp \
-	$(SRCDIR)/osd/osd.cpp \
 	$(SRCDIR)/osd/screenshot.cpp
 
+ifeq ($(OSD), 1)
+SOURCE += \
+	$(SRCDIR)/osd/OGLFT.cpp \
+	$(SRCDIR)/osd/osd.cpp
+endif
+
 # source files for optional features
 ifneq ($(NO_ASM), 1)
   ifeq ($(CPU), X86)
@@ -392,6 +404,7 @@ targets:
 	@echo "    SHAREDIR=path == extra path to search for shared data files"
 	@echo "    OPTFLAGS=flag == compiler optimization (default: -O3)"
 	@echo "    PIC=(1|0)     == Force enable/disable of position independent code"
+	@echo "    OSD=(1|0)     == Enable/disable build of OpenGL On-screen display"
 	@echo "  Install Options:"
 	@echo "    PREFIX=path   == install/uninstall prefix (default: /usr/local/)"
 	@echo "    SHAREDIR=path == path to install shared data files (default: PREFIX/share/mupen64plus)"
diff --git a/src/osd/osd.h b/src/osd/osd.h
index cdf36bf..5f5d884 100644
--- a/src/osd/osd.h
+++ b/src/osd/osd.h
@@ -84,6 +84,8 @@ enum { R, G, B }; // for referencing color array
 extern "C" {
 #endif
 
+#ifdef M64P_OSD
+
 void osd_init(int width, int height);
 void osd_exit(void);
 void osd_render(void);
@@ -93,6 +95,43 @@ void osd_delete_message(osd_message_t *);
 void osd_message_set_static(osd_message_t *);
 void osd_message_set_user_managed(osd_message_t *);
 
+#else
+
+static inline void osd_init(int width, int height)
+{
+}
+
+static inline void osd_exit(void)
+{
+}
+
+static inline void osd_render(void)
+{
+}
+
+static inline osd_message_t * osd_new_message(enum osd_corner eCorner, const char *fmt, ...)
+{
+	return NULL;
+}
+
+static inline void osd_update_message(osd_message_t *msg, const char *fmt, ...)
+{
+}
+
+static inline void osd_delete_message(osd_message_t *msg)
+{
+}
+
+static inline void osd_message_set_static(osd_message_t *msg)
+{
+}
+
+static inline void osd_message_set_user_managed(osd_message_t *msg)
+{
+}
+
+#endif
+
 #ifdef __cplusplus
 }
 #endif

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/mupen64plus-core.git