update version info for v2.6.0 release

CI/CD: Update to generic scripts, independent schedule, etc

.gitattributes

@@ -0,0 +1,38 @@
+* text=auto
+
+# normal text files
+*.6 text
+AUTHORS text
+*.c text
+*.cfg text
+*.cht text
+*.conf text
+COPYING text
+*.cpp text
+*.def text
+*-license text
+*.h text
+*.html text
+*.ini text
+INSTALL text
+LICENSES text
+Makefile text
+*.py text
+README text
+RELEASE text
+*.S text
+*.sh text
+*.txt text
+*.ver text
+
+# windows specific text files
+*.sln text eol=crlf
+*.vcproj text eol=crlf
+*.vcxproj text eol=crlf
+*.vcxproj.filters text eol=crlf
+
+# binary files
+*.gz binary
+*.ttf binary
+cursor.tex binary
+font.tex binary

.github/workflows/build.yml

@@ -0,0 +1,120 @@
+name: Arachnoid
+
+on:
+  push:
+    paths-ignore:
+      - '.{gitattributes,gitignore,travis.yml}'
+      - '*.md,appveyor.yml,README'
+  pull_request:
+    paths-ignore:
+      - '.{gitattributes,gitignore,travis.yml}'
+      - '*.md,appveyor.yml,README'
+  workflow_dispatch:
+
+jobs:
+
+  Linux:
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - cc: GCC
+            arch: x64
+          - cc: GCC
+            arch: x86
+          - cc: Clang
+            arch: x64
+          - cc: Clang
+            arch: x86
+    name: Linux / ${{ matrix.cc }} / ${{ matrix.arch }}
+    runs-on: ubuntu-22.04
+    steps:
+      - uses: actions/checkout@v4
+      - name: Get build dependencies and arrange the environment
+        run: |
+          git clone --depth 1 https://github.com/mupen64plus/mupen64plus-core.git ../mupen64plus-core
+          export C_CLANG_SUFFIX="-15" C_GCC_SUFFIX="-12"
+          export BUILD_DEPS="libgl1-mesa-dev"
+          ./../mupen64plus-core/.github/workflows/scripts/ci_install_ubuntu_deps.sh ${{ matrix.arch }} ${{ matrix.cc }}
+      - name: Build and related stuff, backup binaries
+        run: |
+          export C_CLANG_SUFFIX="-15" C_GCC_SUFFIX="-12"
+          ./../mupen64plus-core/.github/workflows/scripts/ci_build.sh ${{ matrix.arch }} ${{ matrix.cc }} makepkg
+      - name: Upload artifact
+        if: matrix.cc == 'GCC'
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ env.PKG_NAME }}
+          path: pkg/*.tar.gz
+
+  MSYS2:
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - cc: GCC
+            arch: x64
+            cross: x86_64
+            env: MINGW64
+          - cc: GCC
+            arch: x86
+            cross: i686
+            env: MINGW32
+    name: Windows / MSYS2 ${{ matrix.cc }} / ${{ matrix.arch }}
+    runs-on: windows-2022
+    defaults:
+      run:
+        shell: msys2 {0}
+    steps:
+      - uses: actions/checkout@v4
+      - uses: msys2/setup-msys2@v2
+        with:
+          msystem: ${{ matrix.env }}
+          update: true
+          install: >-
+            git
+            libtool
+            make
+            mingw-w64-${{ matrix.cross }}-gcc
+            mingw-w64-${{ matrix.cross }}-toolchain
+            mingw-w64-${{ matrix.cross }}-ntldd
+      - name: Build and related stuff, backup binaries
+        run: |
+          git clone --depth 1 https://github.com/mupen64plus/mupen64plus-core.git ../mupen64plus-core
+          ./../mupen64plus-core/.github/workflows/scripts/ci_build.sh ${{ matrix.arch }} ${{ matrix.cc }}
+      - name: Backup dependencies, etc...
+        run: |
+          ./../mupen64plus-core/.github/workflows/scripts/ci_backup_mingw_deps.sh ${{ matrix.env }}
+      - name: Upload artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ env.PKG_NAME }}
+          path: pkg/*
+
+  Nightly-build:
+    runs-on: ubuntu-latest
+    if: github.ref_name == 'master'
+    needs: [Linux, MSYS2]
+    steps:
+      - uses: actions/checkout@v4
+      - name: Download artifacts
+        uses: actions/download-artifact@v4
+        with:
+          path: binaries
+      - name: Get some tools
+        run: |
+          git clone --depth 1 https://github.com/mupen64plus/mupen64plus-core.git ../mupen64plus-core
+          sudo apt-get update
+          sudo apt-get -y install hashdeep
+      - name: Creating new artifacts and update nightly-build
+        run: |
+          ./../mupen64plus-core/.github/workflows/scripts/ci_nightly_artifacts.sh
+      - name: Nightly-build
+        uses: ncipollo/release-action@v1
+        with:
+          prerelease: true
+          allowUpdates: true
+          removeArtifacts: true
+          replacesArtifacts: false
+          tag: nightly-build
+          artifacts: pkg/*

.github/workflows/schedule.yml

@@ -0,0 +1,115 @@
+name: Arachnoid - Scheduled
+
+on:
+  schedule:
+    - cron: '15 14 21 * *'
+
+jobs:
+
+  Linux:
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - cc: GCC
+            arch: x64
+          - cc: GCC
+            arch: x86
+          - cc: Clang
+            arch: x64
+          - cc: Clang
+            arch: x86
+    name: Linux / ${{ matrix.cc }} / ${{ matrix.arch }}
+    runs-on: ubuntu-22.04
+    if: github.repository == 'mupen64plus/mupen64plus-video-arachnoid'
+    steps:
+      - uses: actions/checkout@v4
+      - name: Get build dependencies and arrange the environment
+        run: |
+          git clone --depth 1 https://github.com/mupen64plus/mupen64plus-core.git ../mupen64plus-core
+          export C_CLANG_SUFFIX="-15" C_GCC_SUFFIX="-12"
+          export BUILD_DEPS="libgl1-mesa-dev"
+          ./../mupen64plus-core/.github/workflows/scripts/ci_install_ubuntu_deps.sh ${{ matrix.arch }} ${{ matrix.cc }}
+      - name: Build and related stuff, backup binaries
+        run: |
+          export C_CLANG_SUFFIX="-15" C_GCC_SUFFIX="-12"
+          ./../mupen64plus-core/.github/workflows/scripts/ci_build.sh ${{ matrix.arch }} ${{ matrix.cc }} makepkg
+      - name: Upload artifact
+        if: matrix.cc == 'GCC'
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ env.PKG_NAME }}
+          path: pkg/*.tar.gz
+
+  MSYS2:
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - cc: GCC
+            arch: x64
+            cross: x86_64
+            env: MINGW64
+          - cc: GCC
+            arch: x86
+            cross: i686
+            env: MINGW32
+    name: Windows / MSYS2 ${{ matrix.cc }} / ${{ matrix.arch }}
+    runs-on: windows-2022
+    if: github.repository == 'mupen64plus/mupen64plus-video-arachnoid'
+    defaults:
+      run:
+        shell: msys2 {0}
+    steps:
+      - uses: actions/checkout@v4
+      - uses: msys2/setup-msys2@v2
+        with:
+          msystem: ${{ matrix.env }}
+          update: true
+          install: >-
+            git
+            libtool
+            make
+            mingw-w64-${{ matrix.cross }}-gcc
+            mingw-w64-${{ matrix.cross }}-toolchain
+            mingw-w64-${{ matrix.cross }}-ntldd
+      - name: Build and related stuff, backup binaries
+        run: |
+          git clone --depth 1 https://github.com/mupen64plus/mupen64plus-core.git ../mupen64plus-core
+          ./../mupen64plus-core/.github/workflows/scripts/ci_build.sh ${{ matrix.arch }} ${{ matrix.cc }}
+      - name: Backup dependencies, etc...
+        run: |
+          ./../mupen64plus-core/.github/workflows/scripts/ci_backup_mingw_deps.sh ${{ matrix.env }}
+      - name: Upload artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ env.PKG_NAME }}
+          path: pkg/*
+
+  Nightly-build:
+    runs-on: ubuntu-latest
+    if: github.ref_name == 'master'
+    needs: [Linux, MSYS2]
+    steps:
+      - uses: actions/checkout@v4
+      - name: Download artifacts
+        uses: actions/download-artifact@v4
+        with:
+          path: binaries
+      - name: Get some tools
+        run: |
+          git clone --depth 1 https://github.com/mupen64plus/mupen64plus-core.git ../mupen64plus-core
+          sudo apt-get update
+          sudo apt-get -y install hashdeep
+      - name: Creating new artifacts and update nightly-build
+        run: |
+          ./../mupen64plus-core/.github/workflows/scripts/ci_nightly_artifacts.sh
+      - name: Nightly-build
+        uses: ncipollo/release-action@v1
+        with:
+          prerelease: true
+          allowUpdates: true
+          removeArtifacts: true
+          replacesArtifacts: false
+          tag: nightly-build
+          artifacts: pkg/*

.gitignore

@@ -0,0 +1,2 @@
+/projects/unix/_obj*/
+/projects/unix/mupen64plus-video-arachnoid*.so

.hgignore

@@ -1,4 +0,0 @@
-syntax: regexp
-
-^projects/unix/_obj/
-^projects/unix/mupen64plus-video-arachnoid.so$

.travis.yml

@@ -0,0 +1,45 @@
+sudo: required
+dist: xenial
+language: cpp
+compiler:
+  - gcc
+  - clang
+addons:
+  apt:
+    packages:
+    - git
+    - libgl1-mesa-dev
+    - pkg-config
+before_install:
+  - git clone --depth=1 --branch=master git://github.com/mupen64plus/mupen64plus-core.git deps/mupen64plus-core
+script:
+ - make -C projects/unix APIDIR="$(pwd)/deps/mupen64plus-core/src/api/" V=1 clean && LDFLAGS="-Wl,--no-add-needed -Wl,--no-undefined" OPTFLAGS="-O2" make CC="${CC}" CXX="${CXX}" -j$(nproc) -C projects/unix APIDIR="$(pwd)/deps/mupen64plus-core/src/api/" V=1 all
+
+# extra mxe build entries
+matrix:
+  include:
+    - env:
+      - MXE_CPU=i686
+      - PATH="/usr/lib/mxe/usr/bin/:$PATH"
+      before_install:
+      - curl -sSL "https://mirror.mxe.cc/repos/apt/client-conf/mxeapt.gpg" | sudo -E apt-key add -
+      - echo "deb https://mirror.mxe.cc/repos/apt xenial main" | sudo tee -a /etc/apt/sources.list
+      - sudo apt-get update -qq
+      - sudo apt-get -y --allow-unauthenticated install mxe-i686-w64-mingw32.shared-gcc
+      - git clone --depth=1 --branch=master git://github.com/mupen64plus/mupen64plus-core.git deps/mupen64plus-core
+      script:
+      - make UNAME=MINGW CROSS_COMPILE="${MXE_CPU}-w64-mingw32.shared-" CC="${MXE_CPU}-w64-mingw32.shared-gcc" CXX="${MXE_CPU}-w64-mingw32.shared-g++" HOST_CPU="${MXE_CPU}" -C projects/unix APIDIR="$(pwd)/deps/mupen64plus-core/src/api/"  V=1  clean && 
+        make UNAME=MINGW CROSS_COMPILE="${MXE_CPU}-w64-mingw32.shared-" CC="${MXE_CPU}-w64-mingw32.shared-gcc" CXX="${MXE_CPU}-w64-mingw32.shared-g++" HOST_CPU="${MXE_CPU}" -C projects/unix APIDIR="$(pwd)/deps/mupen64plus-core/src/api/"  V=1 -j$(nproc) all
+
+    - env:
+      - MXE_CPU=x86_64
+      - PATH="/usr/lib/mxe/usr/bin/:$PATH"
+      before_install:
+      - curl -sSL "https://mirror.mxe.cc/repos/apt/client-conf/mxeapt.gpg" | sudo -E apt-key add -
+      - echo "deb https://mirror.mxe.cc/repos/apt xenial main" | sudo tee -a /etc/apt/sources.list
+      - sudo apt-get update -qq
+      - sudo apt-get -y --allow-unauthenticated install mxe-x86-64-w64-mingw32.shared-gcc
+      - git clone --depth=1 --branch=master git://github.com/mupen64plus/mupen64plus-core.git deps/mupen64plus-core
+      script:
+      - make UNAME=MINGW CROSS_COMPILE="${MXE_CPU}-w64-mingw32.shared-" CC="${MXE_CPU}-w64-mingw32.shared-gcc" CXX="${MXE_CPU}-w64-mingw32.shared-g++" HOST_CPU="${MXE_CPU}" -C projects/unix APIDIR="$(pwd)/deps/mupen64plus-core/src/api/"  V=1  clean && 
+        make UNAME=MINGW CROSS_COMPILE="${MXE_CPU}-w64-mingw32.shared-" CC="${MXE_CPU}-w64-mingw32.shared-gcc" CXX="${MXE_CPU}-w64-mingw32.shared-g++" HOST_CPU="${MXE_CPU}" -C projects/unix APIDIR="$(pwd)/deps/mupen64plus-core/src/api/"  V=1 -j$(nproc) all

README

@@ -1,5 +1,5 @@
 Arachnoid Graphics Plugin for Mupen64Plus
-http://bitbucket.org/wahrhaft/mupen64plus-video-arachnoid/
+https://github.com/mupen64plus/mupen64plus-video-arachnoid/
 
 Derived from the Project64/1964 version of Arachnoid, available from:
 http://sourceforge.net/projects/arachnoid/

projects/unix/Makefile

@@ -1,6 +1,6 @@
 #/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 # *   Arachnoid - Makefile                                                  *
-# *   http://bitbucket.org/wahrhaft/mupen64plus-video-arachnoid/            *
+# *   https://github.com/mupen64plus/mupen64plus-video-arachnoid/           *
 # *   Copyright (C) 2009 Richard42, Jon Ring                                *
 # *                                                                         *
 # *   This program is free software; you can redistribute it and/or modify  *
@@ -20,8 +20,9 @@
 # * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 # Makefile for mupen64plus-video-arachnoid
 
-# detect operation system
-UNAME = $(shell uname -s)
+# detect operating system
+UNAME ?= $(shell uname -s)
+OS := NONE
 ifeq ("$(UNAME)","Linux")
   OS = LINUX
   SO_EXTENSION = so
@@ -52,21 +53,31 @@ ifeq ("$(UNAME)","OpenBSD")
   OS = FREEBSD
   SO_EXTENSION = so
   SHARED = -shared
