[mupen64plus-rsp-hle] 16/167: Imported Upstream version 1.99.4~hg20100403

[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-rsp-hle.

commit c6a14556f703b83cb498c66acc4ef228f807d12c
Author: Sven Eckelmann <sven.eckelmann at gmx.de>
Date:   Sun Apr 4 21:40:46 2010 +0200

    Imported Upstream version 1.99.4~hg20100403
---
 projects/unix/Makefile | 37 ++++++++++++++++++++++++++-----------
 src/rsp_api_export.ver |  8 ++++++++
 2 files changed, 34 insertions(+), 11 deletions(-)

diff --git a/projects/unix/Makefile b/projects/unix/Makefile
index 62b8443..2c07f3b 100644
--- a/projects/unix/Makefile
+++ b/projects/unix/Makefile
@@ -44,8 +44,8 @@ ifeq ("$(UNAME)","FreeBSD")
   SO_EXTENSION = so
   SHARED = -shared
 endif
-ifeq ("$(UNAME)","GNU/kFreeBSD")
-  OS = FREEBSD
+ifneq ("$(filter GNU/kFreeBSD kfreebsd,$(UNAME))","")
+  OS = LINUX
   SO_EXTENSION = so
   SHARED = -shared
 endif
@@ -83,13 +83,13 @@ ifeq ("$(CPU)","NONE")
 endif
 
 # base CFLAGS, LIBS, and LDFLAGS
-CFLAGS = -ffast-math -funroll-loops -fexpensive-optimizations -fno-strict-aliasing -I../../src
-LDFLAGS = -ldl
+CFLAGS += -ffast-math -funroll-loops -fexpensive-optimizations -fno-strict-aliasing -fvisibility=hidden -I../../src
+CXXFLAGS += -fvisibility-inlines-hidden
 
 # Since we are building a shared library, we must compile with -fPIC for x86_64 CPUs.
 # On 32-bit systems we do not want to use -fPIC because we don't have to and it has a big performance penalty on this arch
 ifeq ($(ARCH_DETECTED), 64BITS)
-  CFLAGS += -fPIC -DPIC -fvisibility=hidden
+  CFLAGS += -fPIC -DPIC
 endif
 # tweak flags for 32-bit build on 64-bit system
 ifeq ($(ARCH_DETECTED), 64BITS_32)
@@ -102,6 +102,8 @@ endif
 
 # set special flags per-system
 ifeq ($(OS), LINUX)
+  # only export api symbols
+  LDFLAGS += -Wl,-version-script,$(SRCDIR)/rsp_api_export.ver
   ifeq ($(CPU), X86)
     ifeq ($(ARCH_DETECTED), 64BITS)
       CFLAGS += -pipe -O3 -march=athlon64
@@ -150,7 +152,6 @@ endif
 # set shell function names
 CC      ?= gcc
 CXX     ?= g++
-LD      ?= g++
 INSTALL ?= install
 ifeq ($(OS),OSX)
   STRIP	?= strip -x 
@@ -222,19 +223,33 @@ uninstall:
 
 clean:
 	rm -rf ./_obj/* $(TARGET)
+	rmdir ./_obj
 
 rebuild: clean all
 
+# build dependency files
+CFLAGS += -MD
+-include $(OBJECTS:.o=.d)
+
+CXXFLAGS += $(CFLAGS)
+
+# reduced compile output when running make without V=1
+ifneq ($(findstring $(MAKEFLAGS),s),s)
+ifndef V
+	Q_CC  = @echo '    CC  '$@;
+	Q_CXX = @echo '    CXX '$@;
+	Q_LD  = @echo '    LD  '$@;
+endif
+endif
+
 # build rules
 
 $(TARGET): $(OBJECTS)
-	$(CXX) $(SHARED) $^ $(LDFLAGS) -o $@
+	$(Q_LD)$(CXX) $(SHARED) $^ $(LDFLAGS) -o $@
 	$(STRIP) $@
 
 $(OBJDIR)/%.o: $(SRCDIR)/%.c
-	$(CC) -o $@ $(CFLAGS) -c $<
+	$(Q_CC)$(CC) -o $@ $(CFLAGS) -c $<
 
 $(OBJDIR)/%.o: $(SRCDIR)/%.cpp
-	$(CXX) -o $@ $(CFLAGS) -c $<
-
-
+	$(Q_CXX)$(CXX) -o $@ $(CXXFLAGS) -c $<
diff --git a/src/rsp_api_export.ver b/src/rsp_api_export.ver
new file mode 100644
index 0000000..27e8138
--- /dev/null
+++ b/src/rsp_api_export.ver
@@ -0,0 +1,8 @@
+{ global:
+PluginStartup;
+PluginShutdown;
+PluginGetVersion;
+DoRspCycles;
+InitiateRSP;
+RomClosed;
+local: *; };

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