[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[freesci-develop] r1518 - in freesci/trunk: . src src/include
|
From: |
jameson |
|
Subject: |
[freesci-develop] r1518 - in freesci/trunk: . src src/include |
|
Date: |
Sun, 05 Feb 2006 04:06:57 +0100 |
Author: jameson
Date: 2006-02-05 04:06:53 +0100 (Sun, 05 Feb 2006)
New Revision: 1518
Modified:
freesci/trunk/ChangeLog
freesci/trunk/config.h
freesci/trunk/config.log
freesci/trunk/configure.in
freesci/trunk/freesci.spec
freesci/trunk/src/include/games.h
freesci/trunk/src/main.c
Log:
* Added new game IDs
* Added -lXext where appropriate (a)
(a) fixes compilation on 64 bit OS X. Looks like
everything's working normally on that end, though I
didn't test sound support (no SDL installed).
-- Christoph
Modified: freesci/trunk/ChangeLog
===================================================================
--- freesci/trunk/ChangeLog 2006-02-05 01:13:43 UTC (rev 1517)
+++ freesci/trunk/ChangeLog 2006-02-05 03:06:53 UTC (rev 1518)
@@ -1,5 +1,11 @@
2006-02-05 Christoph Reichenbach <address@hidden>
+ * configure.in: Added -lXext support for compiling on some OS X
+ versions
+
+ * src/main.c (main): Added sanity check to avoid segfault when
+ using game name w/o having ~/.freesci/config
+
* src/gfx/resmgr.c (gfxr_add_to_pic): Ensure that add-to-pic will
use the added pic's resource ID for determining resource-specific
updates
Modified: freesci/trunk/config.h
===================================================================
--- freesci/trunk/config.h 2006-02-05 01:13:43 UTC (rev 1517)
+++ freesci/trunk/config.h 2006-02-05 03:06:53 UTC (rev 1518)
@@ -3,7 +3,7 @@
/* Define to 1 if you want to enforce usage of on-screen console on all gfx
drivers. */
-#define FORCE_CONSOLE 1
+/* #undef FORCE_CONSOLE */
/* Define to 1 if you have Alpha EV6 or PCA56 hardware. */
/* #undef HAVE_ALPHA_EV6_SUPPORT */
@@ -201,10 +201,10 @@
/* #undef UNCHECKED_MALLOCS */
/* Version number of package */
-#define VERSION "0.3.5pre0"
+#define VERSION "0.3.5pre1"
/* Define to 1 if you want to build with on-screen console support. */
-#define WANT_CONSOLE 1
+/* #undef WANT_CONSOLE */
/* Define if using the dmalloc debugging malloc package */
/* #undef WITH_DMALLOC */
Modified: freesci/trunk/config.log
===================================================================
--- freesci/trunk/config.log 2006-02-05 01:13:43 UTC (rev 1517)
+++ freesci/trunk/config.log 2006-02-05 03:06:53 UTC (rev 1518)
@@ -4,7 +4,7 @@
It was created by configure, which was
generated by GNU Autoconf 2.59. Invocation command line was
- $ ./configure --with-forced-console
+ $ ./configure
## --------- ##
## Platform. ##
@@ -151,7 +151,7 @@
| #define PACKAGE_STRING ""
| #define PACKAGE_BUGREPORT ""
| #define PACKAGE "freesci"
-| #define VERSION "0.3.5pre0"
+| #define VERSION "0.3.5pre1"
| /* end confdefs.h. */
| #include <ac_nonexistent.h>
configure:2854: result: gcc -E
@@ -169,7 +169,7 @@
| #define PACKAGE_STRING ""
| #define PACKAGE_BUGREPORT ""
| #define PACKAGE "freesci"
-| #define VERSION "0.3.5pre0"
+| #define VERSION "0.3.5pre1"
| /* end confdefs.h. */
| #include <ac_nonexistent.h>
configure:2966: checking for egrep
@@ -503,8 +503,8 @@
configure:6255: result: yes
configure:6168: checking for memf
configure:6225: gcc -o conftest -g -O2 conftest.c >&5
-/tmp/ccq79G5b.o: In function
`main':/home/creichen/work/port/freesci/conftest.c:80: undefined reference to
`memf'
-/tmp/ccq79G5b.o:(.data+0x0): undefined reference to `memf'
+/tmp/ccWaWYwK.o: In function
`main':/home/creichen/work/port/freesci/conftest.c:80: undefined reference to
`memf'
+/tmp/ccWaWYwK.o:(.data+0x0): undefined reference to `memf'
collect2: ld returned 1 exit status
configure:6231: $? = 1
configure: failed program was:
@@ -516,7 +516,7 @@
| #define PACKAGE_STRING ""
| #define PACKAGE_BUGREPORT ""
| #define PACKAGE "freesci"
-| #define VERSION "0.3.5pre0"
+| #define VERSION "0.3.5pre1"
| #define STDC_HEADERS 1
| #define HAVE_SYS_TYPES_H 1
| #define HAVE_SYS_STAT_H 1
@@ -595,8 +595,8 @@
configure:6255: result: no
configure:6168: checking for rob
configure:6225: gcc -o conftest -g -O2 conftest.c >&5
-/tmp/ccKTX65q.o: In function
`main':/home/creichen/work/port/freesci/conftest.c:80: undefined reference to
`rob'
-/tmp/ccKTX65q.o:(.data+0x0): undefined reference to `rob'
+/tmp/ccUPN9IV.o: In function
`main':/home/creichen/work/port/freesci/conftest.c:80: undefined reference to
`rob'
+/tmp/ccUPN9IV.o:(.data+0x0): undefined reference to `rob'
collect2: ld returned 1 exit status
configure:6231: $? = 1
configure: failed program was:
@@ -608,7 +608,7 @@
| #define PACKAGE_STRING ""
| #define PACKAGE_BUGREPORT ""
| #define PACKAGE "freesci"
-| #define VERSION "0.3.5pre0"
+| #define VERSION "0.3.5pre1"
| #define STDC_HEADERS 1
| #define HAVE_SYS_TYPES_H 1
| #define HAVE_SYS_STAT_H 1
@@ -779,7 +779,7 @@
configure:6763: gcc -E conftest.c
configure:6769: $? = 0
configure:6828: gcc -o conftest -g -O2 -lgii -lgg conftest.c -lasound
-lasound -lm >&5
-/tmp/ccCOktGw.o: In function
`main':/home/creichen/work/port/freesci/conftest.c:54: undefined reference to
`ggiInit'
+/tmp/ccaek9qY.o: In function
`main':/home/creichen/work/port/freesci/conftest.c:54: undefined reference to
`ggiInit'
collect2: ld returned 1 exit status
configure:6834: $? = 1
configure: failed program was:
@@ -791,7 +791,7 @@
| #define PACKAGE_STRING ""
| #define PACKAGE_BUGREPORT ""
| #define PACKAGE "freesci"
-| #define VERSION "0.3.5pre0"
+| #define VERSION "0.3.5pre1"
| #define STDC_HEADERS 1
| #define HAVE_SYS_TYPES_H 1
| #define HAVE_SYS_STAT_H 1
@@ -868,7 +868,7 @@
| #define PACKAGE_STRING ""
| #define PACKAGE_BUGREPORT ""
| #define PACKAGE "freesci"
-| #define VERSION "0.3.5pre0"
+| #define VERSION "0.3.5pre1"
| #define STDC_HEADERS 1
| #define HAVE_SYS_TYPES_H 1
| #define HAVE_SYS_STAT_H 1
@@ -924,7 +924,7 @@
| #define PACKAGE_STRING ""
| #define PACKAGE_BUGREPORT ""
| #define PACKAGE "freesci"
-| #define VERSION "0.3.5pre0"
+| #define VERSION "0.3.5pre1"
| #define STDC_HEADERS 1
| #define HAVE_SYS_TYPES_H 1
| #define HAVE_SYS_STAT_H 1
@@ -980,7 +980,7 @@
| #define PACKAGE_STRING ""
| #define PACKAGE_BUGREPORT ""
| #define PACKAGE "freesci"
-| #define VERSION "0.3.5pre0"
+| #define VERSION "0.3.5pre1"
| #define STDC_HEADERS 1
| #define HAVE_SYS_TYPES_H 1
| #define HAVE_SYS_STAT_H 1
@@ -1036,7 +1036,7 @@
| #define PACKAGE_STRING ""
| #define PACKAGE_BUGREPORT ""
| #define PACKAGE "freesci"
-| #define VERSION "0.3.5pre0"
+| #define VERSION "0.3.5pre1"
| #define STDC_HEADERS 1
| #define HAVE_SYS_TYPES_H 1
| #define HAVE_SYS_STAT_H 1
@@ -1092,7 +1092,7 @@
| #define PACKAGE_STRING ""
| #define PACKAGE_BUGREPORT ""
| #define PACKAGE "freesci"
-| #define VERSION "0.3.5pre0"
+| #define VERSION "0.3.5pre1"
| #define STDC_HEADERS 1
| #define HAVE_SYS_TYPES_H 1
| #define HAVE_SYS_STAT_H 1
@@ -1149,7 +1149,7 @@
| #define PACKAGE_STRING ""
| #define PACKAGE_BUGREPORT ""
| #define PACKAGE "freesci"
-| #define VERSION "0.3.5pre0"
+| #define VERSION "0.3.5pre1"
| #define STDC_HEADERS 1
| #define HAVE_SYS_TYPES_H 1
| #define HAVE_SYS_STAT_H 1
@@ -1212,7 +1212,7 @@
| #define PACKAGE_STRING ""
| #define PACKAGE_BUGREPORT ""
| #define PACKAGE "freesci"
-| #define VERSION "0.3.5pre0"
+| #define VERSION "0.3.5pre1"
| #define STDC_HEADERS 1
| #define HAVE_SYS_TYPES_H 1
| #define HAVE_SYS_STAT_H 1
@@ -1275,7 +1275,7 @@
| #define PACKAGE_STRING ""
| #define PACKAGE_BUGREPORT ""
| #define PACKAGE "freesci"
-| #define VERSION "0.3.5pre0"
+| #define VERSION "0.3.5pre1"
| #define STDC_HEADERS 1
| #define HAVE_SYS_TYPES_H 1
| #define HAVE_SYS_STAT_H 1
@@ -1338,7 +1338,7 @@
| #define PACKAGE_STRING ""
| #define PACKAGE_BUGREPORT ""
| #define PACKAGE "freesci"
-| #define VERSION "0.3.5pre0"
+| #define VERSION "0.3.5pre1"
| #define STDC_HEADERS 1
| #define HAVE_SYS_TYPES_H 1
| #define HAVE_SYS_STAT_H 1
@@ -1401,7 +1401,7 @@
| #define PACKAGE_STRING ""
| #define PACKAGE_BUGREPORT ""
| #define PACKAGE "freesci"
-| #define VERSION "0.3.5pre0"
+| #define VERSION "0.3.5pre1"
| #define STDC_HEADERS 1
| #define HAVE_SYS_TYPES_H 1
| #define HAVE_SYS_STAT_H 1
@@ -1464,7 +1464,7 @@
| #define PACKAGE_STRING ""
| #define PACKAGE_BUGREPORT ""
| #define PACKAGE "freesci"
-| #define VERSION "0.3.5pre0"
+| #define VERSION "0.3.5pre1"
| #define STDC_HEADERS 1
| #define HAVE_SYS_TYPES_H 1
| #define HAVE_SYS_STAT_H 1
@@ -1527,7 +1527,7 @@
| #define PACKAGE_STRING ""
| #define PACKAGE_BUGREPORT ""
| #define PACKAGE "freesci"
-| #define VERSION "0.3.5pre0"
+| #define VERSION "0.3.5pre1"
| #define STDC_HEADERS 1
| #define HAVE_SYS_TYPES_H 1
| #define HAVE_SYS_STAT_H 1
@@ -1590,7 +1590,7 @@
| #define PACKAGE_STRING ""
| #define PACKAGE_BUGREPORT ""
| #define PACKAGE "freesci"
-| #define VERSION "0.3.5pre0"
+| #define VERSION "0.3.5pre1"
| #define STDC_HEADERS 1
| #define HAVE_SYS_TYPES_H 1
| #define HAVE_SYS_STAT_H 1
@@ -1654,7 +1654,7 @@
| #define PACKAGE_STRING ""
| #define PACKAGE_BUGREPORT ""
| #define PACKAGE "freesci"
-| #define VERSION "0.3.5pre0"
+| #define VERSION "0.3.5pre1"
| #define STDC_HEADERS 1
| #define HAVE_SYS_TYPES_H 1
| #define HAVE_SYS_STAT_H 1
@@ -1745,7 +1745,7 @@
| #define PACKAGE_STRING ""
| #define PACKAGE_BUGREPORT ""
| #define PACKAGE "freesci"
-| #define VERSION "0.3.5pre0"
+| #define VERSION "0.3.5pre1"
| #define STDC_HEADERS 1
| #define HAVE_SYS_TYPES_H 1
| #define HAVE_SYS_STAT_H 1
@@ -1804,7 +1804,7 @@
| #define PACKAGE_STRING ""
| #define PACKAGE_BUGREPORT ""
| #define PACKAGE "freesci"
-| #define VERSION "0.3.5pre0"
+| #define VERSION "0.3.5pre1"
| #define STDC_HEADERS 1
| #define HAVE_SYS_TYPES_H 1
| #define HAVE_SYS_STAT_H 1
@@ -1895,7 +1895,7 @@
| #define PACKAGE_STRING ""
| #define PACKAGE_BUGREPORT ""
| #define PACKAGE "freesci"
-| #define VERSION "0.3.5pre0"
+| #define VERSION "0.3.5pre1"
| #define STDC_HEADERS 1
| #define HAVE_SYS_TYPES_H 1
| #define HAVE_SYS_STAT_H 1
@@ -1954,7 +1954,7 @@
| #define PACKAGE_STRING ""
| #define PACKAGE_BUGREPORT ""
| #define PACKAGE "freesci"
-| #define VERSION "0.3.5pre0"
+| #define VERSION "0.3.5pre1"
| #define STDC_HEADERS 1
| #define HAVE_SYS_TYPES_H 1
| #define HAVE_SYS_STAT_H 1
@@ -2045,7 +2045,7 @@
| #define PACKAGE_STRING ""
| #define PACKAGE_BUGREPORT ""
| #define PACKAGE "freesci"
-| #define VERSION "0.3.5pre0"
+| #define VERSION "0.3.5pre1"
| #define STDC_HEADERS 1
| #define HAVE_SYS_TYPES_H 1
| #define HAVE_SYS_STAT_H 1
@@ -2106,7 +2106,7 @@
configure:8178: gcc -E conftest.c
configure:8184: $? = 0
configure:8244: gcc -o conftest -g -O2 conftest.c -lasound -lasound -lm
>&5
-/tmp/ccMfkCFV.o: In function
`main':/home/creichen/work/port/freesci/conftest.c:56: undefined reference to
`noecho'
+/tmp/cccO7xjD.o: In function
`main':/home/creichen/work/port/freesci/conftest.c:56: undefined reference to
`noecho'
collect2: ld returned 1 exit status
configure:8250: $? = 1
configure: failed program was:
@@ -2118,7 +2118,7 @@
| #define PACKAGE_STRING ""
| #define PACKAGE_BUGREPORT ""
| #define PACKAGE "freesci"
-| #define VERSION "0.3.5pre0"
+| #define VERSION "0.3.5pre1"
| #define STDC_HEADERS 1
| #define HAVE_SYS_TYPES_H 1
| #define HAVE_SYS_STAT_H 1
@@ -2276,7 +2276,7 @@
configure:10222: result: yes
configure:10235: checking for XftDisplayInfoGet in -lXft
configure:10265: gcc -o conftest -g -O2 -I/usr/include/freetype2 conftest.c
-lXft -lasound -lasound -lm >&5
-/tmp/ccenJuVU.o: In function
`main':/home/creichen/work/port/freesci/conftest.c:68: undefined reference to
`XftDisplayInfoGet'
+/tmp/ccaDYgMP.o: In function
`main':/home/creichen/work/port/freesci/conftest.c:68: undefined reference to
`XftDisplayInfoGet'
collect2: ld returned 1 exit status
configure:10271: $? = 1
configure: failed program was:
@@ -2288,7 +2288,7 @@
| #define PACKAGE_STRING ""
| #define PACKAGE_BUGREPORT ""
| #define PACKAGE "freesci"
-| #define VERSION "0.3.5pre0"
+| #define VERSION "0.3.5pre1"
| #define STDC_HEADERS 1
| #define HAVE_SYS_TYPES_H 1
| #define HAVE_SYS_STAT_H 1
@@ -2387,7 +2387,7 @@
| #define PACKAGE_STRING ""
| #define PACKAGE_BUGREPORT ""
| #define PACKAGE "freesci"
-| #define VERSION "0.3.5pre0"
+| #define VERSION "0.3.5pre1"
| #define STDC_HEADERS 1
| #define HAVE_SYS_TYPES_H 1
| #define HAVE_SYS_STAT_H 1
@@ -2473,19 +2473,27 @@
configure:10715: test -s conftest
configure:10718: $? = 0
configure:10731: result: yes
-configure:10794: checking for cos in -lm
-configure:10824: gcc -o conftest -g -O2 -I/usr/include/freetype2 conftest.c
-lm -L/usr/X11R6/lib -lasound -lasound -lm -lggi -lgii -lgg -L/usr/lib
-lSDL -lpthread -lXrender -lfontconfig -lXi -lX11 >&5
+configure:10737: checking for XShmAttach in -lXext
+configure:10767: gcc -o conftest -g -O2 -I/usr/include/freetype2 conftest.c
-lXext -L/usr/X11R6/lib -lasound -lasound -lm >&5
+configure:10773: $? = 0
+configure:10776: test -z || test ! -s conftest.err
+configure:10779: $? = 0
+configure:10782: test -s conftest
+configure:10785: $? = 0
+configure:10798: result: yes
+configure:10861: checking for cos in -lm
+configure:10891: gcc -o conftest -g -O2 -I/usr/include/freetype2 conftest.c
-lm -L/usr/X11R6/lib -lasound -lasound -lm -lggi -lgii -lgg -L/usr/lib
-lSDL -lpthread -lXrender -lfontconfig -lXi -lX11 -lXext >&5
conftest.c:65: warning: conflicting types for built-in function 'cos'
-configure:10830: $? = 0
-configure:10833: test -z || test ! -s conftest.err
-configure:10836: $? = 0
-configure:10839: test -s conftest
-configure:10842: $? = 0
-configure:10855: result: yes
-configure:10870: checking for Xm/MwmUtil.h
-configure:10886: gcc -c -g -O2 -I/usr/include/freetype2 conftest.c >&5
+configure:10897: $? = 0
+configure:10900: test -z || test ! -s conftest.err
+configure:10903: $? = 0
+configure:10906: test -s conftest
+configure:10909: $? = 0
+configure:10922: result: yes
+configure:10937: checking for Xm/MwmUtil.h
+configure:10953: gcc -c -g -O2 -I/usr/include/freetype2 conftest.c >&5
conftest.c:60:24: error: Xm/MwmUtil.h: No such file or directory
-configure:10892: $? = 1
+configure:10959: $? = 1
configure: failed program was:
| /* confdefs.h. */
|
@@ -2495,7 +2503,7 @@
| #define PACKAGE_STRING ""
| #define PACKAGE_BUGREPORT ""
| #define PACKAGE "freesci"
-| #define VERSION "0.3.5pre0"
+| #define VERSION "0.3.5pre1"
| #define STDC_HEADERS 1
| #define HAVE_SYS_TYPES_H 1
| #define HAVE_SYS_STAT_H 1
@@ -2547,49 +2555,49 @@
| #include <X11/X.h>
|
| #include <Xm/MwmUtil.h>
-configure:10915: result: no
-configure:10936: checking for flex
-configure:10952: found /usr/bin/flex
-configure:10962: result: flex
-configure:10977: checking for flex
-configure:11003: result: flex
-configure:11016: checking for yywrap in -lfl
-configure:11046: gcc -o conftest -g -O2 -I/usr/include/freetype2 conftest.c
-lfl -L/usr/X11R6/lib -lasound -lasound -lm -lggi -lgii -lgg -L/usr/lib
-lSDL -lpthread -lXrender -lfontconfig -lXi -lX11 >&5
-configure:11052: $? = 0
-configure:11055: test -z || test ! -s conftest.err
-configure:11058: $? = 0
-configure:11061: test -s conftest
-configure:11064: $? = 0
-configure:11077: result: yes
-configure:11154: checking lex output file root
-configure:11165: flex conftest.l
-configure:11168: $? = 0
-configure:11180: result: lex.yy
-configure:11185: checking whether yytext is a pointer
-configure:11201: gcc -o conftest -g -O2 -I/usr/include/freetype2 conftest.c
-L/usr/X11R6/lib -lasound -lasound -lm -lggi -lgii -lgg -L/usr/lib -lSDL
-lpthread -lXrender -lfontconfig -lXi -lX11 -lfl >&5
-configure:11207: $? = 0
-configure:11210: test -z || test ! -s conftest.err
-configure:11213: $? = 0
-configure:11216: test -s conftest
-configure:11219: $? = 0
-configure:11233: result: yes
-configure:11249: checking for bison
-configure:11265: found /usr/bin/bison
-configure:11275: result: bison -y
-configure:11302: checking whether byte ordering is bigendian
-configure:11329: gcc -c -g -O2 -I/usr/include/freetype2 conftest.c >&5
-configure:11335: $? = 0
-configure:11338: test -z || test ! -s conftest.err
-configure:11341: $? = 0
-configure:11344: test -s conftest.o
-configure:11347: $? = 0
-configure:11371: gcc -c -g -O2 -I/usr/include/freetype2 conftest.c >&5
+configure:10982: result: no
+configure:11003: checking for flex
+configure:11019: found /usr/bin/flex
+configure:11029: result: flex
+configure:11044: checking for flex
+configure:11070: result: flex
+configure:11083: checking for yywrap in -lfl
+configure:11113: gcc -o conftest -g -O2 -I/usr/include/freetype2 conftest.c
-lfl -L/usr/X11R6/lib -lasound -lasound -lm -lggi -lgii -lgg -L/usr/lib
-lSDL -lpthread -lXrender -lfontconfig -lXi -lX11 -lXext >&5
+configure:11119: $? = 0
+configure:11122: test -z || test ! -s conftest.err
+configure:11125: $? = 0
+configure:11128: test -s conftest
+configure:11131: $? = 0
+configure:11144: result: yes
+configure:11221: checking lex output file root
+configure:11232: flex conftest.l
+configure:11235: $? = 0
+configure:11247: result: lex.yy
+configure:11252: checking whether yytext is a pointer
+configure:11268: gcc -o conftest -g -O2 -I/usr/include/freetype2 conftest.c
-L/usr/X11R6/lib -lasound -lasound -lm -lggi -lgii -lgg -L/usr/lib -lSDL
-lpthread -lXrender -lfontconfig -lXi -lX11 -lXext -lfl >&5
+configure:11274: $? = 0
+configure:11277: test -z || test ! -s conftest.err
+configure:11280: $? = 0
+configure:11283: test -s conftest
+configure:11286: $? = 0
+configure:11300: result: yes
+configure:11316: checking for bison
+configure:11332: found /usr/bin/bison
+configure:11342: result: bison -y
+configure:11369: checking whether byte ordering is bigendian
+configure:11396: gcc -c -g -O2 -I/usr/include/freetype2 conftest.c >&5
+configure:11402: $? = 0
+configure:11405: test -z || test ! -s conftest.err
+configure:11408: $? = 0
+configure:11411: test -s conftest.o
+configure:11414: $? = 0
+configure:11438: gcc -c -g -O2 -I/usr/include/freetype2 conftest.c >&5
conftest.c: In function 'main':
conftest.c:66: error: 'not' undeclared (first use in this function)
conftest.c:66: error: (Each undeclared identifier is reported only once
conftest.c:66: error: for each function it appears in.)
conftest.c:66: error: syntax error before 'big'
-configure:11377: $? = 1
+configure:11444: $? = 1
configure: failed program was:
| /* confdefs.h. */
|
@@ -2599,7 +2607,7 @@
| #define PACKAGE_STRING ""
| #define PACKAGE_BUGREPORT ""
| #define PACKAGE "freesci"
-| #define VERSION "0.3.5pre0"
+| #define VERSION "0.3.5pre1"
| #define STDC_HEADERS 1
| #define HAVE_SYS_TYPES_H 1
| #define HAVE_SYS_STAT_H 1
@@ -2662,14 +2670,14 @@
| ;
| return 0;
| }
-configure:11510: result: no
-configure:11617: checking if malloc debugging is wanted
-configure:11639: result: no
-configure:11643: checking whether to output debug info at every memory
(de)allocation
-configure:11662: result: no
-configure:11666: checking whether to check memory allocations for NULL
-configure:11685: result: yes
-configure:11813: creating ./config.status
+configure:11577: result: no
+configure:11684: checking if malloc debugging is wanted
+configure:11706: result: no
+configure:11710: checking whether to output debug info at every memory
(de)allocation
+configure:11729: result: no
+configure:11733: checking whether to check memory allocations for NULL
+configure:11752: result: yes
+configure:11880: creating ./config.status
## ---------------------- ##
## Running config.status. ##
@@ -2710,7 +2718,7 @@
config.status:786: creating src/menu/Makefile
config.status:786: creating freesci.spec
config.status:852: creating config.h
-config.status:1216: executing default-1 commands
+config.status:1212: executing default-1 commands
## ---------------- ##
## Cache variables. ##
@@ -2789,6 +2797,7 @@
ac_cv_host_alias=i686-pc-linux-gnu
ac_cv_lib_ICE_IceConnectionNumber=yes
ac_cv_lib_X11_XOpenDisplay=yes
+ac_cv_lib_Xext_XShmAttach=yes
ac_cv_lib_Xft_XftDisplayInfoGet=no
ac_cv_lib_Xi_XGrabDevice=yes
ac_cv_lib_asound_snd_rawmidi_open=yes
@@ -2847,7 +2856,7 @@
LEXLIB='-lfl'
LEX_OUTPUT_ROOT='lex.yy'
LIBOBJS=''
-LIBS='-L/usr/X11R6/lib -lasound -lasound -lm -lggi -lgii -lgg -L/usr/lib
-lSDL -lpthread -lXrender -lfontconfig -lXi -lX11 '
+LIBS='-L/usr/X11R6/lib -lasound -lasound -lm -lggi -lgii -lgg -L/usr/lib
-lSDL -lpthread -lXrender -lfontconfig -lXi -lX11 -lXext '
LIB_M='-lm'
LTLIBOBJS=''
MAKEINFO='makeinfo'
@@ -2863,17 +2872,17 @@
PACKAGE_VERSION=''
PATH_SEPARATOR=':'
RANLIB='ranlib'
-RPM_VERSION='0.3.5pre0'
+RPM_VERSION='0.3.5pre1'
SCIV_LDFLAGS=''
SDL_CFLAGS='-g -O2 -I/usr/include/SDL -D_REENTRANT'
SDL_CONFIG='/usr/bin/sdl-config'
SDL_LIBS='-L/usr/lib -lSDL -lpthread'
SET_MAKE=''
SHELL='/bin/sh'
-VERSION='0.3.5pre0'
+VERSION='0.3.5pre1'
X_CFLAGS=' -I/usr/X11R6/include'
X_EXTRA_LIBS=''
-X_LIBS=' -lXrender -lfontconfig -lXi -lX11'
+X_LIBS=' -lXrender -lfontconfig -lXi -lX11 -lXext'
X_PRE_LIBS=' -lSM -lICE'
YACC='bison -y'
ac_ct_CC='gcc'
@@ -2935,7 +2944,6 @@
## confdefs.h. ##
## ----------- ##
-#define FORCE_CONSOLE 1
#define HAVE_ALSA 1
#define HAVE_ALSA_ASOUNDLIB_H 1
#define HAVE_CURSES 1
@@ -2989,8 +2997,7 @@
#define SIZEOF_LONG 4
#define SIZEOF_SHORT 2
#define STDC_HEADERS 1
-#define VERSION "0.3.5pre0"
-#define WANT_CONSOLE 1
+#define VERSION "0.3.5pre1"
#define WITH_PIC_SCALING 1
#define YYTEXT_POINTER 1
Modified: freesci/trunk/configure.in
===================================================================
--- freesci/trunk/configure.in 2006-02-05 01:13:43 UTC (rev 1517)
+++ freesci/trunk/configure.in 2006-02-05 03:06:53 UTC (rev 1518)
@@ -4,7 +4,7 @@
AC_CANONICAL_TARGET([])
AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(freesci, 0.3.5pre0)
+AM_INIT_AUTOMAKE(freesci, 0.3.5pre1)
AC_PROG_CC
#AC_LIBTOOL_DLOPEN
@@ -187,6 +187,7 @@
fi
AC_CHECK_LIB(Xi, XGrabDevice, [X_LIBS="$X_LIBS -lXi"])
AC_CHECK_LIB(X11, XOpenDisplay, [X_LIBS="$X_LIBS -lX11"])
+ AC_CHECK_LIB(Xext, XShmAttach, [X_LIBS="$X_LIBS -lXext"])
fsci_xlib_driver="yes"
fi
Modified: freesci/trunk/freesci.spec
===================================================================
--- freesci/trunk/freesci.spec 2006-02-05 01:13:43 UTC (rev 1517)
+++ freesci/trunk/freesci.spec 2006-02-05 03:06:53 UTC (rev 1518)
@@ -1,6 +1,6 @@
Summary: A portable interpreter for SCI games
Name: freesci
-Version: 0.3.5pre0
+Version: 0.3.5pre1
Release: 1
Group: Games/Adventure
Copyright: GPL
Modified: freesci/trunk/src/include/games.h
===================================================================
--- freesci/trunk/src/include/games.h 2006-02-05 01:13:43 UTC (rev 1517)
+++ freesci/trunk/src/include/games.h 2006-02-05 03:06:53 UTC (rev 1518)
@@ -62,6 +62,21 @@
{ 0x28543FDF, SCI_VERSION(0,000,453), "Astro Chicken"},
{ 0x31F46F7D, SCI_VERSION(0,000,453), "Space Quest III v1.0V int"},
+ { 0x3B15678B, SCI_VERSION(0,000,631), "The Colonel's Bequest
v1.000.046-3.5"},
+ { 0x0E042F46, SCI_VERSION(0,000,530), "Hoyle 1 v1.000.113-3.5"},
+ { 0x1EACB959, SCI_VERSION(0,000,566), "HQ v1.000-5.25"},
+ { 0x2BEAF5E7, SCI_VERSION(0,000,566), "HQ v1.001-5.25"},
+ { 0x63626D3E, SCI_VERSION(0,000,668), "Iceman v1.023-5.25"},
+ { 0xDA5E7B7D, SCI_VERSION(0,000,409), "KQ4 v1.003.006-3.5"},
+ { 0x376A5472, SCI_VERSION(0,000,502), "KQ4 v1.006.003-5.25"},
+ { 0xFEAB629D, SCI_VERSION(0,000,343), "LSL2 v1.000.011-3.5"},
+ { 0x40BEC726, SCI_VERSION(0,000,409), "LSL2 v1.002.000-3.5"},
+ { 0x06D737B5, SCI_VERSION(0,000,572), "LSL3 v1.003-3.5"},
+ { 0x484587DD, SCI_VERSION(0,000,572), "LSL3 v1.021-5.25"},
+ { 0x364B40B2, SCI_VERSION(0,000,395), "PQ2 v1.001.000-5.25"},
+ { 0x664B4123, SCI_VERSION(0,000,409), "PQ2 v1.001.006-3.5"},
+ { 0x379F4582, SCI_VERSION(0,000,453), "SQ3 v1.0V-5.25"},
+ { 0x04B0B081, SCI_VERSION(0,000,294), "xmascard v1.04"},
/* Undetermined Amiga versions: */
/* { 0x8AE5F854, SCI_VERSION(), "ARTHUR" }, */
/* { 0x9FB7015B, SCI_VERSION(), "CB1" }, */
Modified: freesci/trunk/src/main.c
===================================================================
--- freesci/trunk/src/main.c 2006-02-05 01:13:43 UTC (rev 1517)
+++ freesci/trunk/src/main.c 2006-02-05 03:06:53 UTC (rev 1518)
@@ -919,17 +919,23 @@
conf_nr = read_config(game_name, &confs, &conf_entries, &version);
if (game_name) {
+ if (!active_conf) {
+ fprintf(stderr, "No configuration file
(~/.freesci/config); you can't use game name shortcuts.\n"
+ "Either create ~/.freesci/config (cf. README),
or use \"-d <dirname>\"\n");
+ exit(1);
+ } else {
- active_conf = confs + conf_nr;
+ active_conf = confs + conf_nr;
- if (!cl_options.gamedir)
- if (chdir(active_conf->resource_dir)) {
- if (conf_nr)
- fprintf(stderr,"Error entering '%s' to
load resource data\n", active_conf->resource_dir);
- else
- fprintf(stderr,"Game '%s' isn't
registered in your config file.\n", game_name);
- exit(1);
- }
+ if (!cl_options.gamedir)
+ if (chdir(active_conf->resource_dir)) {
+ if (conf_nr)
+ fprintf(stderr,"Error entering
'%s' to load resource data\n", active_conf->resource_dir);
+ else
+ fprintf(stderr,"Game '%s' isn't
registered in your config file.\n", game_name);
+ exit(1);
+ }
+ }
}
if (cl_options.gamedir)
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [freesci-develop] r1518 - in freesci/trunk: . src src/include,
jameson <=