This is an automated email from the git hooks/post-receive script. ecsv-guest pushed a commit to branch master in repository mupen64plus-video-z64.
commit 1a6f5fd9de90202f8d01d144e824889ecd109732 Author: Sven Eckelmann <[email protected]> Date: Fri Sep 5 12:31:54 2014 +0200 Imported Upstream version 2.0.0+9+gb0a0b5f --- .gitattributes | 38 ++++++++++++ .gitignore | 2 + .hg_archival.txt | 5 -- .hgignore | 4 -- .hgtags | 3 - .travis.yml | 12 ++++ projects/unix/Makefile | 6 +- src/osal_dynamiclib_win32.c | 148 ++++++++++++++++++++++---------------------- 8 files changed, 129 insertions(+), 89 deletions(-) diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..f053771 --- /dev/null +++ b/.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 diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..c5a6f28 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +/projects/unix/_obj*/ +/projects/unix/mupen64plus-video-z64*.so diff --git a/.hg_archival.txt b/.hg_archival.txt deleted file mode 100644 index e3428af..0000000 --- a/.hg_archival.txt +++ /dev/null @@ -1,5 +0,0 @@ -repo: 29d6a3861712003358cf3187f7a9736a9f243756 -node: bc9712b27e1ba9a6ba13af33ef04bcfce4ec5066 -branch: default -latesttag: 2.0.0 -latesttagdistance: 1 diff --git a/.hgignore b/.hgignore deleted file mode 100644 index 495a970..0000000 --- a/.hgignore +++ /dev/null @@ -1,4 +0,0 @@ -syntax: regexp - -^projects/unix/_obj/ -^projects/unix/mupen64plus-video-z64.so$ diff --git a/.hgtags b/.hgtags deleted file mode 100644 index 78f00da..0000000 --- a/.hgtags +++ /dev/null @@ -1,3 +0,0 @@ -ce1efa043f54c7421e2ee8b95f5c53ea702746c5 1.99.4 -3d6f55e4531cb4f883bca555fea1a1e066d91f82 1.99.5 -1393910be940d3a0a1555a8e846c1b4e1aa0c85b 2.0.0 diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..9edc5d1 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,12 @@ +language: cpp +compiler: + - gcc + - clang +before_install: + - sudo add-apt-repository --yes ppa:zoogie/sdl2-snapshots + - sudo apt-get update -qq + - sudo apt-get install -y git libsdl1.2-dev libsdl2-dev libgl1-mesa-dev libglew-dev libsdl2-dev pkg-config + - 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 && CPPFLAGS="-D__extern_always_inline=inline" LDFLAGS="-Wl,--no-add-needed -Wl,--no-undefined" OPTFLAGS="-O2" make SDL_CONFIG=sdl-config CC="${CC}" CXX="${CXX}" -j$(nproc) -C projects/unix APIDIR="$(pwd)/deps/mupen64plus-core/src/api/" V=1 all + - make -C projects/unix APIDIR="$(pwd)/deps/mupen64plus-core/src/api/" V=1 clean && CPPFLAGS="-D__extern_always_inline=inline" LDFLAGS="-Wl,--no-add-needed -Wl,--no-undefined" OPTFLAGS="-O2" make SDL_CONFIG=sdl2-config CC="${CC}" CXX="${CXX}" -j$(nproc) -C projects/unix APIDIR="$(pwd)/deps/mupen64plus-core/src/api/" V=1 all diff --git a/projects/unix/Makefile b/projects/unix/Makefile index b0dc002..1f62227 100644 --- a/projects/unix/Makefile +++ b/projects/unix/Makefile @@ -1,6 +1,6 @@ #/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * # * Mupen64plus-video-z64 - Makefile * -# * http://bitbucket.org/wahrhaft/mupen64plus-video-z64/ * +# * https://github.com/mupen64plus/mupen64plus-video-z64/ * # * Copyright (C) 2010 Jon Ring * # * Copyright (C) 2007-2009 Richard Goedeken * # * Copyright (C) 2007-2008 DarkJeztr Tillin9 * @@ -193,7 +193,7 @@ endif ifeq ($(origin GLEW_CFLAGS) $(origin GLEW_LDLIBS), undefined undefined) ifeq ($(shell $(PKG_CONFIG) --modversion glew 2>/dev/null),) - (error No GLEW development libraries found!) + $(error No GLEW development libraries found!) endif GLEW_CFLAGS += $(shell $(PKG_CONFIG) --cflags glew) GLEW_LDLIBS += $(shell $(PKG_CONFIG) --libs glew) @@ -373,7 +373,7 @@ clean: rebuild: clean all # build dependency files -CFLAGS += -MD +CFLAGS += -MD -MP -include $(OBJECTS:.o=.d) CXXFLAGS += $(CFLAGS) diff --git a/src/osal_dynamiclib_win32.c b/src/osal_dynamiclib_win32.c index 4455cee..685d717 100644 --- a/src/osal_dynamiclib_win32.c +++ b/src/osal_dynamiclib_win32.c @@ -1,74 +1,74 @@ -/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * Mupen64plus-ui-console - osal_dynamiclib_win32.c * - * Mupen64Plus homepage: http://code.google.com/p/mupen64plus/ * - * Copyright (C) 2009 Richard Goedeken * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ - -#include <windows.h> -#include <stdlib.h> -#include <stdio.h> - -#include "m64p_types.h" -#include "osal_dynamiclib.h" - -m64p_error osal_dynlib_open(m64p_dynlib_handle *pLibHandle, const char *pccLibraryPath) -{ - if (pLibHandle == NULL || pccLibraryPath == NULL) - return M64ERR_INPUT_ASSERT; - - *pLibHandle = LoadLibrary(pccLibraryPath); - - if (*pLibHandle == NULL) - { - char *pchErrMsg; - DWORD dwErr = GetLastError(); - FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, NULL, dwErr, - MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (LPTSTR) &pchErrMsg, 0, NULL); - fprintf(stderr, "LoadLibrary('%s') error: %s\n", pccLibraryPath, pchErrMsg); - LocalFree(pchErrMsg); - return M64ERR_INPUT_NOT_FOUND; - } - - return M64ERR_SUCCESS; -} - -void * osal_dynlib_getproc(m64p_dynlib_handle LibHandle, const char *pccProcedureName) -{ - if (pccProcedureName == NULL) - return NULL; - - return GetProcAddress(LibHandle, pccProcedureName); -} - -m64p_error osal_dynlib_close(m64p_dynlib_handle LibHandle) -{ - int rval = FreeLibrary(LibHandle); - - if (rval == 0) - { - char *pchErrMsg; - DWORD dwErr = GetLastError(); - FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, NULL, dwErr, - MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (LPTSTR) &pchErrMsg, 0, NULL); - fprintf(stderr, "FreeLibrary() error: %s\n", pchErrMsg); - LocalFree(pchErrMsg); - return M64ERR_INTERNAL; - } - - return M64ERR_SUCCESS; -} +/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * + * Mupen64plus-ui-console - osal_dynamiclib_win32.c * + * Mupen64Plus homepage: http://code.google.com/p/mupen64plus/ * + * Copyright (C) 2009 Richard Goedeken * + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 2 of the License, or * + * (at your option) any later version. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program; if not, write to the * + * Free Software Foundation, Inc., * + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * + * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ + +#include <windows.h> +#include <stdlib.h> +#include <stdio.h> + +#include "m64p_types.h" +#include "osal_dynamiclib.h" + +m64p_error osal_dynlib_open(m64p_dynlib_handle *pLibHandle, const char *pccLibraryPath) +{ + if (pLibHandle == NULL || pccLibraryPath == NULL) + return M64ERR_INPUT_ASSERT; + + *pLibHandle = LoadLibrary(pccLibraryPath); + + if (*pLibHandle == NULL) + { + char *pchErrMsg; + DWORD dwErr = GetLastError(); + FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, NULL, dwErr, + MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (LPTSTR) &pchErrMsg, 0, NULL); + fprintf(stderr, "LoadLibrary('%s') error: %s\n", pccLibraryPath, pchErrMsg); + LocalFree(pchErrMsg); + return M64ERR_INPUT_NOT_FOUND; + } + + return M64ERR_SUCCESS; +} + +void * osal_dynlib_getproc(m64p_dynlib_handle LibHandle, const char *pccProcedureName) +{ + if (pccProcedureName == NULL) + return NULL; + + return GetProcAddress(LibHandle, pccProcedureName); +} + +m64p_error osal_dynlib_close(m64p_dynlib_handle LibHandle) +{ + int rval = FreeLibrary(LibHandle); + + if (rval == 0) + { + char *pchErrMsg; + DWORD dwErr = GetLastError(); + FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, NULL, dwErr, + MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (LPTSTR) &pchErrMsg, 0, NULL); + fprintf(stderr, "FreeLibrary() error: %s\n", pchErrMsg); + LocalFree(pchErrMsg); + return M64ERR_INTERNAL; + } + + return M64ERR_SUCCESS; +} -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/mupen64plus-video-z64.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
