[wxmupen64plus] 05/71: Imported Upstream version 0.1+20110510

[Sven Eckelmann]

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

ecsv-guest pushed a commit to branch experimental
in repository wxmupen64plus.

commit ac25d03d6fb5324460b760c90f56bfcb4aef2405
Author: Sven Eckelmann <sven at narfation.org>
Date:   Tue May 10 18:59:03 2011 +0200

    Imported Upstream version 0.1+20110510
---
 License.txt | 6 +++++-
 wscript     | 1 +
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/License.txt b/License.txt
index de88123..b53b36c 100644
--- a/License.txt
+++ b/License.txt
@@ -12,7 +12,11 @@ From the Tango icon set, released under public domain :
 
 Copyright: The Mupen64plus Team / Copyright (C) 2008 Tillin9
 Released under the Creative Common Attribution-ShareAlike 3.0 license (http://creativecommons.org/licenses/by-sa/3.0/)
-    mupenicon.png  wxMupen64Plus.icns mupen64cart.png mupenicon_large.png
+    mupenicon.png  wxMupen64Plus.icns mupenicon_large.png wxmupen64plus.ico
+    mupen64cart.png mupen64cart.icns V64Doc.ico
+
+Released under public domain
+    presskey.bmp cancel.bmp erase.bmp
 
 == Waf ==
 Released under the new BSD license
diff --git a/wscript b/wscript
index cf31429..40d8e9d 100644
--- a/wscript
+++ b/wscript
@@ -145,6 +145,7 @@ def build(bld):
     else:
         # For other unices
         osal_src += ['mupen64plusplus/osal_dynamiclib_unix.c', 'mupen64plusplus/osal_files_unix.c']
+        link_flags += ['-lGL', '-ldl']
         
         # install target
         data_dir = bld.path.find_dir('data')

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