• R/O
  • SSH
  • HTTPS

marathon: コミット


コミットメタ情報

リビジョン506 (tree)
日時2011-11-30 20:55:23
作者logue

ログメッセージ

前回マージし忘れたMac用のプロジェクトファイルをコミット

変更サマリ

差分

--- marathon/trunk/m4/ax_openmp.m4 (nonexistent)
+++ marathon/trunk/m4/ax_openmp.m4 (revision 506)
@@ -0,0 +1,97 @@
1+# ===========================================================================
2+# http://www.nongnu.org/autoconf-archive/ax_openmp.html
3+# ===========================================================================
4+#
5+# SYNOPSIS
6+#
7+# AX_OPENMP([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
8+#
9+# DESCRIPTION
10+#
11+# This macro tries to find out how to compile programs that use OpenMP a
12+# standard API and set of compiler directives for parallel programming
13+# (see http://www-unix.mcs/)
14+#
15+# On success, it sets the OPENMP_CFLAGS/OPENMP_CXXFLAGS/OPENMP_F77FLAGS
16+# output variable to the flag (e.g. -omp) used both to compile *and* link
17+# OpenMP programs in the current language.
18+#
19+# NOTE: You are assumed to not only compile your program with these flags,
20+# but also link it with them as well.
21+#
22+# If you want to compile everything with OpenMP, you should set:
23+#
24+# CFLAGS="$CFLAGS $OPENMP_CFLAGS"
25+# #OR# CXXFLAGS="$CXXFLAGS $OPENMP_CXXFLAGS"
26+# #OR# FFLAGS="$FFLAGS $OPENMP_FFLAGS"
27+#
28+# (depending on the selected language).
29+#
30+# The user can override the default choice by setting the corresponding
31+# environment variable (e.g. OPENMP_CFLAGS).
32+#
33+# ACTION-IF-FOUND is a list of shell commands to run if an OpenMP flag is
34+# found, and ACTION-IF-NOT-FOUND is a list of commands to run it if it is
35+# not found. If ACTION-IF-FOUND is not specified, the default action will
36+# define HAVE_OPENMP.
37+#
38+# LICENSE
39+#
40+# Copyright (c) 2008 Steven G. Johnson <stevenj@alum.mit.edu>
41+#
42+# This program is free software: you can redistribute it and/or modify it
43+# under the terms of the GNU General Public License as published by the
44+# Free Software Foundation, either version 3 of the License, or (at your
45+# option) any later version.
46+#
47+# This program is distributed in the hope that it will be useful, but
48+# WITHOUT ANY WARRANTY; without even the implied warranty of
49+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
50+# Public License for more details.
51+#
52+# You should have received a copy of the GNU General Public License along
53+# with this program. If not, see <http://www.gnu.org/licenses/>.
54+#
55+# As a special exception, the respective Autoconf Macro's copyright owner
56+# gives unlimited permission to copy, distribute and modify the configure
57+# scripts that are the output of Autoconf when processing the Macro. You
58+# need not follow the terms of the GNU General Public License when using
59+# or distributing such scripts, even though portions of the text of the
60+# Macro appear in them. The GNU General Public License (GPL) does govern
61+# all other use of the material that constitutes the Autoconf Macro.
62+#
63+# This special exception to the GPL applies to versions of the Autoconf
64+# Macro released by the Autoconf Archive. When you make and distribute a
65+# modified version of the Autoconf Macro, you may extend this special
66+# exception to the GPL to apply to your modified version as well.
67+
68+AC_DEFUN([AX_OPENMP], [
69+AC_PREREQ(2.59) dnl for _AC_LANG_PREFIX
70+
71+AC_CACHE_CHECK([for OpenMP flag of _AC_LANG compiler], ax_cv_[]_AC_LANG_ABBREV[]_openmp, [save[]_AC_LANG_PREFIX[]FLAGS=$[]_AC_LANG_PREFIX[]FLAGS
72+ax_cv_[]_AC_LANG_ABBREV[]_openmp=unknown
73+# Flags to try: -fopenmp (gcc), -openmp (icc), -mp (SGI & PGI),
74+# -xopenmp (Sun), -omp (Tru64), -qsmp=omp (AIX), none
75+ax_openmp_flags="-fopenmp -openmp -mp -xopenmp -omp -qsmp=omp none"
76+if test "x$OPENMP_[]_AC_LANG_PREFIX[]FLAGS" != x; then
77+ ax_openmp_flags="$OPENMP_[]_AC_LANG_PREFIX[]FLAGS $ax_openmp_flags"
78+fi
79+for ax_openmp_flag in $ax_openmp_flags; do
80+ case $ax_openmp_flag in
81+ none) []_AC_LANG_PREFIX[]FLAGS=$save[]_AC_LANG_PREFIX[] ;;
82+ *) []_AC_LANG_PREFIX[]FLAGS="$save[]_AC_LANG_PREFIX[]FLAGS $ax_openmp_flag" ;;
83+ esac
84+ AC_TRY_LINK_FUNC(omp_set_num_threads,
85+ [ax_cv_[]_AC_LANG_ABBREV[]_openmp=$ax_openmp_flag; break])
86+done
87+[]_AC_LANG_PREFIX[]FLAGS=$save[]_AC_LANG_PREFIX[]FLAGS
88+])
89+if test "x$ax_cv_[]_AC_LANG_ABBREV[]_openmp" = "xunknown"; then
90+ m4_default([$2],:)
91+else
92+ if test "x$ax_cv_[]_AC_LANG_ABBREV[]_openmp" != "xnone"; then
93+ OPENMP_[]_AC_LANG_PREFIX[]FLAGS=$ax_cv_[]_AC_LANG_ABBREV[]_openmp
94+ fi
95+ m4_default([$1], [AC_DEFINE(HAVE_OPENMP,1,[Define if OpenMP is enabled])])
96+fi
97+])dnl AX_OPENMP
--- marathon/trunk/AUTHORS (revision 505)
+++ marathon/trunk/AUTHORS (revision 506)
@@ -1,10 +1,52 @@
1-Aleph One is based on the Marathon 2 source code which was developed by
2-Bungie Software <http://www.bungie.com/>.
1+Aleph One is based on the Marathon 2 and Marathon Infinity source code
2+which was developed by Bungie Software <http://www.bungie.com/>.
33
4-The enhancements and extensions to Marathon 2 that constitute Aleph One have
5-been made by Loren Petrich, Chris Pruett, Ian Pitcher, Rhys Hill, Ben Thompson,
6-Mihai Parparita, Bo Lindbergh and others.
4+The enhancements and extensions to Marathon 2 and Marathon Infinity
5+that constitute Aleph One have been made by:
76
8-The SDL port of Aleph One has been made by Christian Bauer <www.cebix.net>.
7+Joey Adams
8+Michael Adams (mdmkolbe)
9+Falko Axmann
10+Christian Bauer
11+Mike Benonis
12+Steven Bytnar
13+Glen Ditchfield
14+Will Dyson
15+Carl Gherardi
16+Thomas Herzog
17+Peter Hessler
18+Matthew Hielscher
19+Rhys Hill
20+Alan Jenkins
21+Richard Jenkins (Solra Bizna)
22+Jeremy, the MSVC guy
23+Mark Levin
24+Bo Lindbergh
25+Chris Lovell
26+Jesse Luehrs
27+Derek Moeller
28+Jeremiah Morris
29+Sam Morris
30+Benoit Nadeau (Benad)
31+Mihai Parparita
32+Jeremy Parsons (brefin)
33+Eric Peterson
34+Loren Petrich
35+Ian Pitcher
36+Chris Pruett
37+Matthew Reda
38+Ian Rickard
39+Etienne Samson (tiennou)
40+Gregory Smith (treellama)
41+Scott Smith (pickle136)
42+Wolfgang Sourdeau
43+Peter Stirling
44+Alexander Strange (mrvacbob)
45+Alexei Svitkine
46+Ben Thompson
47+Clemens Unterkofler (hogdotmac)
48+James Willson
49+Woody Zenfell III
950
10-Aleph One uses the Expat XML library developed by James Clark.
51+
52+
旧リポジトリブラウザで表示