This is an automated email from the git hooks/post-receive script. ecsv-guest pushed a commit to branch master in repository mupen64plus-video-glide64.
commit 9ea5d2a2c66846b90fe8e834d413dccfc5a49a9f Author: Sven Eckelmann <[email protected]> Date: Sat Jan 22 10:23:49 2011 +0100 Imported Upstream version 1.99.4 --- projects/unix/Makefile | 5 +++++ src/3dmath.cpp | 0 src/3dmath.h | 0 src/Combine.cpp | 0 src/Combine.h | 0 src/Config.cpp | 0 src/Config.h | 0 src/Debugger.cpp | 0 src/DepthBufferRender.cpp | 0 src/Gfx1.3.h | 0 src/Ini.cpp | 5 +++++ src/Ini.h | 2 -- src/Main.cpp | 16 ++++++++-------- src/TexBuffer.cpp | 0 src/TexBuffer.h | 0 src/TexCache.cpp | 0 src/Util.cpp | 0 src/Util.h | 0 src/m64p.h | 0 src/osal_dynamiclib.h | 0 src/osal_dynamiclib_unix.c | 0 src/osal_dynamiclib_win32.c | 0 src/rdp.cpp | 0 src/rdp.h | 0 src/ucode06.h | 0 src/wrapper/glidesys.h | 2 +- src/wrapper/main.cpp | 0 27 files changed, 19 insertions(+), 11 deletions(-) diff --git a/projects/unix/Makefile b/projects/unix/Makefile index f1f2dbc..0e8bf20 100644 --- a/projects/unix/Makefile +++ b/projects/unix/Makefile @@ -35,6 +35,11 @@ ifeq ("$(UNAME)","linux") SO_EXTENSION = so SHARED = -shared endif +ifneq ("$(filter GNU hurd,$(UNAME))","") + OS = LINUX + SO_EXTENSION = so + SHARED = -shared +endif ifeq ("$(UNAME)","Darwin") OS = OSX SO_EXTENSION = dylib diff --git a/src/3dmath.cpp b/src/3dmath.cpp old mode 100644 new mode 100755 diff --git a/src/3dmath.h b/src/3dmath.h old mode 100644 new mode 100755 diff --git a/src/Combine.cpp b/src/Combine.cpp old mode 100644 new mode 100755 diff --git a/src/Combine.h b/src/Combine.h old mode 100644 new mode 100755 diff --git a/src/Config.cpp b/src/Config.cpp old mode 100644 new mode 100755 diff --git a/src/Config.h b/src/Config.h old mode 100644 new mode 100755 diff --git a/src/Debugger.cpp b/src/Debugger.cpp old mode 100644 new mode 100755 diff --git a/src/DepthBufferRender.cpp b/src/DepthBufferRender.cpp old mode 100644 new mode 100755 diff --git a/src/Gfx1.3.h b/src/Gfx1.3.h old mode 100644 new mode 100755 diff --git a/src/Ini.cpp b/src/Ini.cpp old mode 100644 new mode 100755 index d27542d..5c27338 --- a/src/Ini.cpp +++ b/src/Ini.cpp @@ -59,6 +59,11 @@ #define PATH_MAX _MAX_PATH #endif +/* PATH_MAX only may be defined by limits.h */ +#ifndef PATH_MAX + #define PATH_MAX 4096 +#endif + FILE *ini; int sectionstart; int last_line; // last good line diff --git a/src/Ini.h b/src/Ini.h old mode 100644 new mode 100755 index 3ed67cf..0eed64a --- a/src/Ini.h +++ b/src/Ini.h @@ -34,8 +34,6 @@ // //**************************************************************** -//nmn: Fix for MAX_PATH -#include <limits.h> #include <stdio.h> #include "winlnxdefs.h" diff --git a/src/Main.cpp b/src/Main.cpp old mode 100644 new mode 100755 index 9d281ee..e332ceb --- a/src/Main.cpp +++ b/src/Main.cpp @@ -326,14 +326,14 @@ void ReadSettings () settings.ucode = (DWORD)Config_ReadInt ("ucode", "Force microcode", 2, TRUE, FALSE); settings.wireframe = (BOOL)Config_ReadInt ("wireframe", "Wireframe display", 0); - settings.wfmode = (int)Config_ReadInt ("wfmode", "Wireframe mode", 1, TRUE, FALSE); - settings.filtering = (BYTE)Config_ReadInt ("filtering", "Texture filter", 1, TRUE, FALSE); + settings.wfmode = (int)Config_ReadInt ("wfmode", "Wireframe mode: 0=Normal colors, 1=Vertex colors, 2=Red only", 1, TRUE, FALSE); + settings.filtering = (BYTE)Config_ReadInt ("filtering", "Filtering mode: 0=None, 1=Force bilinear, 2=Force point-sampled", 1, TRUE, FALSE); settings.fog = (BOOL)Config_ReadInt ("fog", "Fog enabled", 1); settings.buff_clear = (BOOL)Config_ReadInt ("buff_clear", "Buffer clear on every frame", 1); settings.vsync = (BOOL)Config_ReadInt ("vsync", "Vertical sync", 0); settings.fast_crc = (BOOL)Config_ReadInt ("fast_crc", "Fast CRC", 0); - settings.swapmode = (BYTE)Config_ReadInt ("swapmode", "Swap mode", 1, TRUE, FALSE); - settings.lodmode = (BYTE)Config_ReadInt ("lodmode", "LOD mode", 0, TRUE, FALSE); + settings.swapmode = (BYTE)Config_ReadInt ("swapmode", "Buffer swapping method: 0=Old, 1=New, 2=Hybrid", 1, TRUE, FALSE); + settings.lodmode = (BYTE)Config_ReadInt ("lodmode", "LOD calculation: 0=Off, 1=Fast, 2=Precise", 0, TRUE, FALSE); settings.logging = (BOOL)Config_ReadInt ("logging", "Logging", 0); settings.log_clear = (BOOL)Config_ReadInt ("log_clear", "", 0); @@ -348,7 +348,7 @@ void ReadSettings () settings.flame_corona = (BOOL)Config_ReadInt ("flame_corona", "Zelda corona fix", 0); // settings.RE2_native_video = (BOOL)INI_ReadInt ("RE2_native_video", 0); - settings.show_fps = (BYTE)Config_ReadInt ("show_fps", "FPS counter", 0, TRUE, FALSE); + settings.show_fps = (BYTE)Config_ReadInt ("show_fps", "Display performance stats (add together desired flags): 1=FPS counter, 2=VI/s counter, 4=% speed, 8=FPS transparent", 0, TRUE, FALSE); settings.clock = (BOOL)Config_ReadInt ("clock", "Clock enabled", 0); settings.clock_24_hr = (BOOL)Config_ReadInt ("clock_24_hr", "Clock is 24-hour", 0); @@ -368,7 +368,7 @@ void ReadSettings () settings.hotkeys = 0; settings.full_res = 0; - settings.tex_filter = (BOOL)Config_ReadInt ("tex_filter", "Texture filtering", 0); + settings.tex_filter = (DWORD)Config_ReadInt ("tex_filter", "Texture filter: 0=None, 1=Blur edges, 2=Super 2xSai, 3=Hq2x, 4=Hq4x", 0, TRUE, FALSE); settings.noditheredalpha = (BOOL)Config_ReadInt ("noditheredalpha", "Disable dithered alpha", 1); settings.noglsl = (BOOL)Config_ReadInt ("noglsl", "Disable GLSL combiners", 1); settings.FBO = (BOOL)Config_ReadInt ("fbo", "Use framebuffer objects", 0); @@ -1008,13 +1008,13 @@ EXPORT m64p_error CALL PluginGetVersion(m64p_plugin_type *PluginType, int *Plugi *PluginType = M64PLUGIN_GFX; if (PluginVersion != NULL) - *PluginVersion = 0x016303; + *PluginVersion = 0x016304; if (APIVersion != NULL) *APIVersion = PLUGIN_API_VERSION; if (PluginNamePtr != NULL) - *PluginNamePtr = "Glide64"; + *PluginNamePtr = "Glide64 Video Plugin"; if (Capabilities != NULL) { diff --git a/src/TexBuffer.cpp b/src/TexBuffer.cpp old mode 100644 new mode 100755 diff --git a/src/TexBuffer.h b/src/TexBuffer.h old mode 100644 new mode 100755 diff --git a/src/TexCache.cpp b/src/TexCache.cpp old mode 100644 new mode 100755 diff --git a/src/Util.cpp b/src/Util.cpp old mode 100644 new mode 100755 diff --git a/src/Util.h b/src/Util.h old mode 100644 new mode 100755 diff --git a/src/m64p.h b/src/m64p.h old mode 100644 new mode 100755 diff --git a/src/osal_dynamiclib.h b/src/osal_dynamiclib.h old mode 100644 new mode 100755 diff --git a/src/osal_dynamiclib_unix.c b/src/osal_dynamiclib_unix.c old mode 100644 new mode 100755 diff --git a/src/osal_dynamiclib_win32.c b/src/osal_dynamiclib_win32.c old mode 100644 new mode 100755 diff --git a/src/rdp.cpp b/src/rdp.cpp old mode 100644 new mode 100755 diff --git a/src/rdp.h b/src/rdp.h old mode 100644 new mode 100755 diff --git a/src/ucode06.h b/src/ucode06.h old mode 100644 new mode 100755 diff --git a/src/wrapper/glidesys.h b/src/wrapper/glidesys.h index d9138a4..6d3be8f 100644 --- a/src/wrapper/glidesys.h +++ b/src/wrapper/glidesys.h @@ -111,7 +111,7 @@ n** ----------------------------------------------------------------------- /* Check for OS */ #if defined(__IRIX__) || defined(__sparc__) || defined(__linux__) || \ defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || \ - defined(__APPLE__) || defined(__FreeBSD_kernel__) + defined(__APPLE__) || defined(__FreeBSD_kernel__) || defined(__GNU__) # define GLIDE_OS GLIDE_OS_UNIX #elif defined(__DOS__) # define GLIDE_OS GLIDE_OS_DOS32 diff --git a/src/wrapper/main.cpp b/src/wrapper/main.cpp old mode 100644 new mode 100755 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/mupen64plus-video-glide64.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
