• R/O
  • SSH
  • HTTPS

marathon: コミット


コミットメタ情報

リビジョン521 (tree)
日時2012-05-27 17:24:20
作者ookawa_mi

ログメッセージ

ビルド結果

変更サマリ

差分

--- marathon/trunk/Source_Files/ModelView/Makefile.in (revision 520)
+++ marathon/trunk/Source_Files/ModelView/Makefile.in (revision 521)
@@ -1,9 +1,9 @@
1-# Makefile.in generated by automake 1.11.2 from Makefile.am.
1+# Makefile.in generated by automake 1.11.1 from Makefile.am.
22 # @configure_input@
33
44 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
5-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
6-# Foundation, Inc.
5+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
6+# Inc.
77 # This Makefile.in is free software; the Free Software Foundation
88 # gives unlimited permission to copy and/or distribute it,
99 # with or without modifications, as long as this notice is preserved.
@@ -116,9 +116,6 @@
116116 PACKAGE_URL = @PACKAGE_URL@
117117 PACKAGE_VERSION = @PACKAGE_VERSION@
118118 PATH_SEPARATOR = @PATH_SEPARATOR@
119-PKG_CONFIG = @PKG_CONFIG@
120-PNG_CFLAGS = @PNG_CFLAGS@
121-PNG_LIBS = @PNG_LIBS@
122119 RANLIB = @RANLIB@
123120 SDL_CFLAGS = @SDL_CFLAGS@
124121 SDL_CONFIG = @SDL_CONFIG@
@@ -127,11 +124,7 @@
127124 SHELL = @SHELL@
128125 STRIP = @STRIP@
129126 VERSION = @VERSION@
130-VORBISFILE_CFLAGS = @VORBISFILE_CFLAGS@
131-VORBISFILE_LIBS = @VORBISFILE_LIBS@
132127 WINDRES = @WINDRES@
133-ZZIP_CFLAGS = @ZZIP_CFLAGS@
134-ZZIP_LIBS = @ZZIP_LIBS@
135128 abs_builddir = @abs_builddir@
136129 abs_srcdir = @abs_srcdir@
137130 abs_top_builddir = @abs_top_builddir@
@@ -214,9 +207,9 @@
214207 exit 1;; \
215208 esac; \
216209 done; \
217- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Source_Files/ModelView/Makefile'; \
210+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Source_Files/ModelView/Makefile'; \
218211 $(am__cd) $(top_srcdir) && \
219- $(AUTOMAKE) --gnu Source_Files/ModelView/Makefile
212+ $(AUTOMAKE) --foreign Source_Files/ModelView/Makefile
220213 .PRECIOUS: Makefile
221214 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
222215 @case '$?' in \
@@ -365,15 +358,10 @@
365358
366359 installcheck: installcheck-am
367360 install-strip:
368- if test -z '$(STRIP)'; then \
369- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
370- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
371- install; \
372- else \
373- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
374- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
375- "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
376- fi
361+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
362+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
363+ `test -z '$(STRIP)' || \
364+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
377365 mostlyclean-generic:
378366
379367 clean-generic:
--- marathon/trunk/Source_Files/CSeries/converter.cpp (revision 520)
+++ marathon/trunk/Source_Files/CSeries/converter.cpp (revision 521)
@@ -1,177 +1,189 @@
1-/*
2- * converter.cpp
3- * AlephOne-OSX10.4
4- *
5- * Created by 縺ソ縺。縺ゅ″ on 08/06/24.
6- * Copyright 2008 __MyCompanyName__. All rights reserved.
7- *
8- * Modified by Logue
9- */
10-
11-#include "converter.h"
12-typedef unsigned short uint16;
13-#include <string.h>
14-#include <iconv.h>
15-
16-// Convert from Shift_JIS to UTF8
17-char* sjis2utf8(const char* str, size_t len) {
18- static char text[1024];
19- memset(text,0,1024);
20- const char* strp = str;
21- char* retp = text;
22- size_t sz = 1024;
23- iconv_t i = iconv_open("UTF-8", "SHIFT-JIS");
24- iconv_t j = iconv_open("UTF-8", "MACROMAN");
25- if( iconv(i, &strp, &len, &retp, &sz) == -1 ) {
26- strp = str;
27- retp = text;
28- sz = 1024;
29- iconv(j, &strp, &len, &retp, &sz);
30- }
31- if( text[strlen(text)-1] == 13) { text[strlen(text)-1] = 0; }
32- iconv_close(i);
33- iconv_close(j);
34- return text;
35-}
36-// Convert from UTF8 to Shift_JIS
37-char* utf82sjis(const char* str, size_t len) {
38- static char text[1024];
39- memset(text,0,1024);
40- const char* strp = str;
41- char* retp = text;
42- size_t sz = 1024;
43- iconv_t i = iconv_open("SHIFT-JIS", "UTF-8");
44- if( iconv(i, &strp, &len, &retp, &sz) == -1 ) {
45- // SHIFT-JIS縺ォ縺ァ縺阪↑縺?→縺阪?縺昴?縺セ縺セ繧ウ繝斐?
46- strncpy(text, str, len);
47- }
48- if( text[strlen(text)-1] == 13) { text[strlen(text)-1] = 0; }
49- iconv_close(i);
50- return text;
51-}
52-#define MAC_LINE_END 13
53-// Convert from Shift_JIS to Unidode
54-// AlephOneJP overrides to process_macroman().
55-uint16* sjis2utf16(const char* str, size_t len) {
56- static char base[1024]; // in case lastn letter is MAC_LINE_END
57- memset(base, 0, 1024);
58- strncpy(base, str, len);
59- if( base[len-1] == MAC_LINE_END ) {
60- base[len-1] = '\0';
61- --len;
62- }
63- static uint16 text[1024];
64- memset(text,0,2048);
65- const char* strp = base;
66- char* retp = (char*)text;
67- size_t sz = 1024;
68- iconv_t i = iconv_open("UCS-2-INTERNAL", "SHIFT-JIS");
69- iconv_t j = iconv_open("UCS-2-INTERNAL", "MACROMAN");
70- if( iconv(i, &strp, &len, &retp, &sz) == -1 ) {
71- strp = str;
72- retp = (char*)text;
73- sz = 1024;
74- iconv(j, &strp, &len, &retp, &sz);
75- }
76- iconv_close(i);
77- iconv_close(j);
78- return text;
79-}
80-
81-// Convert from UTF8 to Unidode
82-uint16* utf82utf16(const char* str, size_t len) {
83- static uint16 text[1024];
84- memset(text,0,2048);
85- const char* strp = str;
86- char* retp = (char*)text;
87- size_t sz = 1024;
88- iconv_t i = iconv_open("UCS-2-INTERNAL", "UTF-8");
89- if( iconv(i, &strp, &len, &retp, &sz) == -1 ) {
90- }
91- iconv_close(i);
92- return text;
93-}
94-
95-// Convert from Unicode to UTF8
96-char* utf162utf8(const uint16* str, size_t len) {
97- static char text[1024];
98- memset(text,0,1024);
99- len *= 2;
100- const char* strp = (const char*)str;
101- char* retp = text;
102- size_t sz = 1024;
103- iconv_t i = iconv_open("UTF-8", "UCS-2-INTERNAL");
104- if( iconv(i, &strp, &len, &retp, &sz) == -1 ) {
105- }
106- iconv_close(i);
107- return text;
108-}
109-
110-uint16 sjisChar(char* in, int* step) {
111- size_t len;
112- if( *in == 13 ) { if( step ) *step += 1; return 13; }
113- if( step ) {
114- if ( isJChar((unsigned char)*in) ) {
115- *step += 2;
116- len = 2;
117- } else {
118- *step += 1;
119- len = 1;
120- }
121- }
122- uint16 text[2];
123- memset(text,0,4);
124- const char* strp = in;
125- char* retp = (char*)text;
126- size_t sz = 4;
127- iconv_t i = iconv_open("UCS-2-INTERNAL", "SHIFT-JIS");
128- iconv_t j = iconv_open("UCS-2-INTERNAL", "MACROMAN");
129- if( iconv(i, &strp, &len, &retp, &sz) == -1 ) {
130- strp = in;
131- retp = (char*)text;
132- sz = 4;
133- iconv(j, &strp, &len, &retp, &sz);
134- }
135- iconv_close(i);
136- iconv_close(j);
137- return text[0];
138-}
139-
140-int unicodeChar( const char* input, uint16* ret) {
141- uint16 text[3];
142- memset(text,0,4);
143- const char* strp = input;
144- char* retp = (char*)text;
145- size_t len = strlen(input), sz = 6;
146-
147- iconv_t i = iconv_open("UCS-2-INTERNAL", "SHIFT-JIS");
148- iconv_t j = iconv_open("UCS-2-INTERNAL", "MACROMAN");
149-
150- if( iconv(i, &strp, &len, &retp, &sz) == -1 ) {
151- strp = input;
152- retp = (char*)text;
153- sz = 4;
154- iconv(j, &strp, &len, &retp, &sz);
155- }
156- iconv_close(i);
157- iconv_close(j);
158- *ret = text[0];
159-
160- unsigned char first = *input;
161- if( first < 0x80 || ( first > 0xa0 && first < 0xe0 ) ) {
162- return 1;
163- } else if( first < 0xeb ) {
164- return 2;
165- } else {
166- return 1;
167- }
168-}
169-
170-// Detect 2-byte char. (for Shift_JIS)
171-bool isJChar(unsigned char text) {
172- return (((text >= 0x81) && (text <= 0x9f)) || ((text >= 0xe0) && (text <= 0xfc))) ? true : false;
173-}
174-// Detect 2nd charactor of 2-byte char. (for Shift_JIS)
175-bool is2ndJChar(unsigned char text) {
176- return (((0x7F != text) && (0x40 <= text)) || ((text >= 0xe0) && (text <= 0xfc))) ? true : false;
177-}
1+/*
2+ * converter.cpp
3+ * AlephOne-OSX10.4
4+ *
5+ * Created by 縺ソ縺。縺ゅ″ on 08/06/24.
6+ * Copyright 2008 __MyCompanyName__. All rights reserved.
7+ *
8+ * Modified by Logue
9+ */
10+
11+#include "converter.h"
12+typedef unsigned short uint16;
13+#include <string.h>
14+#include <iconv.h>
15+
16+// Convert from Shift_JIS to UTF8
17+char* sjis2utf8(const char* str, size_t len) {
18+ static char text[1024];
19+ static char src[1024];
20+ strcpy(src, str);
21+ memset(text,0,1024);
22+ char* strp = src;
23+ char* retp = text;
24+ size_t sz = 1024;
25+ iconv_t i = iconv_open("UTF-8", "SHIFT-JIS");
26+ iconv_t j = iconv_open("UTF-8", "MACROMAN");
27+ if( iconv(i, &strp, &len, &retp, &sz) == -1 ) {
28+ strp = src;
29+ retp = text;
30+ sz = 1024;
31+ iconv(j, &strp, &len, &retp, &sz);
32+ }
33+ if( text[strlen(text)-1] == 13) { text[strlen(text)-1] = 0; }
34+ iconv_close(i);
35+ iconv_close(j);
36+ return text;
37+}
38+// Convert from UTF8 to Shift_JIS
39+char* utf82sjis(const char* str, size_t len) {
40+ static char text[1024];
41+ static char src[1024];
42+ strcpy(src, str);
43+ memset(text,0,1024);
44+ char* strp = src;
45+ char* retp = text;
46+ size_t sz = 1024;
47+ iconv_t i = iconv_open("SHIFT-JIS", "UTF-8");
48+ if( iconv(i, &strp, &len, &retp, &sz) == -1 ) {
49+ // SHIFT-JIS縺ォ縺ァ縺阪↑縺・→縺阪・縺昴・縺セ縺セ繧ウ繝斐・
50+ strncpy(text, str, len);
51+ }
52+ if( text[strlen(text)-1] == 13) { text[strlen(text)-1] = 0; }
53+ iconv_close(i);
54+ return text;
55+}
56+#define MAC_LINE_END 13
57+// Convert from Shift_JIS to Unidode
58+// AlephOneJP overrides to process_macroman().
59+uint16* sjis2utf16(const char* str, size_t len) {
60+ static char base[1024]; // in case lastn letter is MAC_LINE_END
61+
62+ memset(base, 0, 1024);
63+ strncpy(base, str, len);
64+ if( base[len-1] == MAC_LINE_END ) {
65+ base[len-1] = '\0';
66+ --len;
67+ }
68+ static uint16 text[1024];
69+ memset(text,0,2048);
70+ char* strp = base;
71+ char* retp = (char*)text;
72+ size_t sz = 1024;
73+ iconv_t i = iconv_open("UCS-2-INTERNAL", "SHIFT-JIS");
74+ iconv_t j = iconv_open("UCS-2-INTERNAL", "MACROMAN");
75+ if( iconv(i, &strp, &len, &retp, &sz) == -1 ) {
76+ strp = base;
77+ retp = (char*)text;
78+ sz = 1024;
79+ iconv(j, &strp, &len, &retp, &sz);
80+ }
81+ iconv_close(i);
82+ iconv_close(j);
83+ return text;
84+}
85+
86+// Convert from UTF8 to Unidode
87+uint16* utf82utf16(const char* str, size_t len) {
88+ static uint16 text[1024];
89+ static char src[1024];
90+ strcpy(src,str);
91+ memset(text,0,2048);
92+ char* strp = src;
93+ char* retp = (char*)text;
94+ size_t sz = 1024;
95+ iconv_t i = iconv_open("UCS-2-INTERNAL", "UTF-8");
96+ if( iconv(i, &strp, &len, &retp, &sz) == -1 ) {
97+ }
98+ iconv_close(i);
99+ return text;
100+}
101+
102+// Convert from Unicode to UTF8
103+char* utf162utf8(const uint16* str, size_t len) {
104+ static char text[1024];
105+ static char src[1024];
106+ memset(src, 0, 1024*sizeof(uint16));
107+ memcpy(src, str, len*sizeof(uint16));
108+ memset(text,0,1024);
109+ len *= 2;
110+ char* strp = src;
111+ char* retp = text;
112+ size_t sz = 1024;
113+ iconv_t i = iconv_open("UTF-8", "UCS-2-INTERNAL");
114+ if( iconv(i, &strp, &len, &retp, &sz) == -1 ) {
115+ }
116+ iconv_close(i);
117+ return text;
118+}
119+
120+uint16 sjisChar(char* in, int* step) {
121+ size_t len;
122+ if( *in == 13 ) { if( step ) *step += 1; return 13; }
123+ if( step ) {
124+ if ( isJChar((unsigned char)*in) ) {
125+ *step += 2;
126+ len = 2;
127+ } else {
128+ *step += 1;
129+ len = 1;
130+ }
131+ }
132+ uint16 text[2];
133+ memset(text,0,4);
134+ char* strp = in;
135+ char* retp = (char*)text;
136+ size_t sz = 4;
137+ iconv_t i = iconv_open("UCS-2-INTERNAL", "SHIFT-JIS");
138+ iconv_t j = iconv_open("UCS-2-INTERNAL", "MACROMAN");
139+ if( iconv(i, &strp, &len, &retp, &sz) == -1 ) {
140+ strp = in;
141+ retp = (char*)text;
142+ sz = 4;
143+ iconv(j, &strp, &len, &retp, &sz);
144+ }
145+ iconv_close(i);
146+ iconv_close(j);
147+ return text[0];
148+}
149+
150+int unicodeChar( const char* input, uint16* ret) {
151+ uint16 text[3];
152+ static char src[1024];
153+ strcpy(src,input);
154+ memset(text,0,4);
155+ char* strp = src;
156+ char* retp = (char*)text;
157+ size_t len = strlen(input), sz = 6;
158+
159+ iconv_t i = iconv_open("UCS-2-INTERNAL", "SHIFT-JIS");
160+ iconv_t j = iconv_open("UCS-2-INTERNAL", "MACROMAN");
161+
162+ if( iconv(i, &strp, &len, &retp, &sz) == -1 ) {
163+ strp = src;
164+ retp = (char*)text;
165+ sz = 4;
166+ iconv(j, &strp, &len, &retp, &sz);
167+ }
168+ iconv_close(i);
169+ iconv_close(j);
170+ *ret = text[0];
171+
172+ unsigned char first = *input;
173+ if( first < 0x80 || ( first > 0xa0 && first < 0xe0 ) ) {
174+ return 1;
175+ } else if( first < 0xeb ) {
176+ return 2;
177+ } else {
178+ return 1;
179+ }
180+}
181+
182+// Detect 2-byte char. (for Shift_JIS)
183+bool isJChar(unsigned char text) {
184+ return (((text >= 0x81) && (text <= 0x9f)) || ((text >= 0xe0) && (text <= 0xfc))) ? true : false;
185+}
186+// Detect 2nd charactor of 2-byte char. (for Shift_JIS)
187+bool is2ndJChar(unsigned char text) {
188+ return (((0x7F != text) && (0x40 <= text)) || ((text >= 0xe0) && (text <= 0xfc))) ? true : false;
189+}
--- marathon/trunk/Makefile.in (revision 520)
+++ marathon/trunk/Makefile.in (revision 521)
@@ -1,9 +1,9 @@
1-# Makefile.in generated by automake 1.11.2 from Makefile.am.
1+# Makefile.in generated by automake 1.11.1 from Makefile.am.
22 # @configure_input@
33
44 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
5-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
6-# Foundation, Inc.
5+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
6+# Inc.
77 # This Makefile.in is free software; the Free Software Foundation
88 # gives unlimited permission to copy and/or distribute it,
99 # with or without modifications, as long as this notice is preserved.
@@ -38,8 +38,7 @@
3838 DIST_COMMON = README $(am__configure_deps) $(srcdir)/AlephOne.spec.in \
3939 $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
4040 $(srcdir)/config.h.in $(top_srcdir)/configure AUTHORS COPYING \
41- ChangeLog THANKS config.guess config.sub depcomp install-sh \
42- missing
41+ ChangeLog config.guess config.sub depcomp install-sh missing
4342 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
4443 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
4544 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -80,12 +79,6 @@
8079 am__base_list = \
8180 sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
8281 sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
83-am__uninstall_files_from_dir = { \
84- test -z "$$files" \
85- || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
86- || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
87- $(am__cd) "$$dir" && rm -f $$files; }; \
88- }
8982 man6dir = $(mandir)/man6
9083 am__installdirs = "$(DESTDIR)$(man6dir)"
9184 NROFF = nroff
@@ -133,8 +126,6 @@
133126 GZIP_ENV = --best
134127 DIST_ARCHIVES = $(distdir).tar.bz2
135128 distuninstallcheck_listfiles = find . -type f -print
136-am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
137- | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
138129 distcleancheck_listfiles = find . -type f -print
139130 ACLOCAL = @ACLOCAL@
140131 AMTAR = @AMTAR@
@@ -180,9 +171,6 @@
180171 PACKAGE_URL = @PACKAGE_URL@
181172 PACKAGE_VERSION = @PACKAGE_VERSION@
182173 PATH_SEPARATOR = @PATH_SEPARATOR@
183-PKG_CONFIG = @PKG_CONFIG@
184-PNG_CFLAGS = @PNG_CFLAGS@
185-PNG_LIBS = @PNG_LIBS@
186174 RANLIB = @RANLIB@
187175 SDL_CFLAGS = @SDL_CFLAGS@
188176 SDL_CONFIG = @SDL_CONFIG@
@@ -191,11 +179,7 @@
191179 SHELL = @SHELL@
192180 STRIP = @STRIP@
193181 VERSION = @VERSION@
194-VORBISFILE_CFLAGS = @VORBISFILE_CFLAGS@
195-VORBISFILE_LIBS = @VORBISFILE_LIBS@
196182 WINDRES = @WINDRES@
197-ZZIP_CFLAGS = @ZZIP_CFLAGS@
198-ZZIP_LIBS = @ZZIP_LIBS@
199183 abs_builddir = @abs_builddir@
200184 abs_srcdir = @abs_srcdir@
201185 abs_top_builddir = @abs_top_builddir@
@@ -306,7 +290,7 @@
306290 $(MAKE) $(AM_MAKEFLAGS) all-recursive
307291
308292 .SUFFIXES:
309-am--refresh: Makefile
293+am--refresh:
310294 @:
311295 $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
312296 @for dep in $?; do \
@@ -342,8 +326,10 @@
342326 $(am__aclocal_m4_deps):
343327
344328 config.h: stamp-h1
345- @if test ! -f $@; then rm -f stamp-h1; else :; fi
346- @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi
329+ @if test ! -f $@; then \
330+ rm -f stamp-h1; \
331+ $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
332+ else :; fi
347333
348334 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
349335 @rm -f stamp-h1
@@ -392,7 +378,9 @@
392378 sed -n '/\.6[a-z]*$$/p'; \
393379 } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^6][0-9a-z]*$$,6,;x' \
394380 -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
395- dir='$(DESTDIR)$(man6dir)'; $(am__uninstall_files_from_dir)
381+ test -z "$$files" || { \
382+ echo " ( cd '$(DESTDIR)$(man6dir)' && rm -f" $$files ")"; \
383+ cd "$(DESTDIR)$(man6dir)" && rm -f $$files; }
396384
397385 # This directory's subdirectories are mostly independent; you can cd
398386 # into them and run `make' without going through this Makefile.
@@ -616,7 +604,7 @@
616604 tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
617605 $(am__remove_distdir)
618606 dist-bzip2: distdir
619- tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
607+ tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
620608 $(am__remove_distdir)
621609
622610 dist-lzma: distdir
@@ -624,7 +612,7 @@
624612 $(am__remove_distdir)
625613
626614 dist-xz: distdir
627- tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
615+ tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz
628616 $(am__remove_distdir)
629617
630618 dist-tarZ: distdir
@@ -641,7 +629,7 @@
641629 $(am__remove_distdir)
642630
643631 dist dist-all: distdir
644- tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
632+ tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
645633 $(am__remove_distdir)
646634
647635 # This target untars the dist file and tries a VPATH configuration. Then
@@ -674,7 +662,6 @@
674662 && am__cwd=`pwd` \
675663 && $(am__cd) $(distdir)/_build \
676664 && ../configure --srcdir=.. --prefix="$$dc_install_base" \
677- $(AM_DISTCHECK_CONFIGURE_FLAGS) \
678665 $(DISTCHECK_CONFIGURE_FLAGS) \
679666 && $(MAKE) $(AM_MAKEFLAGS) \
680667 && $(MAKE) $(AM_MAKEFLAGS) dvi \
@@ -703,16 +690,8 @@
703690 list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
704691 sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
705692 distuninstallcheck:
706- @test -n '$(distuninstallcheck_dir)' || { \
707- echo 'ERROR: trying to run $@ with an empty' \
708- '$$(distuninstallcheck_dir)' >&2; \
709- exit 1; \
710- }; \
711- $(am__cd) '$(distuninstallcheck_dir)' || { \
712- echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \
713- exit 1; \
714- }; \
715- test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \
693+ @$(am__cd) '$(distuninstallcheck_dir)' \
694+ && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
716695 || { echo "ERROR: files left after uninstall:" ; \
717696 if test -n "$(DESTDIR)"; then \
718697 echo " (check DESTDIR support)"; \
@@ -746,15 +725,10 @@
746725
747726 installcheck: installcheck-recursive
748727 install-strip:
749- if test -z '$(STRIP)'; then \
750- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
751- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
752- install; \
753- else \
754- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
755- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
756- "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
757- fi
728+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
729+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
730+ `test -z '$(STRIP)' || \
731+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
758732 mostlyclean-generic:
759733
760734 clean-generic:
--- marathon/trunk/mingw.sh (revision 520)
+++ marathon/trunk/mingw.sh (revision 521)
@@ -1,2 +1,2 @@
11 #!/bin/sh
2-LDFLAGS="-Wl,-S" LIBS="-lfreetype -lvorbis -logg -ltiff -ljpeg -lpng -lz -lstdc++ -lws2_32 -Ic:/mingw32/lib" ./configure
2+LDFLAGS="-Wl,-S" LIBS="-lIPHlpApi -lsmpeg -lsndfile -lfreetype -lvorbis -logg -ltiff -ljpeg -lpng -lz -lstdc++ -lws2_32 -Ic:/mingw32/lib" ./configure
--- marathon/trunk/config.h.in (revision 520)
+++ marathon/trunk/config.h.in (revision 521)
@@ -30,9 +30,6 @@
3030 /* OpenGL support is enabled */
3131 #undef HAVE_OPENGL
3232
33-/* PNG support enabled */
34-#undef HAVE_PNG
35-
3633 /* Define to 1 if you have the <pwd.h> header file. */
3734 #undef HAVE_PWD_H
3835
@@ -93,15 +90,9 @@
9390 /* Define to 1 if you have the <unistd.h> header file. */
9491 #undef HAVE_UNISTD_H
9592
96-/* vorbis support enabled */
97-#undef HAVE_VORBISFILE
98-
9993 /* vsnprintf() is available */
10094 #undef HAVE_VSNPRINTF
10195
102-/* ZZIP support enabled */
103-#undef HAVE_ZZIP
104-
10596 /* mkstemp() is available */
10697 #undef LUA_USE_MKSTEMP
10798
--- marathon/trunk/tools/Makefile.in (revision 520)
+++ marathon/trunk/tools/Makefile.in (revision 521)
@@ -1,9 +1,9 @@
1-# Makefile.in generated by automake 1.11.2 from Makefile.am.
1+# Makefile.in generated by automake 1.11.1 from Makefile.am.
22 # @configure_input@
33
44 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
5-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
6-# Foundation, Inc.
5+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
6+# Inc.
77 # This Makefile.in is free software; the Free Software Foundation
88 # gives unlimited permission to copy and/or distribute it,
99 # with or without modifications, as long as this notice is preserved.
@@ -96,9 +96,6 @@
9696 PACKAGE_URL = @PACKAGE_URL@
9797 PACKAGE_VERSION = @PACKAGE_VERSION@
9898 PATH_SEPARATOR = @PATH_SEPARATOR@
99-PKG_CONFIG = @PKG_CONFIG@
100-PNG_CFLAGS = @PNG_CFLAGS@
101-PNG_LIBS = @PNG_LIBS@
10299 RANLIB = @RANLIB@
103100 SDL_CFLAGS = @SDL_CFLAGS@
104101 SDL_CONFIG = @SDL_CONFIG@
@@ -107,11 +104,7 @@
107104 SHELL = @SHELL@
108105 STRIP = @STRIP@
109106 VERSION = @VERSION@
110-VORBISFILE_CFLAGS = @VORBISFILE_CFLAGS@
111-VORBISFILE_LIBS = @VORBISFILE_LIBS@
112107 WINDRES = @WINDRES@
113-ZZIP_CFLAGS = @ZZIP_CFLAGS@
114-ZZIP_LIBS = @ZZIP_LIBS@
115108 abs_builddir = @abs_builddir@
116109 abs_srcdir = @abs_srcdir@
117110 abs_top_builddir = @abs_top_builddir@
@@ -187,9 +180,9 @@
187180 exit 1;; \
188181 esac; \
189182 done; \
190- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tools/Makefile'; \
183+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tools/Makefile'; \
191184 $(am__cd) $(top_srcdir) && \
192- $(AUTOMAKE) --gnu tools/Makefile
185+ $(AUTOMAKE) --foreign tools/Makefile
193186 .PRECIOUS: Makefile
194187 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
195188 @case '$?' in \
@@ -259,15 +252,10 @@
259252
260253 installcheck: installcheck-am
261254 install-strip:
262- if test -z '$(STRIP)'; then \
263- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
264- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
265- install; \
266- else \
267- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
268- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
269- "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
270- fi
255+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
256+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
257+ `test -z '$(STRIP)' || \
258+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
271259 mostlyclean-generic:
272260
273261 clean-generic:
--- marathon/trunk/data/Makefile.in (revision 520)
+++ marathon/trunk/data/Makefile.in (revision 521)
@@ -1,9 +1,9 @@
1-# Makefile.in generated by automake 1.11.2 from Makefile.am.
1+# Makefile.in generated by automake 1.11.1 from Makefile.am.
22 # @configure_input@
33
44 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
5-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
6-# Foundation, Inc.
5+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
6+# Inc.
77 # This Makefile.in is free software; the Free Software Foundation
88 # gives unlimited permission to copy and/or distribute it,
99 # with or without modifications, as long as this notice is preserved.
@@ -75,12 +75,6 @@
7575 am__base_list = \
7676 sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
7777 sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
78-am__uninstall_files_from_dir = { \
79- test -z "$$files" \
80- || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
81- || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
82- $(am__cd) "$$dir" && rm -f $$files; }; \
83- }
8478 am__installdirs = "$(DESTDIR)$(mmldir)" "$(DESTDIR)$(pkgdatadir)"
8579 DATA = $(mml_DATA) $(pkgdata_DATA)
8680 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
@@ -161,9 +155,6 @@
161155 PACKAGE_URL = @PACKAGE_URL@
162156 PACKAGE_VERSION = @PACKAGE_VERSION@
163157 PATH_SEPARATOR = @PATH_SEPARATOR@
164-PKG_CONFIG = @PKG_CONFIG@
165-PNG_CFLAGS = @PNG_CFLAGS@
166-PNG_LIBS = @PNG_LIBS@
167158 RANLIB = @RANLIB@
168159 SDL_CFLAGS = @SDL_CFLAGS@
169160 SDL_CONFIG = @SDL_CONFIG@
@@ -172,11 +163,7 @@
172163 SHELL = @SHELL@
173164 STRIP = @STRIP@
174165 VERSION = @VERSION@
175-VORBISFILE_CFLAGS = @VORBISFILE_CFLAGS@
176-VORBISFILE_LIBS = @VORBISFILE_LIBS@
177166 WINDRES = @WINDRES@
178-ZZIP_CFLAGS = @ZZIP_CFLAGS@
179-ZZIP_LIBS = @ZZIP_LIBS@
180167 abs_builddir = @abs_builddir@
181168 abs_srcdir = @abs_srcdir@
182169 abs_top_builddir = @abs_top_builddir@
@@ -251,9 +238,9 @@
251238 exit 1;; \
252239 esac; \
253240 done; \
254- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/Makefile'; \
241+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign data/Makefile'; \
255242 $(am__cd) $(top_srcdir) && \
256- $(AUTOMAKE) --gnu data/Makefile
243+ $(AUTOMAKE) --foreign data/Makefile
257244 .PRECIOUS: Makefile
258245 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
259246 @case '$?' in \
@@ -289,7 +276,9 @@
289276 @$(NORMAL_UNINSTALL)
290277 @list='$(mml_DATA)'; test -n "$(mmldir)" || list=; \
291278 files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
292- dir='$(DESTDIR)$(mmldir)'; $(am__uninstall_files_from_dir)
279+ test -n "$$files" || exit 0; \
280+ echo " ( cd '$(DESTDIR)$(mmldir)' && rm -f" $$files ")"; \
281+ cd "$(DESTDIR)$(mmldir)" && rm -f $$files
293282 install-pkgdataDATA: $(pkgdata_DATA)
294283 @$(NORMAL_INSTALL)
295284 test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)"
@@ -307,7 +296,9 @@
307296 @$(NORMAL_UNINSTALL)
308297 @list='$(pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
309298 files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
310- dir='$(DESTDIR)$(pkgdatadir)'; $(am__uninstall_files_from_dir)
299+ test -n "$$files" || exit 0; \
300+ echo " ( cd '$(DESTDIR)$(pkgdatadir)' && rm -f" $$files ")"; \
301+ cd "$(DESTDIR)$(pkgdatadir)" && rm -f $$files
311302
312303 # This directory's subdirectories are mostly independent; you can cd
313304 # into them and run `make' without going through this Makefile.
@@ -520,15 +511,10 @@
520511
521512 installcheck: installcheck-recursive
522513 install-strip:
523- if test -z '$(STRIP)'; then \
524- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
525- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
526- install; \
527- else \
528- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
529- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
530- "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
531- fi
514+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
515+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
516+ `test -z '$(STRIP)' || \
517+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
532518 mostlyclean-generic:
533519
534520 clean-generic:
--- marathon/trunk/data/default_theme/Makefile.in (revision 520)
+++ marathon/trunk/data/default_theme/Makefile.in (revision 521)
@@ -1,9 +1,9 @@
1-# Makefile.in generated by automake 1.11.2 from Makefile.am.
1+# Makefile.in generated by automake 1.11.1 from Makefile.am.
22 # @configure_input@
33
44 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
5-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
6-# Foundation, Inc.
5+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
6+# Inc.
77 # This Makefile.in is free software; the Free Software Foundation
88 # gives unlimited permission to copy and/or distribute it,
99 # with or without modifications, as long as this notice is preserved.
@@ -68,12 +68,6 @@
6868 am__base_list = \
6969 sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
7070 sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
71-am__uninstall_files_from_dir = { \
72- test -z "$$files" \
73- || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
74- || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
75- $(am__cd) "$$dir" && rm -f $$files; }; \
76- }
7771 am__installdirs = "$(DESTDIR)$(themedir)"
7872 DATA = $(theme_DATA)
7973 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -121,9 +115,6 @@
121115 PACKAGE_URL = @PACKAGE_URL@
122116 PACKAGE_VERSION = @PACKAGE_VERSION@
123117 PATH_SEPARATOR = @PATH_SEPARATOR@
124-PKG_CONFIG = @PKG_CONFIG@
125-PNG_CFLAGS = @PNG_CFLAGS@
126-PNG_LIBS = @PNG_LIBS@
127118 RANLIB = @RANLIB@
128119 SDL_CFLAGS = @SDL_CFLAGS@
129120 SDL_CONFIG = @SDL_CONFIG@
@@ -132,11 +123,7 @@
132123 SHELL = @SHELL@
133124 STRIP = @STRIP@
134125 VERSION = @VERSION@
135-VORBISFILE_CFLAGS = @VORBISFILE_CFLAGS@
136-VORBISFILE_LIBS = @VORBISFILE_LIBS@
137126 WINDRES = @WINDRES@
138-ZZIP_CFLAGS = @ZZIP_CFLAGS@
139-ZZIP_LIBS = @ZZIP_LIBS@
140127 abs_builddir = @abs_builddir@
141128 abs_srcdir = @abs_srcdir@
142129 abs_top_builddir = @abs_top_builddir@
@@ -216,9 +203,9 @@
216203 exit 1;; \
217204 esac; \
218205 done; \
219- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/default_theme/Makefile'; \
206+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign data/default_theme/Makefile'; \
220207 $(am__cd) $(top_srcdir) && \
221- $(AUTOMAKE) --gnu data/default_theme/Makefile
208+ $(AUTOMAKE) --foreign data/default_theme/Makefile
222209 .PRECIOUS: Makefile
223210 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
224211 @case '$?' in \
@@ -254,7 +241,9 @@
254241 @$(NORMAL_UNINSTALL)
255242 @list='$(theme_DATA)'; test -n "$(themedir)" || list=; \
256243 files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
257- dir='$(DESTDIR)$(themedir)'; $(am__uninstall_files_from_dir)
244+ test -n "$$files" || exit 0; \
245+ echo " ( cd '$(DESTDIR)$(themedir)' && rm -f" $$files ")"; \
246+ cd "$(DESTDIR)$(themedir)" && rm -f $$files
258247 tags: TAGS
259248 TAGS:
260249
@@ -309,15 +298,10 @@
309298
310299 installcheck: installcheck-am
311300 install-strip:
312- if test -z '$(STRIP)'; then \
313- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
314- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
315- install; \
316- else \
317- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
318- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
319- "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
320- fi
301+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
302+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
303+ `test -z '$(STRIP)' || \
304+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
321305 mostlyclean-generic:
322306
323307 clean-generic:
旧リポジトリブラウザで表示