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 633e35132f06809072e936ea91cae83ae80407d2 Author: [email protected] <[email protected]@e65d2741-a53d-b2dc-ae96-bb75fa5e4c4a> Date: Sat Apr 5 15:11:13 2014 +0000 All: Rework last commit to support Cygwin64 --- MP/Makefile | 4 ++++ MP/code/qcommon/q_platform.h | 4 ++-- MP/code/tools/lcc/etc/bytecode.c | 2 +- SP/Makefile | 4 ++++ SP/code/qcommon/q_platform.h | 4 ++-- 5 files changed, 13 insertions(+), 5 deletions(-) diff --git a/MP/Makefile b/MP/Makefile index 458696a..3ec00e1 100644 --- a/MP/Makefile +++ b/MP/Makefile @@ -1342,7 +1342,11 @@ makedirs: ifndef TOOLS_CC # A compiler which probably produces native binaries + ifeq ($(COMPILE_PLATFORM),cygwin) + TOOLS_CC = $(CC) + else TOOLS_CC = gcc + endif endif TOOLS_OPTIMIZE = -g -Wall -fno-strict-aliasing diff --git a/MP/code/qcommon/q_platform.h b/MP/code/qcommon/q_platform.h index d4a71f8..c325018 100644 --- a/MP/code/qcommon/q_platform.h +++ b/MP/code/qcommon/q_platform.h @@ -112,7 +112,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #define DLL_EXT ".dll" -#elif defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__) +#elif defined(_WIN32) || defined(__WIN32__) #undef QDECL #define QDECL __cdecl @@ -122,7 +122,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #if defined( _MSC_VER ) #define OS_STRING "win_msvc" -#elif defined __MINGW32__ || defined __CYGWIN__ +#elif defined __MINGW32__ #define OS_STRING "win_mingw" #endif diff --git a/MP/code/tools/lcc/etc/bytecode.c b/MP/code/tools/lcc/etc/bytecode.c index 6a4b815..3364cbe 100644 --- a/MP/code/tools/lcc/etc/bytecode.c +++ b/MP/code/tools/lcc/etc/bytecode.c @@ -4,7 +4,7 @@ #include <stdio.h> #include "../../../qcommon/q_platform.h" -#if defined(_WIN32) || defined (__CYGWIN__) +#if defined _WIN32 || defined __CYGWIN__ #define BINEXT ".exe" #else #define BINEXT "" diff --git a/SP/Makefile b/SP/Makefile index cc44568..20cd077 100644 --- a/SP/Makefile +++ b/SP/Makefile @@ -1351,7 +1351,11 @@ makedirs: ifndef TOOLS_CC # A compiler which probably produces native binaries + ifeq ($(COMPILE_PLATFORM),cygwin) + TOOLS_CC = $(CC) + else TOOLS_CC = gcc + endif endif TOOLS_OPTIMIZE = -g -Wall -fno-strict-aliasing diff --git a/SP/code/qcommon/q_platform.h b/SP/code/qcommon/q_platform.h index d4a71f8..c325018 100644 --- a/SP/code/qcommon/q_platform.h +++ b/SP/code/qcommon/q_platform.h @@ -112,7 +112,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #define DLL_EXT ".dll" -#elif defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__) +#elif defined(_WIN32) || defined(__WIN32__) #undef QDECL #define QDECL __cdecl @@ -122,7 +122,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #if defined( _MSC_VER ) #define OS_STRING "win_msvc" -#elif defined __MINGW32__ || defined __CYGWIN__ +#elif defined __MINGW32__ #define OS_STRING "win_mingw" #endif -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/iortcw.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