-  $(warning OS type "$(UNAME)" not officially supported.')
 endif
 ifneq ("$(filter GNU/kFreeBSD kfreebsd,$(UNAME))","")
   OS = LINUX
   SO_EXTENSION = so
   SHARED = -shared
 endif
+ifeq ("$(patsubst MINGW%,MINGW,$(UNAME))","MINGW")
+  OS = MINGW
+  SO_EXTENSION = dll
+  SHARED = -shared
+  PIC = 0
+endif
+ifeq ("$(OS)","NONE")
+  $(error OS type "$(UNAME)" not supported.  Please file bug report at 'https://github.com/mupen64plus/mupen64plus-core/issues')
+endif
 
 # detect system architecture
 HOST_CPU ?= $(shell uname -m)
+CPU := NONE
 NO_ASM ?= 1
 ifneq ("$(filter x86_64 amd64,$(HOST_CPU))","")
   CPU := X86
   ifeq ("$(BITS)", "32")
     ARCH_DETECTED := 64BITS_32
+    PIC ?= 0
   else
     ARCH_DETECTED := 64BITS
     PIC ?= 1
@@ -75,8 +86,9 @@ endif
 ifneq ("$(filter pentium i%86,$(HOST_CPU))","")
   CPU := X86
   ARCH_DETECTED := 32BITS
+  PIC ?= 0
 endif
-ifneq ("$(filter ppc powerpc,$(HOST_CPU))","")
+ifneq ("$(filter ppc macppc socppc powerpc,$(HOST_CPU))","")
   CPU := PPC
   ARCH_DETECTED := 32BITS
   BIG_ENDIAN := 1
@@ -90,10 +102,25 @@ ifneq ("$(filter ppc64 powerpc64,$(HOST_CPU))","")
   PIC ?= 1
   $(warning Architecture "$(HOST_CPU)" not officially supported.')
 endif
+ifneq ("$(filter arm%,$(HOST_CPU))","")
+  ifeq ("$(filter arm%b,$(HOST_CPU))","")
+    CPU := ARM
+    ARCH_DETECTED := 32BITS
+    PIC ?= 1
+    $(warning Architecture "$(HOST_CPU)" not officially supported.')
+  endif
+endif
+ifeq ("$(CPU)","NONE")
+  $(error CPU type "$(HOST_CPU)" not supported.  Please file bug report at 'https://github.com/mupen64plus/mupen64plus-core/issues')
+endif
+
+SRCDIR = ../../src
+OBJDIR = _obj$(POSTFIX)
 
 # base CFLAGS, LDLIBS, and LDFLAGS
-OPTFLAGS ?= -O3
-CFLAGS += $(OPTFLAGS) -ffast-math -fno-strict-aliasing -fvisibility=hidden -I../../src \
+OPTFLAGS ?= -O3 -flto
+WARNFLAGS ?= -Wall
+CFLAGS += $(OPTFLAGS) $(WARNFLAGS) -ffast-math -fno-strict-aliasing -fvisibility=hidden -I../../src \
 		 -I../../src/hash -I../../src/ucodes -I../../src/GBI -I../../src/RDP -I../../src/utils \
 		 -I../../src/log -I../../src/RSP -I../../src/framebuffer -I../../src/math -I../../src/renderer \
 		 -I../../src/Assembler -I../../src/texture -I../../src/config -I../../src/Combiner 
@@ -103,26 +130,54 @@ LDFLAGS += $(SHARED)
 # On OS X, add a few extra flags to elegantly support cross-compilation and backward
 # compatibility (and also the flags to link against OpenGL)
 ifeq ($(OS), OSX)
+  # Select the proper SDK
+  # Also, SDKs are stored in a different location since XCode 4.3
+  OSX_SDK ?= $(shell sw_vers -productVersion | cut -f1 -f2 -d .)
+  OSX_XCODEMAJ = $(shell xcodebuild -version | grep '[0-9]*\.[0-9]*' | cut -f2 -d ' ' | cut -f1 -d .)
+  OSX_XCODEMIN = $(shell xcodebuild -version | grep '[0-9]*\.[0-9]*' | cut -f2 -d ' ' | cut -f2 -d .)
+  OSX_XCODEGE43 = $(shell echo "`expr $(OSX_XCODEMAJ) \>= 4``expr $(OSX_XCODEMIN) \>= 3`")
+  ifeq ($(OSX_XCODEGE43), 11)
+    OSX_SYSROOT := /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs
+  else
+    OSX_SYSROOT := /Developer/SDKs
+  endif
+
   ifeq ($(CPU), X86)
     ifeq ($(ARCH_DETECTED), 64BITS)
-      CFLAGS += -arch x86_64 -mmacosx-version-min=10.5 -isysroot /Developer/SDKs/MacOSX10.5.sdk
-      LDFLAGS += -bundle -framework OpenGL -arch x86_64 -mmacosx-version-min=10.4 -isysroot /Developer/SDKs/MacOSX10.5.sdk
+      CFLAGS += -arch x86_64 -mmacosx-version-min=$(OSX_SDK) -isysroot $(OSX_SYSROOT)/MacOSX$(OSX_SDK).sdk
+      LDFLAGS += -bundle
     else
-      CFLAGS += -arch i686 -mmacosx-version-min=10.5 -isysroot /Developer/SDKs/MacOSX10.5.sdk
-      LDFLAGS += -bundle -framework OpenGL -arch i686 -mmacosx-version-min=10.4 -isysroot /Developer/SDKs/MacOSX10.5.sdk
+      CFLAGS += -arch i686 -mmacosx-version-min=$(OSX_SDK) -isysroot $(OSX_SYSROOT)/MacOSX$(OSX_SDK).sdk
+      LDFLAGS += -bundle
     endif
   endif
 else
-  # test for essential build dependencies
-  ifeq ($(shell which pkg-config 2>/dev/null),)
-    $(error pkg-config not found)
+  # search for OpenGL libraries
+  ifeq ($(OS), OSX)
+    GL_LDLIBS = -framework OpenGL
   endif
-  ifeq ($(shell pkg-config --modversion gl 2>/dev/null),)
-    $(error No OpenGL development libraries found!)
+  ifeq ($(OS), MINGW)
+    GL_LDLIBS = -lopengl32
   endif
 
-  CFLAGS += -pthread $(shell pkg-config --cflags gl)
-  LDLIBS += -pthread $(shell pkg-config --libs gl)
+  ifeq ($(origin GL_CFLAGS) $(origin GL_LDLIBS), undefined undefined)
+    ifeq ($(origin PKG_CONFIG), undefined)
+      PKG_CONFIG = $(CROSS_COMPILE)pkg-config
+      ifeq ($(shell which $(PKG_CONFIG) 2>/dev/null),)
+        $(error $(PKG_CONFIG) not found)
+      endif
+    endif
+
+    ifeq ($(shell $(PKG_CONFIG) --modversion gl 2>/dev/null),)
+      $(error No OpenGL development libraries found!)
+    endif
+    GL_CFLAGS += $(shell $(PKG_CONFIG) --cflags gl)
+    GL_LDLIBS +=  $(shell $(PKG_CONFIG) --libs gl)
+  endif
+  CFLAGS += $(GL_CFLAGS)
+  LDLIBS += $(GL_LDLIBS)
+
+  CFLAGS += -pthread
 endif
 ifeq ($(OS), LINUX)
   LDLIBS += -ldl 
@@ -136,10 +191,8 @@ endif
 # On 32-bit x86 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 ($(PIC), 1)
   CFLAGS += -fPIC
-  LDFLAGS += -fPIC
 else
   CFLAGS += -fno-PIC
-  LDFLAGS += -fno-PIC
 endif
 
 ifeq ($(BIG_ENDIAN), 1)
@@ -166,24 +219,32 @@ else
   endif
 endif
 
+# tweak flags for 32-bit build on 64-bit system
+ifeq ($(ARCH_DETECTED), 64BITS_32)
+  ifeq ($(OS), FREEBSD)
+    $(error Do not use the BITS=32 option with FreeBSD, use -m32 and -m elf_i386)
+  endif
+  ifneq ($(OS), OSX)
+    ifeq ($(OS), MINGW)
+      LDFLAGS += -Wl,-m,i386pe
+    else
+      CFLAGS += -m32
+      LDFLAGS += -Wl,-m,elf_i386
+    endif
+  endif
+endif
+
+ifeq ($(ARCH_DETECTED), 64BITS)
+  ifeq ($(OS), MINGW)
+    LDFLAGS += -Wl,-m,i386pep
+  endif
+endif
+
 # set special flags per-system
 ifeq ($(OS), LINUX)
   # only export api symbols
   LDFLAGS += -Wl,-version-script,$(SRCDIR)/video_api_export.ver
 endif
-ifneq ($(OS), FREEBSD)
-  ifeq ($(CPU), X86)
-    # tweak flags for 32-bit build on 64-bit system
-    ifeq ($(ARCH_DETECTED), 64BITS_32)
-      CFLAGS += -m32
-      LDFLAGS += -m32 -Wl,-m,elf_i386
-    endif
-  endif
-else
-  ifeq ($(ARCH_DETECTED), 64BITS_32)
-    $(error Do not use the BITS=32 option with FreeBSD, use -m32 and -m elf_i386)
-  endif
-endif
 
 # reduced compile output when running make without V=1
 ifneq ($(findstring $(MAKEFLAGS),s),s)
@@ -195,14 +256,14 @@ endif
 endif
 
 # set base program pointers and flags
-CC       ?= gcc
-CXX      ?= g++
+CC        = $(CROSS_COMPILE)gcc
+CXX       = $(CROSS_COMPILE)g++
 RM       ?= rm -f
 INSTALL  ?= install
 MKDIR ?= mkdir -p
 COMPILE.c = $(Q_CC)$(CC) $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c
 COMPILE.cc = $(Q_CXX)$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c
-LINK.o = $(Q_LD)$(CXX) $(LDFLAGS) $(TARGET_ARCH)
+LINK.o = $(Q_LD)$(CXX) $(CXXFLAGS) $(LDFLAGS) $(TARGET_ARCH)
 
 # set special flags for given Makefile parameters
 ifeq ($(DEBUG),1)
@@ -216,9 +277,6 @@ endif
 ifeq ($(PREFIX),)
   PREFIX := /usr/local
 endif
-ifeq ($(SHAREDIR),)
-  SHAREDIR := $(PREFIX)/share/mupen64plus
-endif
 ifeq ($(LIBDIR),)
   LIBDIR := $(PREFIX)/lib
 endif
@@ -226,10 +284,6 @@ ifeq ($(PLUGINDIR),)
   PLUGINDIR := $(LIBDIR)/mupen64plus
 endif
 
-
-SRCDIR = ../../src
-OBJDIR = _obj
-
 # list of source files to compile
 SOURCE = \
 	$(SRCDIR)/main.cpp \
@@ -282,8 +336,13 @@ SOURCE = \
 	$(SRCDIR)/Combiner/CombinerCache.cpp \
 	$(SRCDIR)/RomDetector.cpp \
 	$(SRCDIR)/RDP/RDP.cpp \
-	$(SRCDIR)/RDP/RDPInstructions.cpp \
-	$(SRCDIR)/osal_dynamiclib_unix.cpp
+	$(SRCDIR)/RDP/RDPInstructions.cpp
+
+ifeq ($(OS),MINGW)
+SOURCE += $(SRCDIR)/osal_dynamiclib_win32.cpp
+else
+SOURCE += $(SRCDIR)/osal_dynamiclib_unix.cpp
+endif
 
 
 # generate a list of object files build, make a temporary directory for them
@@ -293,7 +352,7 @@ $(shell $(MKDIR) $(OBJDIRS))
 
 # build targets
 
-TARGET = mupen64plus-video-arachnoid.$(SO_EXTENSION)
+TARGET = mupen64plus-video-arachnoid$(POSTFIX).$(SO_EXTENSION)
 targets:
 	@echo "Mupen64plus-video-arachnoid N64 Graphics plugin makefile. "
 	@echo "  Targets:"
@@ -305,8 +364,10 @@ targets:
 	@echo "  Options:"
 	@echo "    BITS=32       == build 32-bit binaries on 64-bit machine"
 	@echo "    APIDIR=path   == path to find Mupen64Plus Core headers"
-	@echo "    OPTFLAGS=flag == compiler optimization (default: -O3)"
+	@echo "    OPTFLAGS=flag == compiler optimization (default: -O3 -flto)"
+	@echo "    WARNFLAGS=flag == compiler warning levels (default: -Wall)"
 	@echo "    PIC=(1|0)     == Force enable/disable of position independent code"
+	@echo "    POSTFIX=name  == String added to the name of the the build (default: '')"
 	@echo "  Install Options:"
 	@echo "    PREFIX=path   == install/uninstall prefix (default: /usr/local)"
 	@echo "    LIBDIR=path   == library prefix (default: PREFIX/lib)"
@@ -314,7 +375,6 @@ targets:
 	@echo "    DESTDIR=path  == path to prepend to all installation paths (only for packagers)"
 	@echo "  Debugging Options:"
 	@echo "    DEBUG=1       == add debugging symbols"
-	@echo "    LTO=1         == enable experimental build with link-time optimization"
 	@echo "    V=1           == show verbose compiler output"
 
 all: $(TARGET)
@@ -328,18 +388,13 @@ uninstall:
 
 
 clean:
-	$(RM) -r ./_obj mupen64plus-video-arachnoid.$(SO_EXTENSION)
+	$(RM) -r $(OBJDIR) $(TARGET)
 
 # build dependency files
-CFLAGS += -MD
+CFLAGS += -MD -MP
 -include $(OBJECTS:.o=.d)
 
 CXXFLAGS += $(CFLAGS)
-ifeq ($(LTO), 1)
-  CFLAGS += -flto
-  CXXFLAGS += -flto
-  LDFLAGS += -fuse-linker-plugin $(CXXFLAGS)
-endif
 
 # standard build rules
 $(OBJDIR)/%.o: $(SRCDIR)/%.c

src/Assembler/assembler.h

@@ -1,6 +1,6 @@
 /******************************************************************************
  * Arachnoid Graphics Plugin for Mupen64Plus
- * http://bitbucket.org/wahrhaft/mupen64plus-video-arachnoid/
+ * https://github.com/mupen64plus/mupen64plus-video-arachnoid/
  *
  * Copyright (C) 2009 Jon Ring
  * Copyright (C) 2007 Kristofer Karlsson, Rickard Niklasson
@@ -114,7 +114,7 @@ Done:
     }
 #else
 
-    long beginOffset = (long)src & 3;
+    long long beginOffset = (long long)src & 3;
     char *readPtr = (char*)src - beginOffset;
     char *writePtr = (char*)dest;
     

src/Combiner/AdvancedCombinerManager.cpp

@@ -1,6 +1,6 @@
 /******************************************************************************
  * Arachnoid Graphics Plugin for Mupen64Plus
- * http://bitbucket.org/wahrhaft/mupen64plus-video-arachnoid/
+ * https://github.com/mupen64plus/mupen64plus-video-arachnoid/
  *
  * Copyright (C) 2007 Kristofer Karlsson, Rickard Niklasson
  *
@@ -20,32 +20,35 @@
  *****************************************************************************/
 
 #include "AdvancedCombinerManager.h"
-#include "CombinerStructs.h"
-#include "ExtensionChecker.h"
-#include "MultiTexturingExt.h"
+
 #include "AdvancedTexEnvCombiner.h"
-#include "SimpleTexEnvCombiner.h"
-#include "DummyCombiner.h"
-#include "CombinerStageMerger.h"
+#include "CombinerBase.h"
 #include "CombinerStageCreator.h"
-#include "RomDetector.h"
-#include "m64p.h"
+#include "CombinerStageMerger.h"
+#include "CombinerStructs.h"
+#include "DummyCombiner.h"
+#include "ExtensionChecker.h"
+#include "GBIDefs.h"
+#include "MultiTexturingExt.h"
 #include "OpenGL.h"
+#include "RomDetector.h"
+#include "SimpleTexEnvCombiner.h"
+#include "m64p.h"
 
 static int saRGBExpanded[] = 
 {
     COMBINED,            TEXEL0,              TEXEL1,              PRIMITIVE,        
-    SHADE,               ENVIRONMENT,         ONE,                 NOISE,
-    ZERO,                ZERO,                ZERO,                ZERO,
-    ZERO,                ZERO,                ZERO,                ZERO
+    SHADE,               ENVIRONMENT,         CB_ONE,                 NOISE,
+    CB_ZERO,                CB_ZERO,                CB_ZERO,                CB_ZERO,
+    CB_ZERO,                CB_ZERO,                CB_ZERO,                CB_ZERO
 };
 
 static int sbRGBExpanded[] = 
 {
     COMBINED,            TEXEL0,              TEXEL1,              PRIMITIVE,        
     SHADE,               ENVIRONMENT,         CENTER,              K4,
-    ZERO,                ZERO,                ZERO,                ZERO,
-    ZERO,                ZERO,                ZERO,                ZERO
+    CB_ZERO,                CB_ZERO,                CB_ZERO,                CB_ZERO,
+    CB_ZERO,                CB_ZERO,                CB_ZERO,                CB_ZERO
 };
 
 static int mRGBExpanded[] = 
@@ -54,40 +57,40 @@ static int mRGBExpanded[] =
     SHADE,               ENVIRONMENT,         SCALE,               COMBINED_ALPHA,
     TEXEL0_ALPHA,        TEXEL1_ALPHA,        PRIMITIVE_ALPHA,     SHADE_ALPHA,
     ENV_ALPHA,           LOD_FRACTION,        PRIM_LOD_FRAC,       K5,
-    ZERO,                ZERO,                ZERO,                ZERO,
-    ZERO,                ZERO,                ZERO,                ZERO,
-    ZERO,                ZERO,                ZERO,                ZERO,
-    ZERO,                ZERO,                ZERO,                ZERO
+    CB_ZERO,                CB_ZERO,                CB_ZERO,                CB_ZERO,
+    CB_ZERO,                CB_ZERO,                CB_ZERO,                CB_ZERO,
+    CB_ZERO,                CB_ZERO,                CB_ZERO,                CB_ZERO,
+    CB_ZERO,                CB_ZERO,                CB_ZERO,                CB_ZERO
 };
 
 static int aRGBExpanded[] = 
 {
     COMBINED,            TEXEL0,              TEXEL1,              PRIMITIVE,        
-    SHADE,               ENVIRONMENT,         ONE,                 ZERO
+    SHADE,               ENVIRONMENT,         CB_ONE,                 CB_ZERO
 };
 
 static int saAExpanded[] = 
 {
     COMBINED,            TEXEL0_ALPHA,        TEXEL1_ALPHA,        PRIMITIVE_ALPHA,        
-    SHADE_ALPHA,         ENV_ALPHA,           ONE,                 ZERO
+    SHADE_ALPHA,         ENV_ALPHA,           CB_ONE,                 CB_ZERO
 };
 
 static int sbAExpanded[] = 
 {
     COMBINED,            TEXEL0_ALPHA,        TEXEL1_ALPHA,        PRIMITIVE_ALPHA,        
-    SHADE_ALPHA,         ENV_ALPHA,           ONE,                 ZERO
+    SHADE_ALPHA,         ENV_ALPHA,           CB_ONE,                 CB_ZERO
 };
 
 static int mAExpanded[] = 
 {
     LOD_FRACTION,        TEXEL0_ALPHA,        TEXEL1_ALPHA,        PRIMITIVE_ALPHA,        
-    SHADE_ALPHA,         ENV_ALPHA,           PRIM_LOD_FRAC,       ZERO,
+    SHADE_ALPHA,         ENV_ALPHA,           PRIM_LOD_FRAC,       CB_ZERO,
 };
 
 static int aAExpanded[] = 
 {
     COMBINED,            TEXEL0_ALPHA,        TEXEL1_ALPHA,        PRIMITIVE_ALPHA,        
-    SHADE_ALPHA,         ENV_ALPHA,           ONE,                 ZERO
+    SHADE_ALPHA,         ENV_ALPHA,           CB_ONE,                 CB_ZERO
 };
 
 //-----------------------------------------------------------------------------
@@ -314,7 +317,7 @@ void AdvancedCombinerManager::getSecondaryCombinerColor(float out[4])
     }
 
     //Get color
-    m_combiner->getCombinerColor(out, currentTexEnv->vertex.secondaryColor, ONE);
+    m_combiner->getCombinerColor(out, currentTexEnv->vertex.secondaryColor, CB_ONE);
 }
 
 //-----------------------------------------------------------------------------

src/Combiner/AdvancedCombinerManager.h

@@ -1,6 +1,6 @@
 /******************************************************************************
  * Arachnoid Graphics Plugin for Mupen64Plus
- * http://bitbucket.org/wahrhaft/mupen64plus-video-arachnoid/
+ * https://github.com/mupen64plus/mupen64plus-video-arachnoid/
  *
  * Copyright (C) 2007 Kristofer Karlsson, Rickard Niklasson
  *
@@ -22,18 +22,18 @@
 #ifndef ADVANCED_COMBINER_MANAGER_H_
 #define ADVANCED_COMBINER_MANAGER_H_
 
-#include "GBIDefs.h"
-#include "CombinerStructs.h"
 #include "CombinerCache.h"
+#include "CombinerStructs.h"
+#include "GBIDefs.h"
 
 //Forward declarations
-struct TexEnvCombiner;
-struct CombineCycle;
-struct CombinerStage;
-struct Combiner;
 class AdvancedTexEnvCombiner;
-class CombinerCache;
 class CombinerBase;
+class CombinerCache;
+struct CombineCycle;
+struct Combiner;
+struct CombinerStage;
+struct TexEnvCombiner;
 
 //*****************************************************************************
 //! Advanced Texture Environment Combiner

src/Combiner/AdvancedTexEnvCombiner.cpp

@@ -1,6 +1,6 @@
 /******************************************************************************
  * Arachnoid Graphics Plugin for Mupen64Plus
- * http://bitbucket.org/wahrhaft/mupen64plus-video-arachnoid/
+ * https://github.com/mupen64plus/mupen64plus-video-arachnoid/
  *
  * Copyright (C) 2007 Kristofer Karlsson, Rickard Niklasson
  *
@@ -20,11 +20,12 @@
  *****************************************************************************/
 
 #include <algorithm>
+
 using std::max;
 #include "AdvancedTexEnvCombiner.h"
 #include "CombinerStructs.h"
-#include "MultiTexturingExt.h"    //glActiveTextureARB
 #include "ExtensionChecker.h"
+#include "MultiTexturingExt.h"    //glActiveTextureARB
 
 #ifndef GL_ATI_texture_env_combine3
 #define GL_ATI_texture_env_combine3
@@ -81,9 +82,9 @@ static TexEnvCombinerArg TexEnvArgs[] =
     { GL_CONSTANT_ARB,       GL_SRC_COLOR },
     // K5
     { GL_CONSTANT_ARB,       GL_SRC_COLOR },
-    // ONE
+    // CB_ONE
     { GL_CONSTANT_ARB,       GL_SRC_COLOR },
-    // ZERO
+    // CB_ZERO
     { GL_CONSTANT_ARB,       GL_SRC_COLOR }
 };
 
@@ -123,8 +124,8 @@ void AdvancedTexEnvCombiner::initialize()
 
     if ( ATI_texture_env_combine3 )
     {
-        TexEnvArgs[ONE].source  = GL_ONE;
-        TexEnvArgs[ZERO].source = GL_ZERO;
+        TexEnvArgs[CB_ONE].source  = GL_ONE;
+        TexEnvArgs[CB_ZERO].source = GL_ZERO;
     }
 }
 
@@ -273,7 +274,7 @@ TexEnvCombiner* AdvancedTexEnvCombiner::createNewTextureEnviroment(Combiner* col
                 sb = m_primColor[3];
             else if (alphaCombiner->stage[i].op[j].param1 == ENV_ALPHA)
                 sb = m_envColor[3];
-            else if (alphaCombiner->stage[i].op[j].param1 == ONE)
+            else if (alphaCombiner->stage[i].op[j].param1 == CB_ONE)
                 sb = 1.0f;
 
             if (((alphaCombiner->stage[i].numOps - j) >= 3) &&
@@ -286,7 +287,7 @@ TexEnvCombiner* AdvancedTexEnvCombiner::createNewTextureEnviroment(Combiner* col
                 envCombiner->usesT0 |= alphaCombiner->stage[i].op[j].param1 == TEXEL0_ALPHA;
                 envCombiner->usesT1 |= alphaCombiner->stage[i].op[j].param1 == TEXEL1_ALPHA;
 
-                if (alphaCombiner->stage[i].op[j].param1 == ONE)
+                if (alphaCombiner->stage[i].op[j].param1 == CB_ONE)
                 {
                     SetAlphaCombinerValues( curUnit, arg0, envCombiner->alpha[curUnit].arg0.source, GL_ONE_MINUS_SRC_ALPHA );
                 }
@@ -342,7 +343,7 @@ TexEnvCombiner* AdvancedTexEnvCombiner::createNewTextureEnviroment(Combiner* col
                             (alphaCombiner->stage[i].op[j].param1 == TEXEL1_ALPHA) && (curUnit == 0))
                             curUnit++;
 
-                        if ((j > 0) && (alphaCombiner->stage[i].op[j-1].op == LOAD) && (alphaCombiner->stage[i].op[j-1].param1 == ONE))
+                        if ((j > 0) && (alphaCombiner->stage[i].op[j-1].op == LOAD) && (alphaCombiner->stage[i].op[j-1].param1 == CB_ONE))
                         {
                             SetAlphaCombinerArg( curUnit, arg0, alphaCombiner->stage[i].op[j].param1 );
                             envCombiner->alpha[curUnit].arg0.operand = GL_ONE_MINUS_SRC_ALPHA;
@@ -481,7 +482,7 @@ TexEnvCombiner* AdvancedTexEnvCombiner::createNewTextureEnviroment(Combiner* col
                             ((colorCombiner->stage[i].op[j].param1 == TEXEL1) || (colorCombiner->stage[i].op[j].param1 == TEXEL1_ALPHA)) && (curUnit == 0))
                             curUnit++;
 
-                        if ((j > 0) && (colorCombiner->stage[i].op[j-1].op == LOAD) && (colorCombiner->stage[i].op[j-1].param1 == ONE))
+                        if ((j > 0) && (colorCombiner->stage[i].op[j-1].op == LOAD) && (colorCombiner->stage[i].op[j-1].param1 == CB_ONE))
                         {
                             SetColorCombinerArg( curUnit, arg0, colorCombiner->stage[i].op[j].param1 );
                             envCombiner->color[curUnit].arg0.operand = GL_ONE_MINUS_SRC_COLOR;

src/Combiner/AdvancedTexEnvCombiner.h

@@ -1,6 +1,6 @@
 /******************************************************************************
  * Arachnoid Graphics Plugin for Mupen64Plus
- * http://bitbucket.org/wahrhaft/mupen64plus-video-arachnoid/
+ * https://github.com/mupen64plus/mupen64plus-video-arachnoid/
  *
  * Copyright (C) 2007 Kristofer Karlsson, Rickard Niklasson
  *
@@ -25,6 +25,7 @@
 #include "CombinerBase.h"
 #include "CombinerStructs.h"
 
+class AdvancedTexEnvCombiner;
 struct TexEnvCombiner;
 
 #ifndef GL_ARB_texture_env_combine

src/Combiner/CombinerBase.cpp

@@ -1,6 +1,6 @@
 /******************************************************************************
  * Arachnoid Graphics Plugin for Mupen64Plus
- * http://bitbucket.org/wahrhaft/mupen64plus-video-arachnoid/
+ * https://github.com/mupen64plus/mupen64plus-video-arachnoid/
  *
  * Copyright (C) 2007 Kristofer Karlsson, Rickard Niklasson
  *
@@ -20,6 +20,7 @@
  *****************************************************************************/
 
 #include "CombinerBase.h"
+
 #include "CombinerStructs.h"
 
 //-----------------------------------------------------------------------------
@@ -109,14 +110,14 @@ void CombinerBase::setEnvColor(float r, float g, float b, float a)
 //!    \arg \c PRIMITIVE_ALPHA Get color from primatives alpha value
 //!    \arg \c ENV_ALPHA Get color from environment colors alpha value
 //!    \arg \c PRIM_LOD_FRAC Get color from primative-LOD-frac value
-//!    \arg \c ONE Get white color
-//!    \arg \c ZERO Get black color
+//!    \arg \c CB_ONE Get white color
+//!    \arg \c CB_ZERO Get black color
 //! @param[in] alphaSource From which alphasource to retrive alpha value
 //!    \arg \c PRIMITIVE_ALPHA Get alpha value from primitive colors alpha value
 //!    \arg \c ENV_ALPHA Get alpha value from environment colors alpha value
 //!    \arg \c PRIM_LOD_FRAC Get alpha value from primative-LOD-frac value
-//!    \arg \c ONE Set alpha value to 1.0
-//!    \arg \c ZERO Set alpha value to 0.0
+//!    \arg \c CB_ONE Set alpha value to 1.0
+//!    \arg \c CB_ZERO Set alpha value to 0.0
 //! @param[out] out The combiner color with color and alpha value
 //-----------------------------------------------------------------------------
 void CombinerBase::getCombinerColor(float out[4], short colorSrc, short alphaSrc)
@@ -149,12 +150,12 @@ void CombinerBase::getCombinerColor(float out[4], short colorSrc, short alphaSrc
             out[1] = m_primLodFrac; 
             out[2] = m_primLodFrac; 
             break; 
-        case ONE: 
+        case CB_ONE: 
             out[0] = 1.0f; 
             out[1] = 1.0f; 
             out[2] = 1.0f; 
             break; 
-        case ZERO: 
+        case CB_ZERO: 
             out[0] = 0.0f; 
             out[1] = 0.0f; 
             out[2] = 0.0f; 
@@ -173,10 +174,10 @@ void CombinerBase::getCombinerColor(float out[4], short colorSrc, short alphaSrc
         case PRIM_LOD_FRAC: 
             out[3] = m_primLodFrac; 
             break; 
-        case ONE: 
+        case CB_ONE: 
             out[3] = 1.0f; 
             break; 
-        case ZERO: 
+        case CB_ZERO: 
             out[3] = 0.0f; 
             break; 
     } 

src/Combiner/CombinerBase.h

@@ -1,6 +1,6 @@
 /******************************************************************************
  * Arachnoid Graphics Plugin for Mupen64Plus
- * http://bitbucket.org/wahrhaft/mupen64plus-video-arachnoid/
+ * https://github.com/mupen64plus/mupen64plus-video-arachnoid/
  *
  * Copyright (C) 2007 Kristofer Karlsson, Rickard Niklasson
  *

src/Combiner/CombinerCache.cpp

@@ -1,6 +1,6 @@
 /******************************************************************************
  * Arachnoid Graphics Plugin for Mupen64Plus
- * http://bitbucket.org/wahrhaft/mupen64plus-video-arachnoid/
+ * https://github.com/mupen64plus/mupen64plus-video-arachnoid/
  *
  * Copyright (C) 2007 Kristofer Karlsson, Rickard Niklasson
  *
@@ -21,6 +21,8 @@
 
 #include "CombinerCache.h"
 
+#include "CombinerStructs.h"
+
 //-----------------------------------------------------------------------------
 //* New Compiled Combiner
 //! Function used to add decoded mux values and the result of them to the list.

src/Combiner/CombinerCache.h

@@ -1,6 +1,6 @@
 /******************************************************************************
  * Arachnoid Graphics Plugin for Mupen64Plus
- * http://bitbucket.org/wahrhaft/mupen64plus-video-arachnoid/
+ * https://github.com/mupen64plus/mupen64plus-video-arachnoid/
  *
  * Copyright (C) 2007 Kristofer Karlsson, Rickard Niklasson
  *
@@ -22,9 +22,12 @@
 #ifndef COMBINER_CACHE_H_
 #define COMBINER_CACHE_H_
 
-#include "CombinerStructs.h"
 #include <list>
 
+#include "CombinerStructs.h"
+
+struct TexEnvCombiner;
+
 //*****************************************************************************
 //* Cached Combiner
 //! Struct used to store decoded mux values and the result of them

src/Combiner/CombinerStageCreator.cpp

@@ -1,6 +1,6 @@
 /******************************************************************************
  * Arachnoid Graphics Plugin for Mupen64Plus
- * http://bitbucket.org/wahrhaft/mupen64plus-video-arachnoid/
+ * https://github.com/mupen64plus/mupen64plus-video-arachnoid/
  *
  * Copyright (C) 2007 Kristofer Karlsson, Rickard Niklasson
  *
@@ -28,6 +28,8 @@
 
 #include "CombinerStageCreator.h"
 
+#include "CombinerStructs.h"
+
 //-----------------------------------------------------------------------------
 //* Set Stage
 //! Function used to set combiner stage, tries to simplify and optimize as 
@@ -44,10 +46,10 @@ void setStage(CombineCycle* combineCycle, CombinerStage* stageOut)
     stageOut->numOps = 1;
 
     // If we're just subtracting zero, skip it
-    if (combineCycle->subValue != ZERO)
+    if (combineCycle->subValue != CB_ZERO)
     {
         if (combineCycle->subValue == stageOut->op[0].param1)
-            stageOut->op[0].param1 = ZERO;
+            stageOut->op[0].param1 = CB_ZERO;
         else
         {
             //Subract operation
@@ -58,17 +60,17 @@ void setStage(CombineCycle* combineCycle, CombinerStage* stageOut)
     }
 
     //Multiply operation
-    if ((stageOut->numOps > 1) || (stageOut->op[0].param1 != ZERO))
+    if ((stageOut->numOps > 1) || (stageOut->op[0].param1 != CB_ZERO))
     {
-        if (combineCycle->multValue == ZERO)
+        if (combineCycle->multValue == CB_ZERO)
         {
             stageOut->numOps = 1;
             stageOut->op[0].op = LOAD;
-            stageOut->op[0].param1 = ZERO;
+            stageOut->op[0].param1 = CB_ZERO;
         }
         else
         {
-            if ( stageOut->numOps == 1 && stageOut->op[0].param1 == ONE )
+            if ( stageOut->numOps == 1 && stageOut->op[0].param1 == CB_ONE )
             {
                 //LOAD
                 stageOut->op[0].param1 = combineCycle->multValue;
@@ -84,10 +86,10 @@ void setStage(CombineCycle* combineCycle, CombinerStage* stageOut)
     }
 
     //Don't bother adding zero
-    if (combineCycle->addValue != ZERO)
+    if (combineCycle->addValue != CB_ZERO)
     {
             // If all we have so far is zero, then load this instead
-        if ((stageOut->numOps == 1) && (stageOut->op[0].param1 == ZERO))
+        if ((stageOut->numOps == 1) && (stageOut->op[0].param1 == CB_ZERO))
         {
             stageOut->op[0].param1 = combineCycle->addValue;
         }

src/Combiner/CombinerStageCreator.h

@@ -1,6 +1,6 @@
 /******************************************************************************
  * Arachnoid Graphics Plugin for Mupen64Plus
- * http://bitbucket.org/wahrhaft/mupen64plus-video-arachnoid/
+ * https://github.com/mupen64plus/mupen64plus-video-arachnoid/
  *
  * Copyright (C) 2007 Kristofer Karlsson, Rickard Niklasson
  *
@@ -24,6 +24,9 @@
 
 #include "CombinerStructs.h"
 
+struct CombineCycle;
+struct CombinerStage;
+
 //Function used to set combiner stage
 void setStage(CombineCycle* combineCycle, CombinerStage* stageOut);
 

src/Combiner/CombinerStageMerger.cpp

@@ -1,6 +1,6 @@
 /******************************************************************************
  * Arachnoid Graphics Plugin for Mupen64Plus
- * http://bitbucket.org/wahrhaft/mupen64plus-video-arachnoid/
+ * https://github.com/mupen64plus/mupen64plus-video-arachnoid/
  *
  * Copyright (C) 2007 Kristofer Karlsson, Rickard Niklasson
  *

src/Combiner/CombinerStageMerger.h

@@ -1,6 +1,6 @@
 /******************************************************************************
  * Arachnoid Graphics Plugin for Mupen64Plus
- * http://bitbucket.org/wahrhaft/mupen64plus-video-arachnoid/
+ * https://github.com/mupen64plus/mupen64plus-video-arachnoid/
  *
  * Copyright (C) 2007 Kristofer Karlsson, Rickard Niklasson
  *

src/Combiner/CombinerStructs.h

@@ -1,6 +1,6 @@
 /******************************************************************************
  * Arachnoid Graphics Plugin for Mupen64Plus
- * http://bitbucket.org/wahrhaft/mupen64plus-video-arachnoid/
+ * https://github.com/mupen64plus/mupen64plus-video-arachnoid/
  *
  * Copyright (C) 2007 Kristofer Karlsson, Rickard Niklasson
  *
@@ -22,8 +22,8 @@
 #ifndef COMBINER_STRUCTS_H_
 #define COMBINER_STRUCTS_H_
 
-#include "m64p.h"
 #include "OpenGL.h"
+#include "m64p.h"
 
 // Internal combiner commands
 #define LOAD        0
@@ -53,8 +53,8 @@
 #define NOISE           16
 #define K4              17
 #define K5              18
-#define ONE             19
-#define ZERO            20
+#define CB_ONE          19
+#define CB_ZERO         20
 
 //* Combiner data
 //! Defines how mux-values are coded.

src/Combiner/DummyCombiner.cpp

@@ -1,6 +1,6 @@
 /******************************************************************************
  * Arachnoid Graphics Plugin for Mupen64Plus
- * http://bitbucket.org/wahrhaft/mupen64plus-video-arachnoid/
+ * https://github.com/mupen64plus/mupen64plus-video-arachnoid/
  *
  * Copyright (C) 2007 Kristofer Karlsson, Rickard Niklasson
  *
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *****************************************************************************/
 
-#include "DummyCombiner.h"
 #include "CombinerStructs.h"
+#include "DummyCombiner.h"
 #include "ExtensionChecker.h"
 #include "MultiTexturingExt.h"
 

src/Combiner/DummyCombiner.h

@@ -1,6 +1,6 @@
 /******************************************************************************
  * Arachnoid Graphics Plugin for Mupen64Plus
- * http://bitbucket.org/wahrhaft/mupen64plus-video-arachnoid/
+ * https://github.com/mupen64plus/mupen64plus-video-arachnoid/
  *
  * Copyright (C) 2007 Kristofer Karlsson, Rickard Niklasson
  *

src/Combiner/SimpleTexEnvCombiner.cpp

@@ -1,6 +1,6 @@
 /******************************************************************************
  * Arachnoid Graphics Plugin for Mupen64Plus
- * http://bitbucket.org/wahrhaft/mupen64plus-video-arachnoid/
+ * https://github.com/mupen64plus/mupen64plus-video-arachnoid/
  *
  * Copyright (C) 2007 Kristofer Karlsson, Rickard Niklasson
  *
@@ -19,12 +19,12 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *****************************************************************************/
 
-#include "SimpleTexEnvCombiner.h"
 #include "CombinerStructs.h"
-#include "MultiTexturingExt.h"
 #include "ExtensionChecker.h"
-#include "m64p.h"
+#include "MultiTexturingExt.h"
 #include "OpenGL.h"
+#include "SimpleTexEnvCombiner.h"
+#include "m64p.h"
 
 //-----------------------------------------------------------------------------
 //! Constructor
@@ -172,7 +172,7 @@ TexEnvCombiner* SimpleTexEnvCombiner::createNewTextureEnviroment(Combiner* color
                     if (op->param1 == TEXEL0 || op->param1 == TEXEL0_ALPHA)
                     {
                         if ( mode == GL_MODULATE )
-                            m_color = ONE;
+                            m_color = CB_ONE;
 
                         m_usesTexture0 = true;
                         m_usesTexture1 = false;
@@ -180,7 +180,7 @@ TexEnvCombiner* SimpleTexEnvCombiner::createNewTextureEnviroment(Combiner* color
                     else if ( op->param1 == TEXEL1 || op->param1 == TEXEL1_ALPHA )
                     {
                         if ( mode == GL_MODULATE )
-                            m_color = ONE;
+                            m_color = CB_ONE;
 
                         m_usesTexture0 = false;
                         m_usesTexture1 = true;

src/Combiner/SimpleTexEnvCombiner.h

@@ -1,6 +1,6 @@
 /******************************************************************************
  * Arachnoid Graphics Plugin for Mupen64Plus
- * http://bitbucket.org/wahrhaft/mupen64plus-video-arachnoid/
+ * https://github.com/mupen64plus/mupen64plus-video-arachnoid/
  *
  * Copyright (C) 2007 Kristofer Karlsson, Rickard Niklasson
  *
@@ -22,14 +22,15 @@
 #ifndef SIMPLE_TEX_ENV_COMBINER_H_
 #define SIMPLE_TEX_ENV_COMBINER_H_
 
-#include "GBIDefs.h"
-#include "CombinerStructs.h"
 #include "CombinerBase.h"
+#include "CombinerStructs.h"
+#include "GBIDefs.h"
 
 //Forward declarations
 struct CombineCycle;
-struct CombinerStage;
 struct Combiner;
+struct CombinerStage;
+struct TexEnvCombiner;
 
 //*****************************************************************************
 //! Simple Texture Environment Combiner

src/DisplayListParser.cpp

@@ -1,6 +1,6 @@
 /******************************************************************************
  * Arachnoid Graphics Plugin for Mupen64Plus
- * http://bitbucket.org/wahrhaft/mupen64plus-video-arachnoid/
+ * https://github.com/mupen64plus/mupen64plus-video-arachnoid/
  *
  * Copyright (C) 2007 Kristofer Karlsson, Rickard Niklasson
  *
@@ -20,12 +20,14 @@
  *****************************************************************************/
 
 #include "DisplayListParser.h"
-#include "Memory.h"
+
 #include "GBI.h"
-#include "RSP.h"
-#include "RDP.h"
-#include "OpenGLRenderer.h"
 #include "GBIDefs.h"
+#include "Memory.h"
+#include "OpenGLRenderer.h"
+#include "RDP.h"
+#include "RSP.h"
+#include "UCodeDefs.h"
 
 //-----------------------------------------------------------------------------
 //* Task

src/DisplayListParser.h

@@ -1,6 +1,6 @@
 /******************************************************************************
  * Arachnoid Graphics Plugin for Mupen64Plus
- * http://bitbucket.org/wahrhaft/mupen64plus-video-arachnoid/
+ * https://github.com/mupen64plus/mupen64plus-video-arachnoid/
  *
  * Copyright (C) 2007 Kristofer Karlsson, Rickard Niklasson
  *

src/ExtensionChecker.cpp

@@ -1,6 +1,6 @@
 /******************************************************************************
  * Arachnoid Graphics Plugin for Mupen64Plus
- * http://bitbucket.org/wahrhaft/mupen64plus-video-arachnoid/
+ * https://github.com/mupen64plus/mupen64plus-video-arachnoid/
  *
  * Copyright (C) 2007 Kristofer Karlsson, Rickard Niklasson
  *
@@ -19,9 +19,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *****************************************************************************/
 
-#include "m64p.h"
-#include "OpenGL.h"
+#include <string.h>
+
 #include "ExtensionChecker.h"
+#include "OpenGL.h"
+#include "m64p.h"
 
 //-----------------------------------------------------------------------------
 //! Is Extension Supported

src/ExtensionChecker.h

@@ -1,6 +1,6 @@
 /******************************************************************************
  * Arachnoid Graphics Plugin for Mupen64Plus
- * http://bitbucket.org/wahrhaft/mupen64plus-video-arachnoid/
+ * https://github.com/mupen64plus/mupen64plus-video-arachnoid/
  *
  * Copyright (C) 2007 Kristofer Karlsson, Rickard Niklasson
  *
@@ -19,7 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *****************************************************************************/
 
-#ifndef EXTENSION_CHECKER_H
+#ifndef EXTENSION_CHECKER_H_
 #define EXTENSION_CHECKER_H_
 
 bool isExtensionSupported( const char *extension );

src/FogManager.cpp

@@ -1,6 +1,6 @@
 /******************************************************************************
  * Arachnoid Graphics Plugin for Mupen64Plus
- * http://bitbucket.org/wahrhaft/mupen64plus-video-arachnoid/
+ * https://github.com/mupen64plus/mupen64plus-video-arachnoid/
  *
  * Copyright (C) 2009 Jon Ring
  * Copyright (C) 2007 Kristofer Karlsson, Rickard Niklasson
@@ -20,10 +20,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *****************************************************************************/
 
-#include "FogManager.h"
 #include "ExtensionChecker.h"
-#include "m64p.h"
+#include "FogManager.h"
 #include "OpenGL.h"
+#include "m64p.h"
 
 #ifndef GL_GLEXT_VERSION
     //-----------------------------------------------------------------------------

src/FogManager.h

@@ -1,6 +1,6 @@
 /******************************************************************************
  * Arachnoid Graphics Plugin for Mupen64Plus
- * http://bitbucket.org/wahrhaft/mupen64plus-video-arachnoid/
+ * https://github.com/mupen64plus/mupen64plus-video-arachnoid/
  *
  * Copyright (C) 2007 Kristofer Karlsson, Rickard Niklasson
  *

src/GBI/GBI.cpp

@@ -1,6 +1,6 @@
 /******************************************************************************
  * Arachnoid Graphics Plugin for Mupen64Plus
- * http://bitbucket.org/wahrhaft/mupen64plus-video-arachnoid/
+ * https://github.com/mupen64plus/mupen64plus-video-arachnoid/
  *
  * Copyright (C) 2007 Kristofer Karlsson, Rickard Niklasson
  *
@@ -20,14 +20,18 @@
  *****************************************************************************/
 
 #include "GBI.h"
+
 #include "GBIDefs.h"
-#include "RSP.h"
-#include "RDP.h"
-#include "UCodeSelector.h"
-#include "UCodeIdentificationData.h"
-#include "OpenGLManager.h"
 #include "Logger.h"
+#include "OpenGLManager.h"
+#include "RDP.h"
+#include "RSP.h"
+#include "UCodeIdentificationData.h"
+#include "UCodeSelector.h"
 #include "m64p.h"
+#include "m64p_types.h"
+
+class DisplayListParser;
 
 //-----------------------------------------------------------------------------
 //! Static Variables

src/GBI/GBI.h

@@ -1,6 +1,6 @@
 /******************************************************************************
  * Arachnoid Graphics Plugin for Mupen64Plus
- * http://bitbucket.org/wahrhaft/mupen64plus-video-arachnoid/
+ * https://github.com/mupen64plus/mupen64plus-video-arachnoid/
  *
  * Copyright (C) 2007 Kristofer Karlsson, Rickard Niklasson
  *
@@ -23,21 +23,22 @@
 #define GRAPHIC_BINARY_INTERFACE_H_
 
 
-#include "UCodeDefs.h"
+#include "RDPInstructions.h"
 #include "UCode0.h"     //Super Mario 64
 #include "UCode1.h"     //Games like Mario Kart 64, Starfox 64
+#include "UCode10.h"    //Conker Bad Fur Day
 #include "UCode2.h"     //Golden Eye
 #include "UCode4.h"     //Wave Race 64
 #include "UCode5.h"     //Newer Games
 #include "UCode6.h"     //Diddy Kong Racing
 #include "UCode7.h"     //Yoshi's Story
 #include "UCode9.h"     //Perfect Dark
-#include "UCode10.h"    //Conker Bad Fur Day
-#include "RDPInstructions.h"
+#include "UCodeDefs.h"
 
-class RSP;
-class RDP;
+class DisplayListParser;
 class Memory;
+class RDP;
+class RSP;
 class UCodeSelector;
 
 // Allows easier setting of GBI commands

src/GBI/GBIDefs.h

@@ -1,6 +1,6 @@
 /******************************************************************************
  * Arachnoid Graphics Plugin for Mupen64Plus
- * http://bitbucket.org/wahrhaft/mupen64plus-video-arachnoid/
+ * https://github.com/mupen64plus/mupen64plus-video-arachnoid/
  *
  * Copyright (C) 2007 Kristofer Karlsson, Rickard Niklasson
  *

src/GraphicsPlugin.cpp

@@ -1,6 +1,6 @@
 /******************************************************************************
  * Arachnoid Graphics Plugin for Mupen64Plus
- * http://bitbucket.org/wahrhaft/mupen64plus-video-arachnoid/
+ * https://github.com/mupen64plus/mupen64plus-video-arachnoid/
  *
  * Copyright (C) 2009 Jon Ring
  * Copyright (C) 2007 Kristofer Karlsson, Rickard Niklasson
@@ -20,20 +20,26 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *****************************************************************************/
 
-#include "GraphicsPlugin.h"
-#include "VI.h"                  //Video interface
-#include "Memory.h"              //Access to memory (RDRAM, Texture Memory)
-#include "OpenGLRenderer.h"      //Renderer
-#include "FrameBuffer.h"         //Framebuffer
+#include <sys/time.h>
+#include <ctime>
+
+#include "ConfigMap.h"           //Configuration
 #include "DisplayListParser.h"   //Displaylist parser
 #include "FogManager.h"          //Fog 
-#include "RSP.h"                 //Reality Signal Processor
-#include "RDP.h"                 //Reality Drawing Processor
+#include "FrameBuffer.h"         //Framebuffer
 #include "GBI.h"                 //Graphics Binary Interface 
-#include "ConfigMap.h"           //Configuration
+#include "GraphicsPlugin.h"
 #include "Logger.h"              //Debug logger
+#include "Memory.h"              //Access to memory (RDRAM, Texture Memory)
+#include "OpenGL.h"
+#include "OpenGLManager.h"
+#include "OpenGLRenderer.h"      //Renderer
+#include "RDP.h"                 //Reality Drawing Processor
+#include "RSP.h"                 //Reality Signal Processor
 #include "RomDetector.h"
-#include <ctime>
+#include "VI.h"                  //Video interface
+#include "m64p.h"
+#include "m64p_types.h"
 
 //FrameBuffer framebuffer01;
 //FrameBuffer framebuffer02;
@@ -101,7 +107,7 @@ bool GraphicsPlugin::initialize(GFX_INFO* graphicsInfo)
     }
 
     if (CoreVideo_SetVideoMode(m_config->fullscreenWidth, m_config->fullscreenHeight, m_config->fullscreenBitDepth, 
-        m_config->startFullscreen ? M64VIDEO_FULLSCREEN : M64VIDEO_WINDOWED) != M64ERR_SUCCESS)
+        m_config->startFullscreen ? M64VIDEO_FULLSCREEN : M64VIDEO_WINDOWED, (m64p_video_flags) 0) != M64ERR_SUCCESS)
     {
         Logger::getSingleton().printMsg("Could not set video mode.", M64MSG_ERROR);
         return false;

src/GraphicsPlugin.h

@@ -1,6 +1,6 @@
 /******************************************************************************
  * Arachnoid Graphics Plugin for Mupen64Plus
- * http://bitbucket.org/wahrhaft/mupen64plus-video-arachnoid/
+ * https://github.com/mupen64plus/mupen64plus-video-arachnoid/
  *
  * Copyright (C) 2009 Jon Ring
  * Copyright (C) 2007 Kristofer Karlsson, Rickard Niklasson
@@ -23,18 +23,21 @@
 #ifndef GRAPHICS_PLUGIN_H_
 #define GRAPHICS_PLUGIN_H_
 
-#include "TextureCache.h"
+#include "GBI.h"
 #include "OpenGLManager.h"         //Initializes OpenGL and handles OpenGL states
-#include "RSP.h"
 #include "RDP.h"
+#include "RSP.h"
+#include "TextureCache.h"
+#include "m64p_plugin.h"
 
 //Forward declarations
-//struct GFX_INFO;
-class VI;
-class Memory;
 class DisplayListParser;
 class FogManager;
+class Memory;
+class OpenGLManager;
 class ROMDetector;
+//struct GFX_INFO;
+class VI;
 struct ConfigMap;
 
 //*****************************************************************************

src/Memory.cpp

@@ -1,6 +1,6 @@
 /******************************************************************************
  * Arachnoid Graphics Plugin for Mupen64Plus
- * http://bitbucket.org/wahrhaft/mupen64plus-video-arachnoid/
+ * https://github.com/mupen64plus/mupen64plus-video-arachnoid/
  *
  * Copyright (C) 2007 Kristofer Karlsson, Rickard Niklasson
  *

src/Memory.h

@@ -1,6 +1,6 @@
 /******************************************************************************
  * Arachnoid Graphics Plugin for Mupen64Plus
- * http://bitbucket.org/wahrhaft/mupen64plus-video-arachnoid/
+ * https://github.com/mupen64plus/mupen64plus-video-arachnoid/
  *
  * Copyright (C) 2007 Kristofer Karlsson, Rickard Niklasson
  *

src/MultiTexturingExt.cpp

@@ -1,6 +1,6 @@
 /******************************************************************************
  * Arachnoid Graphics Plugin for Mupen64Plus
- * http://bitbucket.org/wahrhaft/mupen64plus-video-arachnoid/
+ * https://github.com/mupen64plus/mupen64plus-video-arachnoid/
  *
  * Copyright (C) 2007 Kristofer Karlsson, Rickard Niklasson
  *
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *****************************************************************************/
 
-#include "MultiTexturingExt.h"
 #include "ExtensionChecker.h"
+#include "MultiTexturingExt.h"
 
 
 //Multi Texturing functions

src/MultiTexturingExt.h

@@ -1,6 +1,6 @@
 /******************************************************************************
  * Arachnoid Graphics Plugin for Mupen64Plus
- * http://bitbucket.org/wahrhaft/mupen64plus-video-arachnoid/
+ * https://github.com/mupen64plus/mupen64plus-video-arachnoid/
  *
  * Copyright (C) 2009 Jon Ring
  * Copyright (C) 2007 Kristofer Karlsson, Rickard Niklasson
@@ -23,8 +23,8 @@
 #ifndef MULTI_TEXTURING_EXTENSION_H_
 #define MULTI_TEXTURING_EXTENSION_H_
 
-#include "m64p.h"
 #include "OpenGL.h"
+#include "m64p.h"
 
 #ifndef GL_GLEXT_VERSION
     //Multi Texturing Definitions

src/N64Games.h

@@ -1,6 +1,6 @@
 /******************************************************************************
  * Arachnoid Graphics Plugin for Mupen64Plus
- * http://bitbucket.org/wahrhaft/mupen64plus-video-arachnoid/
+ * https://github.com/mupen64plus/mupen64plus-video-arachnoid/
  *
  * Copyright (C) 2007 Kristofer Karlsson, Rickard Niklasson
  *

src/OpenGL.h

@@ -1,6 +1,6 @@
 /******************************************************************************
  * Arachnoid Graphics Plugin for Mupen64Plus
- * http://bitbucket.org/wahrhaft/mupen64plus-video-arachnoid/
+ * https://github.com/mupen64plus/mupen64plus-video-arachnoid/
  *
  * Copyright (C) 2009 Jon Ring
  *
@@ -24,7 +24,13 @@
 #ifndef WIN32
     #define GL_GLEXT_PROTOTYPES
 #endif
+#if defined(__MACOSX__)
+#include <OpenGL/gl.h>
+#elif defined(__MACOS__)
+#include <gl.h>
+#else
 #include <GL/gl.h>
+#endif
 #ifndef WIN32
     #include <GL/glext.h>
 #endif

src/OpenGLManager.cpp

@@ -1,6 +1,6 @@
 /******************************************************************************
  * Arachnoid Graphics Plugin for Mupen64Plus
- * http://bitbucket.org/wahrhaft/mupen64plus-video-arachnoid/
+ * https://github.com/mupen64plus/mupen64plus-video-arachnoid/
  *
  * Copyright (C) 2009 Jon Ring
  * Copyright (C) 2007 Kristofer Karlsson, Rickard Niklasson
@@ -20,7 +20,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *****************************************************************************/
 
+#include <stddef.h>
+
 #include "OpenGLManager.h"
+#include "m64p.h"
 
 //-----------------------------------------------------------------------------
 //! Constructor
@@ -55,6 +58,7 @@ bool OpenGLManager::initialize(bool fullscreen, int width, int height, int bitDe
     glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
     glEnable(GL_DEPTH_TEST);
     glEnable(GL_CULL_FACE);
+    this->setViewport(0, 0, width, height);
 
     //Set render states
     setCullMode(false, true);

src/OpenGLManager.h

@@ -1,6 +1,6 @@
 /******************************************************************************
  * Arachnoid Graphics Plugin for Mupen64Plus
- * http://bitbucket.org/wahrhaft/mupen64plus-video-arachnoid/
+ * https://github.com/mupen64plus/mupen64plus-video-arachnoid/
  *
  * Copyright (C) 2009 Jon Ring
  * Copyright (C) 2007 Kristofer Karlsson, Rickard Niklasson
@@ -23,9 +23,9 @@
 #ifndef OPEN_GL_Manager_H_
 #define OPEN_GL_Manager_H_
 
+#include "OpenGL.h"
 //OpenGL includes
 #include "m64p.h"
-#include "OpenGL.h"
 
 //*****************************************************************************
 //* OpenGL Manager Class                                                        

src/RDP/RDP.cpp

@@ -1,6 +1,6 @@
 /******************************************************************************
  * Arachnoid Graphics Plugin for Mupen64Plus
- * http://bitbucket.org/wahrhaft/mupen64plus-video-arachnoid/
+ * https://github.com/mupen64plus/mupen64plus-video-arachnoid/
  *
  * Copyright (C) 2007 Kristofer Karlsson, Rickard Niklasson
  *
@@ -19,26 +19,31 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *****************************************************************************/
 
-#include "RDP.h"
-#include "GBIDefs.h"
-#include "GBI.h"
-#include "RSP.h"
-#include "DisplayListParser.h"
-#include "assembler.h"
-#include "OpenGLRenderer.h"
-#include "TextureCache.h"
-#include "VI.h"
-#include "Memory.h"
-#include "OpenGLManager.h"
-#include "OpenGL2DRenderer.h"
+#include <algorithm>
+
 #include "AdvancedCombinerManager.h"
+#include "CachedTexture.h"
+#include "DisplayListParser.h"
 #include "FogManager.h"
+#include "GBI.h"
+#include "GBIDefs.h"
 #include "Logger.h"
 #include "MathLib.h"
-#include "RomDetector.h"
-#include "m64p.h"
+#include "Memory.h"
+#include "N64Games.h"
 #include "OpenGL.h"
-#include <algorithm>
+#include "OpenGL2DRenderer.h"
+#include "OpenGLManager.h"
+#include "OpenGLRenderer.h"
+#include "RDP.h"
+#include "RSP.h"
+#include "RomDetector.h"
+#include "TextureCache.h"
+#include "VI.h"
+#include "assembler.h"
+#include "m64p.h"
+#include "m64p_types.h"
+
 using std::max;
 
 //-----------------------------------------------------------------------------

src/RDP/RDP.h

@@ -1,6 +1,6 @@
 /******************************************************************************
  * Arachnoid Graphics Plugin for Mupen64Plus
- * http://bitbucket.org/wahrhaft/mupen64plus-video-arachnoid/
+ * https://github.com/mupen64plus/mupen64plus-video-arachnoid/
  *
  * Copyright (C) 2007 Kristofer Karlsson, Rickard Niklasson
  *
@@ -24,22 +24,23 @@
 
 //Includes
 #define M64P_PLUGIN_PROTOTYPES 1
-#include "m64p_plugin.h"
-#include "UCodeDefs.h"
 #include "GBI.h"
 #include "GBIDefs.h"
 #include "TextureLoader.h"
+#include "UCodeDefs.h"
+#include "m64p_plugin.h"
 
 //Forward declaration
-class RSP;
-class VI;
-class Memory;
-class DisplayListParser;
-class TextureCache;
 class AdvancedCombinerManager;
+class DisplayListParser;
 class FogManager;
-class TextureLoader;
+class GBI;
+class Memory;
 class OpenGL2DRenderer;
+class RSP;
+class TextureCache;
+class TextureLoader;
+class VI;
 
 //*****************************************************************************
 //! RDPSetImgInfo

src/RDP/RDPInstructions.cpp

@@ -1,6 +1,6 @@
 /******************************************************************************
  * Arachnoid Graphics Plugin for Mupen64Plus
- * http://bitbucket.org/wahrhaft/mupen64plus-video-arachnoid/
+ * https://github.com/mupen64plus/mupen64plus-video-arachnoid/
  *
  * Copyright (C) 2007 Kristofer Karlsson, Rickard Niklasson
  *
@@ -19,11 +19,12 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *****************************************************************************/
 
-#include "RDPInstructions.h"
-#include "RDPUCodeStructs.h"
-#include "RDP.h"
 #include "DisplayListParser.h"
 #include "Logger.h"
+#include "RDP.h"
+#include "RDPInstructions.h"
+#include "RDPUCodeStructs.h"
+#include "m64p_types.h"
 
 //-----------------------------------------------------------------------------
 // Static Variables

src/RDP/RDPInstructions.h

@@ -1,6 +1,6 @@
 /******************************************************************************
  * Arachnoid Graphics Plugin for Mupen64Plus
- * http://bitbucket.org/wahrhaft/mupen64plus-video-arachnoid/
+ * https://github.com/mupen64plus/mupen64plus-video-arachnoid/
  *
  * Copyright (C) 2007 Kristofer Karlsson, Rickard Niklasson
  *

src/RDP/RDPUCodeStructs.h

@@ -1,6 +1,6 @@
 /******************************************************************************
  * Arachnoid Graphics Plugin for Mupen64Plus
- * http://bitbucket.org/wahrhaft/mupen64plus-video-arachnoid/
+ * https://github.com/mupen64plus/mupen64plus-video-arachnoid/
  *
  * Copyright (C) 2007 Kristofer Karlsson, Rickard Niklasson
  *

src/RSP/RSP.cpp

@@ -1,6 +1,6 @@
 /******************************************************************************
  * Arachnoid Graphics Plugin for Mupen64Plus
- * http://bitbucket.org/wahrhaft/mupen64plus-video-arachnoid/
+ * https://github.com/mupen64plus/mupen64plus-video-arachnoid/
  *
  * Copyright (C) 2007 Kristofer Karlsson, Rickard Niklasson
  *
@@ -19,21 +19,24 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *****************************************************************************/
 
-#include "RSP.h"
-#include "../UCodeDefs.h"
-#include "../RDP/RDP.h"
 #include <cmath>
-#include "GBIDefs.h"
-#include "VI.h"
-#include "Memory.h"
-#include "Logger.h"
-#include "OpenGLRenderer.h"
-#include "OpenGLManager.h"
-#include "RSPLightManager.h"
-#include "FogManager.h"
+
+#include "../RDP/RDP.h"
+#include "../UCodeDefs.h"
 #include "DisplayListParser.h"
+#include "FogManager.h"
+#include "GBI.h"
+#include "GBIDefs.h"
+#include "Logger.h"
 #include "MathLib.h"
-#include "MathLib.h"
+#include "Memory.h"
+#include "OpenGLManager.h"
+#include "OpenGLRenderer.h"
+#include "RSP.h"
+#include "RSPLightManager.h"
+#include "RSPMatrixManager.h"
+#include "VI.h"
+#include "m64p_types.h"
 
 #define MI_INTR_SP                 0x00000001  //!< RSP Interrupt signal
 

src/RSP/RSP.h

@@ -1,6 +1,6 @@
 /******************************************************************************
  * Arachnoid Graphics Plugin for Mupen64Plus
- * http://bitbucket.org/wahrhaft/mupen64plus-video-arachnoid/
+ * https://github.com/mupen64plus/mupen64plus-video-arachnoid/
  *
  * Copyright (C) 2007 Kristofer Karlsson, Rickard Niklasson
  *
@@ -23,20 +23,21 @@
 #define REALITY_SIGNAL_PROCESSOR_H_
 
 #define M64P_PLUGIN_PROTOTYPES 1
-#include "m64p_plugin.h"
-#include "UCodeDefs.h"
+#include "Matrix4.h"
 #include "RSPMatrixManager.h"
 #include "RSPVertexManager.h"
-#include "Matrix4.h"
+#include "UCodeDefs.h"
+#include "m64p_plugin.h"
 
 //Forward declarations
+class DisplayListParser;
+class FogManager;
+class Memory;
+class RDP;
+class RSPLightManager;
+class RSPMatrixManager;
 class VI;
 struct RDPTile;
-class RDP;
-class Memory;
-class DisplayListParser;
-class RSPLightManager;
-class FogManager;
 
 //-----------------------------------------------------------------------------
 // Defines

src/RSP/RSPLightManager.cpp

@@ -1,6 +1,6 @@
 /******************************************************************************
  * Arachnoid Graphics Plugin for Mupen64Plus
- * http://bitbucket.org/wahrhaft/mupen64plus-video-arachnoid/
+ * https://github.com/mupen64plus/mupen64plus-video-arachnoid/
  *
  * Copyright (C) 2007 Kristofer Karlsson, Rickard Niklasson
  *
@@ -19,11 +19,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *****************************************************************************/
 
-#include "RSPLightManager.h"
-#include "Memory.h"
-#include "MathLib.h"
 #include "GBI.h"
 #include "Logger.h"
+#include "MathLib.h"
+#include "Memory.h"
+#include "RSPLightManager.h"
 
 #define RGBA_GETALPHA(rgb)      ((rgb) >> 24)
 #define RGBA_GETRED(rgb)        (((rgb) >> 16) & 0xff)

src/RSP/RSPLightManager.h

@@ -1,6 +1,6 @@
 /******************************************************************************
  * Arachnoid Graphics Plugin for Mupen64Plus
- * http://bitbucket.org/wahrhaft/mupen64plus-video-arachnoid/
+ * https://github.com/mupen64plus/mupen64plus-video-arachnoid/
  *
  * Copyright (C) 2007 Kristofer Karlsson, Rickard Niklasson
  *

src/RSP/RSPMatrixManager.cpp

@@ -1,6 +1,6 @@
 /******************************************************************************
  * Arachnoid Graphics Plugin for Mupen64Plus
- * http://bitbucket.org/wahrhaft/mupen64plus-video-arachnoid/
+ * https://github.com/mupen64plus/mupen64plus-video-arachnoid/
  *
  * Copyright (C) 2007 Kristofer Karlsson, Rickard Niklasson
  *
@@ -19,11 +19,13 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *****************************************************************************/
 
-#include "RSPMatrixManager.h"
-#include "Memory.h"
 #include <cmath>      //modff
+
 #include "GBI.h"      //SHIFT
 #include "GBIDefs.h"  //_FIXED2FLOAT
+#include "Memory.h"
+#include "RSPMatrixManager.h"
+
 //-----------------------------------------------------------------------------
 //! Constructor
 //-----------------------------------------------------------------------------

src/RSP/RSPMatrixManager.h

@@ -1,6 +1,6 @@
 /******************************************************************************
  * Arachnoid Graphics Plugin for Mupen64Plus
- * http://bitbucket.org/wahrhaft/mupen64plus-video-arachnoid/
+ * https://github.com/mupen64plus/mupen64plus-video-arachnoid/
  *
  * Copyright (C) 2007 Kristofer Karlsson, Rickard Niklasson
  *

src/RSP/RSPVertexManager.cpp

@@ -1,6 +1,6 @@
 /******************************************************************************
  * Arachnoid Graphics Plugin for Mupen64Plus
- * http://bitbucket.org/wahrhaft/mupen64plus-video-arachnoid/
+ * https://github.com/mupen64plus/mupen64plus-video-arachnoid/
  *
  * Copyright (C) 2007 Kristofer Karlsson, Rickard Niklasson
  *
@@ -19,16 +19,20 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *****************************************************************************/
 
-#include "RSPVertexManager.h"
-#include "OpenGLManager.h"
-#include "Memory.h"
-#include "RSPMatrixManager.h"
-#include "RSPLightManager.h"
-#include "OpenGLRenderer.h"
-#include "GBIDefs.h"   //hmm
-#include "MathLib.h"   //Transform, Vec3Normalize
 #include <cmath> //sqrt
+
+#include "GBI.h"
+#include "GBIDefs.h"   //hmm
 #include "Logger.h"
+#include "MathLib.h"   //Transform, Vec3Normalize
+#include "Memory.h"
+#include "OpenGL.h"
+#include "OpenGLManager.h"
+#include "OpenGLRenderer.h"
+#include "RSPLightManager.h"
+#include "RSPMatrixManager.h"
+#include "RSPVertexManager.h"
+#include "m64p_types.h"
 
 //Vertex
 struct Vertex

src/RSP/RSPVertexManager.h

@@ -1,6 +1,6 @@
 /******************************************************************************
  * Arachnoid Graphics Plugin for Mupen64Plus
- * http://bitbucket.org/wahrhaft/mupen64plus-video-arachnoid/
+ * https://github.com/mupen64plus/mupen64plus-video-arachnoid/
  *
  * Copyright (C) 2007 Kristofer Karlsson, Rickard Niklasson
  *

src/RomDetector.cpp

@@ -1,6 +1,6 @@
 /******************************************************************************
  * Arachnoid Graphics Plugin for Mupen64Plus
- * http://bitbucket.org/wahrhaft/mupen64plus-video-arachnoid/
+ * https://github.com/mupen64plus/mupen64plus-video-arachnoid/
  *
  * Copyright (C) 2007 Kristofer Karlsson, Rickard Niklasson
  *
@@ -19,10 +19,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *****************************************************************************/
 
-#include "RomDetector.h"
-#include "assembler.h"   //swapRomHeaderBytes
 #include <string.h>      //memcpy
+
+#include "RomDetector.h"
 #include "StringFunctions.h"
+#include "assembler.h"   //swapRomHeaderBytes
 
 //-----------------------------------------------------------------------------
 //! Constructor

src/RomDetector.h

@@ -1,6 +1,6 @@
 /******************************************************************************
  * Arachnoid Graphics Plugin for Mupen64Plus
- * http://bitbucket.org/wahrhaft/mupen64plus-video-arachnoid/
+ * https://github.com/mupen64plus/mupen64plus-video-arachnoid/
  *
  * Copyright (C) 2007 Kristofer Karlsson, Rickard Niklasson
  *

src/SecondaryColorExt.cpp

@@ -1,6 +1,6 @@
 /******************************************************************************
  * Arachnoid Graphics Plugin for Mupen64Plus
- * http://bitbucket.org/wahrhaft/mupen64plus-video-arachnoid/
+ * https://github.com/mupen64plus/mupen64plus-video-arachnoid/
  *
  * Copyright (C) 2007 Kristofer Karlsson, Rickard Niklasson
  *
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *****************************************************************************/
 
-#include "SecondaryColorExt.h"
 #include "ExtensionChecker.h"
+#include "SecondaryColorExt.h"
 
 // EXT_secondary_color functions
 #ifndef GL_GLEXT_VERSION

src/SecondaryColorExt.h

@@ -1,6 +1,6 @@
 /******************************************************************************
  * Arachnoid Graphics Plugin for Mupen64Plus
- * http://bitbucket.org/wahrhaft/mupen64plus-video-arachnoid/
+ * https://github.com/mupen64plus/mupen64plus-video-arachnoid/
  *
  * Copyright (C) 2009 Jon Ring
  * Copyright (C) 2007 Kristofer Karlsson, Rickard Niklasson
@@ -23,8 +23,8 @@
 #ifndef SECONDARY_COLOR_EXTENSION_H_
 #define SECONDARY_COLOR_EXTENSION_H_
 
-#include "m64p.h"
 #include "OpenGL.h"
+#include "m64p.h"
 
 #ifndef GL_GLEXT_VERSION
     #ifndef GL_EXT_secondary_color

src/UCodeDefs.h

@@ -1,6 +1,6 @@
 /******************************************************************************
  * Arachnoid Graphics Plugin for Mupen64Plus
- * http://bitbucket.org/wahrhaft/mupen64plus-video-arachnoid/
+ * https://github.com/mupen64plus/mupen64plus-video-arachnoid/
  *
  * Copyright (C) 2007 Kristofer Karlsson, Rickard Niklasson
  *

src/VI.cpp

@@ -1,6 +1,6 @@
 /******************************************************************************
  * Arachnoid Graphics Plugin for Mupen64Plus
- * http://bitbucket.org/wahrhaft/mupen64plus-video-arachnoid/
+ * https://github.com/mupen64plus/mupen64plus-video-arachnoid/
  *
  * Copyright (C) 2007 Kristofer Karlsson, Rickard Niklasson
  *
@@ -19,8 +19,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *****************************************************************************/
 
-#include "VI.h"
+#include "GBI.h"
 #include "GBIDefs.h" //_FIXED2FLOAT, _SHIFTR
+#include "VI.h"
 #include "m64p.h"
 
 //-----------------------------------------------------------------------------

src/VI.h

@@ -1,6 +1,6 @@
 /******************************************************************************
  * Arachnoid Graphics Plugin for Mupen64Plus
- * http://bitbucket.org/wahrhaft/mupen64plus-video-arachnoid/
+ * https://github.com/mupen64plus/mupen64plus-video-arachnoid/
  *
  * Copyright (C) 2007 Kristofer Karlsson, Rickard Niklasson
  *

src/config/Config.cpp

@@ -1,6 +1,6 @@
 /******************************************************************************
  * Arachnoid Graphics Plugin for Mupen64Plus
- * http://bitbucket.org/wahrhaft/mupen64plus-video-arachnoid/
+ * https://github.com/mupen64plus/mupen64plus-video-arachnoid/
  *
  * Copyright (C) 2009 Jon Ring
  * Copyright (C) 2007 Kristofer Karlsson, Rickard Niklasson
@@ -20,10 +20,12 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *****************************************************************************/
 
-#include "Config.h"
 #include <cstdio> 
+
+#include "Config.h"
 #include "GraphicsPlugin.h"
 #include "Logger.h"
+#include "m64p.h"
 
 //-----------------------------------------------------------------------------
 //! Constructor

src/config/Config.h

@@ -1,6 +1,6 @@
 /******************************************************************************
  * Arachnoid Graphics Plugin for Mupen64Plus
- * http://bitbucket.org/wahrhaft/mupen64plus-video-arachnoid/
+ * https://github.com/mupen64plus/mupen64plus-video-arachnoid/
  *
  * Copyright (C) 2009 Jon Ring
  * Copyright (C) 2007 Kristofer Karlsson, Rickard Niklasson
@@ -23,8 +23,9 @@
 #ifndef CONFIG_H_
 #define CONFIG_H_
 
-#include "m64p.h"
 #include "ConfigMap.h"
+#include "m64p.h"
+#include "m64p_types.h"
 
 //Forward declaration
 class GraphicsPlugin;

src/config/ConfigMap.h

@@ -1,6 +1,6 @@
 /******************************************************************************
  * Arachnoid Graphics Plugin for Mupen64Plus
- * http://bitbucket.org/wahrhaft/mupen64plus-video-arachnoid/
+ * https://github.com/mupen64plus/mupen64plus-video-arachnoid/
  *
  * Copyright (C) 2007 Kristofer Karlsson, Rickard Niklasson
  *

src/config/StringFunctions.cpp

@@ -1,6 +1,6 @@
 /******************************************************************************
  * Arachnoid Graphics Plugin for Mupen64Plus
- * http://bitbucket.org/wahrhaft/mupen64plus-video-arachnoid/
+ * https://github.com/mupen64plus/mupen64plus-video-arachnoid/
  *
  * Copyright (C) 2007 Kristofer Karlsson, Rickard Niklasson
  *
@@ -19,8 +19,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *****************************************************************************/
 
-#include "StringFunctions.h"
+#include <ctype.h>
 #include <cstring>
+
+#include "StringFunctions.h"
+
 using std::string;
 using std::vector;
 
@@ -95,6 +98,12 @@ void trim(string& str, bool left, bool right, const string delims)
 //-----------------------------------------------------------------------------
 char* trim(char* str, bool left, bool right)
 {
+    // Empty string check
+    if (*str == '\0')
+    {
+        return str;
+    }
+
     //Trim from the left
     if(left)
     {

src/config/StringFunctions.h

@@ -1,6 +1,6 @@
 /******************************************************************************
  * Arachnoid Graphics Plugin for Mupen64Plus
- * http://bitbucket.org/wahrhaft/mupen64plus-video-arachnoid/
+ * https://github.com/mupen64plus/mupen64plus-video-arachnoid/
  *
  * Copyright (C) 2007 Kristofer Karlsson, Rickard Niklasson
  *
@@ -64,10 +64,11 @@ in binary (= untranslated) mode and check for the different newlines yourself.
 #ifndef STRING_FUNCTIONS_H_
 #define STRING_FUNCTIONS_H_
 
+#include <ctype.h>
+#include <stddef.h>
+#include <algorithm>  //std::transform
 #include <string>
 #include <vector>
-#include <ctype.h>
-#include <algorithm>  //std::transform
     
 namespace StringFunctions 
 {

src/config/StringValue.h

@@ -1,6 +1,6 @@
 /******************************************************************************
  * Arachnoid Graphics Plugin for Mupen64Plus
- * http://bitbucket.org/wahrhaft/mupen64plus-video-arachnoid/
+ * https://github.com/mupen64plus/mupen64plus-video-arachnoid/
  *
  * Copyright (C) 2007 Kristofer Karlsson, Rickard Niklasson
  *
@@ -22,8 +22,8 @@
 #ifndef STRING_VALUE_H_
 #define STRING_VALUE_H_
 #include <cstdlib>
-#include <string>
 #include <sstream>
+#include <string>
 
 //! Represents numeric value(s) with a string using conversion operators 
 struct StringValue

src/framebuffer/FrameBuffer.cpp

@@ -1,6 +1,6 @@
 /******************************************************************************
  * Arachnoid Graphics Plugin for Mupen64Plus
- * http://bitbucket.org/wahrhaft/mupen64plus-video-arachnoid/
+ * https://github.com/mupen64plus/mupen64plus-video-arachnoid/
  *
  * Copyright (C) 2007 Kristofer Karlsson, Rickard Niklasson
  *
@@ -19,9 +19,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *****************************************************************************/
 
+#include <string.h>
+
 #include "FrameBuffer.h"
-#include "m64p.h"
 #include "OpenGL.h"
+#include "m64p.h"
 
 #ifndef GL_GLEXT_VERSION
     //-----------------------------------------------------------------------------

src/framebuffer/FrameBuffer.h

@@ -1,6 +1,6 @@
 /******************************************************************************
  * Arachnoid Graphics Plugin for Mupen64Plus
- * http://bitbucket.org/wahrhaft/mupen64plus-video-arachnoid/
+ * https://github.com/mupen64plus/mupen64plus-video-arachnoid/
  *
  * Copyright (C) 2007 Kristofer Karlsson, Rickard Niklasson
  *

src/hash/CRCCalculator.cpp

@@ -1,6 +1,6 @@
 /******************************************************************************
  * Arachnoid Graphics Plugin for Mupen64Plus
- * http://bitbucket.org/wahrhaft/mupen64plus-video-arachnoid/
+ * https://github.com/mupen64plus/mupen64plus-video-arachnoid/
  *
  * Copyright (C) 2007 Kristofer Karlsson, Rickard Niklasson
  *

src/hash/CRCCalculator.h

@@ -1,6 +1,6 @@
 /******************************************************************************
  * Arachnoid Graphics Plugin for Mupen64Plus
- * http://bitbucket.org/wahrhaft/mupen64plus-video-arachnoid/
+ * https://github.com/mupen64plus/mupen64plus-video-arachnoid/
  *
  * Copyright (C) 2007 Kristofer Karlsson, Rickard Niklasson
  *

src/hash/CRCCalculator2.cpp

@@ -1,6 +1,6 @@
 /******************************************************************************
  * Arachnoid Graphics Plugin for Mupen64Plus
- * http://bitbucket.org/wahrhaft/mupen64plus-video-arachnoid/
+ * https://github.com/mupen64plus/mupen64plus-video-arachnoid/
  *
  * Copyright (C) 2007 Kristofer Karlsson, Rickard Niklasson
  *

src/hash/CRCCalculator2.h

@@ -1,6 +1,6 @@
 /******************************************************************************
  * Arachnoid Graphics Plugin for Mupen64Plus
- * http://bitbucket.org/wahrhaft/mupen64plus-video-arachnoid/
+ * https://github.com/mupen64plus/mupen64plus-video-arachnoid/
  *
  * Copyright (C) 2007 Kristofer Karlsson, Rickard Niklasson
  *

src/log/Logger.cpp

@@ -1,6 +1,6 @@
 /******************************************************************************
  * Arachnoid Graphics Plugin for Mupen64Plus
- * http://bitbucket.org/wahrhaft/mupen64plus-video-arachnoid/
+ * https://github.com/mupen64plus/mupen64plus-video-arachnoid/
  *
  * Copyright (C) 2009 Jon Ring
  * Copyright (C) 2007 Kristofer Karlsson, Rickard Niklasson

src/log/Logger.h

@@ -1,6 +1,6 @@
 /******************************************************************************
  * Arachnoid Graphics Plugin for Mupen64Plus
- * http://bitbucket.org/wahrhaft/mupen64plus-video-arachnoid/
+ * https://github.com/mupen64plus/mupen64plus-video-arachnoid/
  *
  * Copyright (C) 2009 Jon Ring
  * Copyright (C) 2007 Kristofer Karlsson, Rickard Niklasson
@@ -24,6 +24,7 @@
 #define LOGGER_H_
 
 #include <cstdlib>
+
 #include "m64p_types.h"
 
 //*****************************************************************************

src/m64p.h

@@ -1,6 +1,6 @@
 /******************************************************************************
  * Arachnoid Graphics Plugin for Mupen64Plus
- * http://bitbucket.org/wahrhaft/mupen64plus-video-arachnoid/
+ * https://github.com/mupen64plus/mupen64plus-video-arachnoid/
  *
  * Copyright (C) 2009 Jon Ring
  *
@@ -32,9 +32,9 @@
 #endif
 
 #define M64P_PLUGIN_PROTOTYPES 1
-#include "m64p_types.h"
-#include "m64p_plugin.h"
 #include "m64p_config.h"
+#include "m64p_plugin.h"
+#include "m64p_types.h"
 #include "m64p_vidext.h"
 
 /* definitions of pointers to Core config functions */
@@ -63,6 +63,7 @@ extern ptr_VidExt_ListFullscreenModes   CoreVideo_ListFullscreenModes;
 extern ptr_VidExt_SetVideoMode          CoreVideo_SetVideoMode;
 extern ptr_VidExt_SetCaption            CoreVideo_SetCaption;
 extern ptr_VidExt_ToggleFullScreen      CoreVideo_ToggleFullScreen;
+extern ptr_VidExt_ResizeWindow          CoreVideo_ResizeWindow;
 extern ptr_VidExt_GL_GetProcAddress     CoreVideo_GL_GetProcAddress;
 extern ptr_VidExt_GL_SetAttribute       CoreVideo_GL_SetAttribute;
 extern ptr_VidExt_GL_SwapBuffers        CoreVideo_GL_SwapBuffers;

src/main.cpp

@@ -1,6 +1,6 @@
 /******************************************************************************
  * Arachnoid Graphics Plugin for Mupen64Plus
- * http://bitbucket.org/wahrhaft/mupen64plus-video-arachnoid/
+ * https://github.com/mupen64plus/mupen64plus-video-arachnoid/
  *
  * Copyright (C) 2009 Jon Ring
  * Copyright (C) 2007 Kristofer Karlsson, Rickard Niklasson
@@ -22,26 +22,29 @@
 
 //Includes
 #define M64P_PLUGIN_PROTOTYPES 1
-#include "m64p.h"
+#include <stdio.h>
+#include <string.h>
+
+#include "ConfigMap.h"
 #include "GraphicsPlugin.h"        //Main class
-#include "config/Config.h"         //Configuration   
 #include "Logger.h"                //Debug logger
 #include "MemoryLeakDetector.h"    //For detecting memory leaks
-
-#include "m64p_types.h"
+#include "OpenGLManager.h"
+#include "config/Config.h"         //Configuration   
+#include "m64p.h"
 #include "m64p_common.h"
-#include "m64p_plugin.h"
 #include "m64p_config.h"
+#include "m64p_plugin.h"
+#include "m64p_types.h"
 #include "m64p_vidext.h"
-
 #include "osal_dynamiclib.h"
 
 //Definitions
 #define PLUGIN_NAME "Arachnoid Video Plugin"
-#define PLUGIN_VERSION           0x016305
-#define VIDEO_PLUGIN_API_VERSION 0x020100
+#define PLUGIN_VERSION           0x020600
+#define VIDEO_PLUGIN_API_VERSION 0x020200
 #define CONFIG_API_VERSION       0x020000
-#define VIDEXT_API_VERSION       0x020000
+#define VIDEXT_API_VERSION       0x030000
 
 #define VERSION_PRINTF_SPLIT(x) (((x) >> 16) & 0xffff), (((x) >> 8) & 0xff), ((x) & 0xff)
 
@@ -86,6 +89,7 @@ ptr_VidExt_ListFullscreenModes   CoreVideo_ListFullscreenModes = NULL;
 ptr_VidExt_SetVideoMode          CoreVideo_SetVideoMode = NULL;
 ptr_VidExt_SetCaption            CoreVideo_SetCaption = NULL;
 ptr_VidExt_ToggleFullScreen      CoreVideo_ToggleFullScreen = NULL;
+ptr_VidExt_ResizeWindow          CoreVideo_ResizeWindow = NULL;
 ptr_VidExt_GL_GetProcAddress     CoreVideo_GL_GetProcAddress = NULL;
 ptr_VidExt_GL_SetAttribute       CoreVideo_GL_SetAttribute = NULL;
 ptr_VidExt_GL_SwapBuffers        CoreVideo_GL_SwapBuffers = NULL;
@@ -163,13 +167,14 @@ EXPORT m64p_error CALL PluginStartup(m64p_dynlib_handle CoreLibHandle, void *Con
     CoreVideo_SetVideoMode = (ptr_VidExt_SetVideoMode) osal_dynlib_getproc(CoreLibHandle, "VidExt_SetVideoMode");
     CoreVideo_SetCaption = (ptr_VidExt_SetCaption) osal_dynlib_getproc(CoreLibHandle, "VidExt_SetCaption");
     CoreVideo_ToggleFullScreen = (ptr_VidExt_ToggleFullScreen) osal_dynlib_getproc(CoreLibHandle, "VidExt_ToggleFullScreen");
+    CoreVideo_ResizeWindow = (ptr_VidExt_ResizeWindow) osal_dynlib_getproc(CoreLibHandle, "VidExt_ResizeWindow");
     CoreVideo_GL_GetProcAddress = (ptr_VidExt_GL_GetProcAddress) osal_dynlib_getproc(CoreLibHandle, "VidExt_GL_GetProcAddress");
     CoreVideo_GL_SetAttribute = (ptr_VidExt_GL_SetAttribute) osal_dynlib_getproc(CoreLibHandle, "VidExt_GL_SetAttribute");
     CoreVideo_GL_SwapBuffers = (ptr_VidExt_GL_SwapBuffers) osal_dynlib_getproc(CoreLibHandle, "VidExt_GL_SwapBuffers");
 
     if (!CoreVideo_Init || !CoreVideo_Quit || !CoreVideo_ListFullscreenModes || !CoreVideo_SetVideoMode ||
         !CoreVideo_SetCaption || !CoreVideo_ToggleFullScreen || !CoreVideo_GL_GetProcAddress ||
-        !CoreVideo_GL_SetAttribute || !CoreVideo_GL_SwapBuffers)
+        !CoreVideo_GL_SetAttribute || !CoreVideo_GL_SwapBuffers || !CoreVideo_ResizeWindow)
     {
         Logger::getSingleton().printMsg("Couldn't connect to Core video functions", M64MSG_ERROR);
         return M64ERR_INCOMPATIBLE;
@@ -257,6 +262,16 @@ EXPORT int CALL RomOpen()
     return g_graphicsPlugin.initialize(&g_graphicsInfo);
 }
 
+//-----------------------------------------------------------------------------
+//* Resize Video Output
+//! This function is called to force us to resize our output OpenGL window.
+//! This is currently unsupported, and should never be called because we do
+//! not pass the RESIZABLE flag to VidExt_SetVideoMode when initializing.
+//-----------------------------------------------------------------------------
+EXPORT void CALL ResizeVideoOutput(int Width, int Height)
+{
+}
+
 //-----------------------------------------------------------------------------
 //* Rom Closed
 //! This function is called when a rom is closed.

src/math/MathLib.h

@@ -1,6 +1,6 @@
 /******************************************************************************
  * Arachnoid Graphics Plugin for Mupen64Plus
- * http://bitbucket.org/wahrhaft/mupen64plus-video-arachnoid/
+ * https://github.com/mupen64plus/mupen64plus-video-arachnoid/
  *
  * Copyright (C) 2007 Kristofer Karlsson, Rickard Niklasson
  *
@@ -23,6 +23,7 @@
 #define MATH_LIBRARY_H_
 
 #include <cmath>     //sqrtf
+
 #include "m64p.h"  
 
 // Formula: a.b = a0*b0 + a1*b1 + a2*b2

src/math/Matrix4.cpp

@@ -1,6 +1,6 @@
 /******************************************************************************
  * Arachnoid Graphics Plugin for Mupen64Plus
- * http://bitbucket.org/wahrhaft/mupen64plus-video-arachnoid/
+ * https://github.com/mupen64plus/mupen64plus-video-arachnoid/
  *
  * Copyright (C) 2007 Kristofer Karlsson, Rickard Niklasson
  *

src/math/Matrix4.h

@@ -1,6 +1,6 @@
 /******************************************************************************
  * Arachnoid Graphics Plugin for Mupen64Plus
- * http://bitbucket.org/wahrhaft/mupen64plus-video-arachnoid/
+ * https://github.com/mupen64plus/mupen64plus-video-arachnoid/
  *
  * Copyright (C) 2007 Kristofer Karlsson, Rickard Niklasson
  *
@@ -22,6 +22,7 @@
 #ifndef MATRIX_4_H_
 #define MATRIX_4_H_
 
+#include <stddef.h>
 #include <iostream>
 #include <ostream>
 

src/osal_dynamiclib.h

@@ -1,6 +1,6 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  *   Mupen64plus-core - osal/dynamiclib.h                                  *
- *   Mupen64Plus homepage: http://code.google.com/p/mupen64plus/           *
+ *   Mupen64Plus homepage: https://mupen64plus.org/                        *
  *   Copyright (C) 2009 Richard Goedeken                                   *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *

src/osal_dynamiclib_unix.cpp

@@ -1,6 +1,6 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  *   Mupen64plus-core - osal/dynamiclib_unix.c                             *
- *   Mupen64Plus homepage: http://code.google.com/p/mupen64plus/           *
+ *   Mupen64Plus homepage: https://mupen64plus.org/                        *
  *   Copyright (C) 2009 Richard Goedeken                                   *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -19,9 +19,9 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.          *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#include <stdlib.h>
-#include <stdio.h>
 #include <dlfcn.h>
+#include <stdio.h>
+#include <stdlib.h>
 
 #include "m64p_types.h"
 #include "osal_dynamiclib.h"

src/osal_dynamiclib_win32.cpp

@@ -1,6 +1,6 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Arachnoid Graphics Plugin for Mupen64Plus                               *
- * http://bitbucket.org/wahrhaft/mupen64plus-video-arachnoid/              *
+ * https://github.com/mupen64plus/mupen64plus-video-arachnoid/             *
  *   Copyright (C) 2009 Richard Goedeken                                   *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -19,9 +19,9 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.          *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#include <windows.h>
-#include <stdlib.h>
 #include <stdio.h>
+#include <stdlib.h>
+#include <windows.h>
 
 #include "m64p_types.h"
 #include "osal_dynamiclib.h"
@@ -52,7 +52,7 @@ void * osal_dynlib_getproc(m64p_dynlib_handle LibHandle, const char *pccProcedur
     if (pccProcedureName == NULL)
         return NULL;
 
-    return GetProcAddress(LibHandle, pccProcedureName);
+    return (void *)GetProcAddress(LibHandle, pccProcedureName);
 }
 
 m64p_error osal_dynlib_close(m64p_dynlib_handle LibHandle)

src/renderer/OpenGL2DRenderer.cpp

@@ -1,6 +1,6 @@
 /******************************************************************************
  * Arachnoid Graphics Plugin for Mupen64Plus
- * http://bitbucket.org/wahrhaft/mupen64plus-video-arachnoid/
+ * https://github.com/mupen64plus/mupen64plus-video-arachnoid/
  *
  * Copyright (C) 2007 Kristofer Karlsson, Rickard Niklasson
  *
@@ -19,10 +19,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *****************************************************************************/
 
+#include "OpenGL.h"
 #include "OpenGL2DRenderer.h"
 #include "VI.h"
 #include "m64p.h"
-#include "OpenGL.h"
 
 //-----------------------------------------------------------------------------
 //* Initialize

src/renderer/OpenGL2DRenderer.h

@@ -1,6 +1,6 @@
 /******************************************************************************
  * Arachnoid Graphics Plugin for Mupen64Plus
- * http://bitbucket.org/wahrhaft/mupen64plus-video-arachnoid/
+ * https://github.com/mupen64plus/mupen64plus-video-arachnoid/
  *
  * Copyright (C) 2007 Kristofer Karlsson, Rickard Niklasson
  *

src/renderer/OpenGLRenderer.cpp

@@ -1,6 +1,6 @@
 /******************************************************************************
  * Arachnoid Graphics Plugin for Mupen64Plus
- * http://bitbucket.org/wahrhaft/mupen64plus-video-arachnoid/
+ * https://github.com/mupen64plus/mupen64plus-video-arachnoid/
  *
  * Copyright (C) 2009 Jon Ring
  * Copyright (C) 2007 Kristofer Karlsson, Rickard Niklasson
@@ -20,23 +20,29 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *****************************************************************************/
 
-#include "m64p.h"
-
-#include <cmath>
 #include <algorithm>
-#include "OpenGLRenderer.h"
-#include "OpenGLManager.h"
-#include "RSP.h"
-#include "RDP.h"
-#include "TextureCache.h"
-#include "VI.h"
-#include "Logger.h"
+#include <cmath>
+
 //#include "CombinerManager.h"
 #include "AdvancedCombinerManager.h"
-#include "FogManager.h"
+#include "CachedTexture.h"
 #include "ExtensionChecker.h"
+#include "FogManager.h"
+#include "GBIDefs.h"
+#include "Logger.h"
 #include "MultiTexturingExt.h"
+#include "OpenGL.h"
+#include "OpenGLManager.h"
+#include "OpenGLRenderer.h"
+#include "RDP.h"
+#include "RSP.h"
+#include "RSPVertexManager.h"
 #include "SecondaryColorExt.h"
+#include "TextureCache.h"
+#include "TextureLoader.h"
+#include "VI.h"
+#include "m64p.h"
+#include "m64p_types.h"
 
 
 using std::max;

src/renderer/OpenGLRenderer.h

@@ -1,6 +1,6 @@
 /******************************************************************************
  * Arachnoid Graphics Plugin for Mupen64Plus
- * http://bitbucket.org/wahrhaft/mupen64plus-video-arachnoid/
+ * https://github.com/mupen64plus/mupen64plus-video-arachnoid/
  *
  * Copyright (C) 2007 Kristofer Karlsson, Rickard Niklasson
  *
@@ -22,18 +22,17 @@
 #ifndef OPEN_GL_RENDERER_H_
 #define OPEN_GL_RENDERER_H_
 
-#include "m64p.h"
+#include "MultiTexturingExt.h"
 #include "OpenGL.h"
+#include "m64p.h"
 
 //Forward Declarations
-struct SPVertex;
-class RSP;
+class FogManager;
 class RDP;
+class RSP;
 class TextureCache;
 class VI;
-class FogManager;
-
-#include "MultiTexturingExt.h"
+struct SPVertex;
 
 
 //*****************************************************************************

src/texture/CachedTexture.cpp

@@ -1,6 +1,6 @@
 /******************************************************************************
  * Arachnoid Graphics Plugin for Mupen64Plus
- * http://bitbucket.org/wahrhaft/mupen64plus-video-arachnoid/
+ * https://github.com/mupen64plus/mupen64plus-video-arachnoid/
  *
  * Copyright (C) 2007 Kristofer Karlsson, Rickard Niklasson
  *
@@ -21,8 +21,8 @@
 
 #include "CachedTexture.h"
 
-#include "m64p.h"
 #include "OpenGL.h"
+#include "m64p.h"
 
 //-----------------------------------------------------------------------------
 //! Constructor

src/texture/CachedTexture.h

@@ -1,6 +1,6 @@
 /******************************************************************************
  * Arachnoid Graphics Plugin for Mupen64Plus
- * http://bitbucket.org/wahrhaft/mupen64plus-video-arachnoid/
+ * https://github.com/mupen64plus/mupen64plus-video-arachnoid/
  *
  * Copyright (C) 2007 Kristofer Karlsson, Rickard Niklasson
  *

src/texture/ImageFormatSelector.cpp

@@ -1,6 +1,6 @@
 /******************************************************************************
  * Arachnoid Graphics Plugin for Mupen64Plus
- * http://bitbucket.org/wahrhaft/mupen64plus-video-arachnoid/
+ * https://github.com/mupen64plus/mupen64plus-video-arachnoid/
  *
  * Copyright (C) 2007 Kristofer Karlsson, Rickard Niklasson
  *
@@ -26,13 +26,13 @@
 //
 //*****************************************************************************
 
-#include "ImageFormatSelector.h"
 #include "CachedTexture.h"
-#include "assembler.h"
 #include "GBIDefs.h"
-#include "m64p.h"
-#include "OpenGL.h"
+#include "ImageFormatSelector.h"
 #include "Memory.h"
+#include "OpenGL.h"
+#include "assembler.h"
+#include "m64p.h"
 
 #ifndef GL_EXT_packed_pixels
 #define GL_EXT_packed_pixels                 1

src/texture/ImageFormatSelector.h

@@ -1,6 +1,6 @@
 /******************************************************************************
  * Arachnoid Graphics Plugin for Mupen64Plus
- * http://bitbucket.org/wahrhaft/mupen64plus-video-arachnoid/
+ * https://github.com/mupen64plus/mupen64plus-video-arachnoid/
  *
  * Copyright (C) 2007 Kristofer Karlsson, Rickard Niklasson
  *

src/texture/TextureCache.cpp

@@ -1,6 +1,6 @@
 /******************************************************************************
  * Arachnoid Graphics Plugin for Mupen64Plus
- * http://bitbucket.org/wahrhaft/mupen64plus-video-arachnoid/
+ * https://github.com/mupen64plus/mupen64plus-video-arachnoid/
  *
  * Copyright (C) 2007 Kristofer Karlsson, Rickard Niklasson
  *
@@ -19,27 +19,32 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *****************************************************************************/
 
-#include "TextureCache.h"
+#include <algorithm>
 
+#include "CachedTexture.h"
+#include "GBIDefs.h"
+#include "MathLib.h"
+#include "OpenGL.h"
 #include "RDP.h"
 #include "RSP.h"
-#include "CachedTexture.h"
-#include "MathLib.h"
-#include <algorithm>
+#include "TextureCache.h"
+#include "TextureLoader.h"
+
     using std::min;
-#include "m64p.h"
-#include "OpenGL.h"
 #include "Memory.h"
-#include "OpenGLRenderer.h"
 #include "MultiTexturingExt.h"    
+#include "OpenGLRenderer.h"
+#include "m64p.h"
+
     //gSPBgRect1Cyc
 //gSPBgRectCopy
 #define GL_CLAMP_TO_EDGE                  0x812F
 #define GL_GENERATE_MIPMAP                0x8191
 
-#include "Logger.h"
 #include <iostream>
 
+#include "Logger.h"
+
 //-----------------------------------------------------------------------------
 //! Constructor
 //-----------------------------------------------------------------------------

src/texture/TextureCache.h

@@ -1,6 +1,6 @@
 /******************************************************************************
  * Arachnoid Graphics Plugin for Mupen64Plus
- * http://bitbucket.org/wahrhaft/mupen64plus-video-arachnoid/
+ * https://github.com/mupen64plus/mupen64plus-video-arachnoid/
  *
  * Copyright (C) 2007 Kristofer Karlsson, Rickard Niklasson
  *
@@ -22,15 +22,17 @@
 #ifndef TEXTURE_CACHE_H_
 #define TEXTURE_CACHE_H_
 
-#include "CachedTexture.h"
-#include "CRCCalculator2.h"
-#include "ImageFormatSelector.h"
 #include <list>
 
+#include "CRCCalculator2.h"
+#include "CachedTexture.h"
+#include "ImageFormatSelector.h"
+
 //Forward declarations
+class CachedTexture;
 class Memory;
-class RSP;
 class RDP;
+class RSP;
 
 //*****************************************************************************
 //* Texture Cache

src/texture/TextureLoader.cpp

@@ -1,6 +1,6 @@
 /******************************************************************************
  * Arachnoid Graphics Plugin for Mupen64Plus
- * http://bitbucket.org/wahrhaft/mupen64plus-video-arachnoid/
+ * https://github.com/mupen64plus/mupen64plus-video-arachnoid/
  *
  * Copyright (C) 2007 Kristofer Karlsson, Rickard Niklasson
  *
@@ -19,14 +19,15 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *****************************************************************************/
 
-#include "TextureLoader.h"
-#include "Memory.h"
-#include "TextureCache.h"
-#include "GBIDefs.h"
-#include "assembler.h"
-#include "Logger.h"
-#include "RDP.h"
 #include "CRCCalculator2.h"
+#include "GBI.h"
+#include "GBIDefs.h"
+#include "Logger.h"
+#include "Memory.h"
+#include "RDP.h"
+#include "TextureCache.h"
+#include "TextureLoader.h"
+#include "assembler.h"
 
 //-----------------------------------------------------------------------------
 //! Constructor