[mupen64plus-video-arachnoid] 65/147: Imported Upstream version 1.99.4+37+db972cfd6e4d

[Sven Eckelmann]

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

ecsv-guest pushed a commit to branch master
in repository mupen64plus-video-arachnoid.

commit aed6d57e142484f42401d776b37d0c94472425db
Author: Sven Eckelmann <sven at narfation.org>
Date:   Fri Sep 9 10:29:47 2011 +0200

    Imported Upstream version 1.99.4+37+db972cfd6e4d
---
 projects/msvc9/GraphicsPlugin.vcproj | 2 ++
 projects/unix/Makefile               | 1 +
 src/GraphicsPlugin.cpp               | 7 +++++++
 src/main.cpp                         | 6 ++----
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/projects/msvc9/GraphicsPlugin.vcproj b/projects/msvc9/GraphicsPlugin.vcproj
index 55420cf..ef34ea6 100755
--- a/projects/msvc9/GraphicsPlugin.vcproj
+++ b/projects/msvc9/GraphicsPlugin.vcproj
@@ -64,6 +64,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies="opengl32.lib glu32.lib"
 				OutputFile="mupen64plus-video-arachnoid.dll"
 				LinkIncremental="2"
 				GenerateDebugInformation="true"
@@ -142,6 +143,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies="opengl32.lib glu32.lib"
 				OutputFile="mupen64plus-video-arachnoid.dll"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
diff --git a/projects/unix/Makefile b/projects/unix/Makefile
index 835d0b4..d8a2b98 100755
--- a/projects/unix/Makefile
+++ b/projects/unix/Makefile
@@ -69,6 +69,7 @@ ifneq ("$(filter x86_64 amd64,$(HOST_CPU))","")
     ARCH_DETECTED := 64BITS_32
   else
     ARCH_DETECTED := 64BITS
+    PIC ?= 1
   endif
 endif
 ifneq ("$(filter pentium i%86,$(HOST_CPU))","")
diff --git a/src/GraphicsPlugin.cpp b/src/GraphicsPlugin.cpp
index 655a0c5..810a1a2 100755
--- a/src/GraphicsPlugin.cpp
+++ b/src/GraphicsPlugin.cpp
@@ -63,6 +63,13 @@ GraphicsPlugin::~GraphicsPlugin()
 //-----------------------------------------------------------------------------
 bool GraphicsPlugin::initialize(GFX_INFO* graphicsInfo)
 {
+    //Initialize video output
+    if (CoreVideo_Init() != M64ERR_SUCCESS)
+    {
+        Logger::getSingleton().printMsg("Could not initialize video.", M64MSG_ERROR);
+        return false;
+    }
+
     //Save pointer to graphics info
     m_graphicsInfo = graphicsInfo;
 
diff --git a/src/main.cpp b/src/main.cpp
index 3ffd5ea..515516e 100755
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -244,9 +244,7 @@ EXPORT BOOL CALL InitiateGFX(GFX_INFO Gfx_Info)
 
     //Save Graphics Info
     memcpy(&g_graphicsInfo, &Gfx_Info, sizeof(GFX_INFO));
-
-    //Initialize Graphics Plugin            
-    return (CoreVideo_Init() == M64ERR_SUCCESS);
+    return true;
 }
 
 //-----------------------------------------------------------------------------
@@ -254,7 +252,7 @@ EXPORT BOOL CALL InitiateGFX(GFX_INFO Gfx_Info)
 //! This function is called when a rom is open. (from the emulation thread)
 //-----------------------------------------------------------------------------
 EXPORT int CALL RomOpen()
-{    
+{
     Logger::getSingleton().printMsg("RomOpen\n");
     return g_graphicsPlugin.initialize(&g_graphicsInfo);
 }

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