This is an automated email from the git hooks/post-receive script. smcv pushed a commit to annotated tag 1.42d in repository iortcw.
commit 0953275019a372e7657631ecdddd5c0c84dc8bcf Author: m4n4t4...@gmail.com <m4n4t4...@gmail.com@e65d2741-a53d-b2dc-ae96-bb75fa5e4c4a> Date: Mon Apr 7 21:53:07 2014 +0000 All: Use correct path seperator for Windows --- MP/code/qcommon/q_platform.h | 10 ---------- MP/code/tools/lcc/etc/bytecode.c | 5 +++++ SP/code/qcommon/q_platform.h | 10 ---------- SP/code/tools/lcc/etc/bytecode.c | 5 +++++ 4 files changed, 10 insertions(+), 20 deletions(-) diff --git a/MP/code/qcommon/q_platform.h b/MP/code/qcommon/q_platform.h index c325018..c559150 100644 --- a/MP/code/qcommon/q_platform.h +++ b/MP/code/qcommon/q_platform.h @@ -95,12 +95,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #endif #define ID_INLINE __inline - -#if defined( __CYGWIN__ ) -#define PATH_SEP '/' -#else #define PATH_SEP '\\' -#endif #if defined( __WIN64__ ) #define ARCH_STRING "x64" @@ -127,12 +122,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #endif #define ID_INLINE __inline - -#if defined( __CYGWIN__ ) -#define PATH_SEP '/' -#else #define PATH_SEP '\\' -#endif #if defined( _M_IX86 ) || defined( __i386__ ) #define ARCH_STRING "x86" diff --git a/MP/code/tools/lcc/etc/bytecode.c b/MP/code/tools/lcc/etc/bytecode.c index 3364cbe..b042148 100644 --- a/MP/code/tools/lcc/etc/bytecode.c +++ b/MP/code/tools/lcc/etc/bytecode.c @@ -36,7 +36,12 @@ void UpdatePaths( const char *lccBinary ) char *p; strncpy( basepath, lccBinary, 1024 ); + +#if defined( __CYGWIN__ ) + p = strrchr( basepath, '/' ); +#else p = strrchr( basepath, PATH_SEP ); +#endif if( p ) { diff --git a/SP/code/qcommon/q_platform.h b/SP/code/qcommon/q_platform.h index c325018..c559150 100644 --- a/SP/code/qcommon/q_platform.h +++ b/SP/code/qcommon/q_platform.h @@ -95,12 +95,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #endif #define ID_INLINE __inline - -#if defined( __CYGWIN__ ) -#define PATH_SEP '/' -#else #define PATH_SEP '\\' -#endif #if defined( __WIN64__ ) #define ARCH_STRING "x64" @@ -127,12 +122,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #endif #define ID_INLINE __inline - -#if defined( __CYGWIN__ ) -#define PATH_SEP '/' -#else #define PATH_SEP '\\' -#endif #if defined( _M_IX86 ) || defined( __i386__ ) #define ARCH_STRING "x86" diff --git a/SP/code/tools/lcc/etc/bytecode.c b/SP/code/tools/lcc/etc/bytecode.c index 3364cbe..b042148 100644 --- a/SP/code/tools/lcc/etc/bytecode.c +++ b/SP/code/tools/lcc/etc/bytecode.c @@ -36,7 +36,12 @@ void UpdatePaths( const char *lccBinary ) char *p; strncpy( basepath, lccBinary, 1024 ); + +#if defined( __CYGWIN__ ) + p = strrchr( basepath, '/' ); +#else p = strrchr( basepath, PATH_SEP ); +#endif if( p ) { -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/iortcw.git _______________________________________________ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits