[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[freesci-develop] r1517 - in freesci/trunk: . src/gfx src/gfx/resource
|
From: |
jameson |
|
Subject: |
[freesci-develop] r1517 - in freesci/trunk: . src/gfx src/gfx/resource |
|
Date: |
Sun, 05 Feb 2006 02:14:02 +0100 |
Author: jameson
Date: 2006-02-05 02:13:43 +0100 (Sun, 05 Feb 2006)
New Revision: 1517
Modified:
freesci/trunk/ChangeLog
freesci/trunk/config.h
freesci/trunk/config.log
freesci/trunk/configure.in
freesci/trunk/freesci.spec
freesci/trunk/src/gfx/Makefile.am
freesci/trunk/src/gfx/gfx_test.c
freesci/trunk/src/gfx/resmgr.c
freesci/trunk/src/gfx/resource/sci_pic_0.c
Log:
* Resource-specific palette options: When adding pics, use the added pic's
resource ID rather than the original pic's ID for determining modifiers
-- Christoph
Modified: freesci/trunk/ChangeLog
===================================================================
--- freesci/trunk/ChangeLog 2006-02-04 20:31:44 UTC (rev 1516)
+++ freesci/trunk/ChangeLog 2006-02-05 01:13:43 UTC (rev 1517)
@@ -1,3 +1,9 @@
+2006-02-05 Christoph Reichenbach <address@hidden>
+
+ * 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
+
2006-02-04 Christoph Reichenbach <address@hidden>
* src/engine/kgraphics.c: Fixed 14 priority zone bug according to
Modified: freesci/trunk/config.h
===================================================================
--- freesci/trunk/config.h 2006-02-04 20:31:44 UTC (rev 1516)
+++ freesci/trunk/config.h 2006-02-05 01:13:43 UTC (rev 1517)
@@ -3,7 +3,7 @@
/* Define to 1 if you want to enforce usage of on-screen console on all gfx
drivers. */
-/* #undef FORCE_CONSOLE */
+#define FORCE_CONSOLE 1
/* 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.4c-devel"
+#define VERSION "0.3.5pre0"
/* Define to 1 if you want to build with on-screen console support. */
-/* #undef WANT_CONSOLE */
+#define WANT_CONSOLE 1
/* Define if using the dmalloc debugging malloc package */
/* #undef WITH_DMALLOC */
Modified: freesci/trunk/config.log
===================================================================
--- freesci/trunk/config.log 2006-02-04 20:31:44 UTC (rev 1516)
+++ freesci/trunk/config.log 2006-02-05 01:13:43 UTC (rev 1517)
@@ -4,7 +4,7 @@
It was created by configure, which was
generated by GNU Autoconf 2.59. Invocation command line was
- $ ./configure
+ $ ./configure --with-forced-console
## --------- ##
## Platform. ##
@@ -85,7 +85,7 @@
gcc: '-V' option must have argument
configure:2055: $? = 1
configure:2078: checking for C compiler default output file name
-configure:2081: gcc -O2 -g conftest.c >&5
+configure:2081: gcc conftest.c >&5
configure:2084: $? = 0
configure:2130: result: a.out
configure:2135: checking whether the C compiler works
@@ -95,15 +95,15 @@
configure:2168: checking whether we are cross compiling
configure:2170: result: no
configure:2173: checking for suffix of executables
-configure:2175: gcc -o conftest -O2 -g conftest.c >&5
+configure:2175: gcc -o conftest conftest.c >&5
configure:2178: $? = 0
configure:2203: result:
configure:2209: checking for suffix of object files
-configure:2230: gcc -c -O2 -g conftest.c >&5
+configure:2230: gcc -c conftest.c >&5
configure:2233: $? = 0
configure:2255: result: o
configure:2259: checking whether we are using the GNU C compiler
-configure:2283: gcc -c -O2 -g conftest.c >&5
+configure:2283: gcc -c conftest.c >&5
configure:2289: $? = 0
configure:2292: test -z || test ! -s conftest.err
configure:2295: $? = 0
@@ -119,14 +119,14 @@
configure:2359: $? = 0
configure:2370: result: yes
configure:2387: checking for gcc option to accept ANSI C
-configure:2457: gcc -c -O2 -g conftest.c >&5
+configure:2457: gcc -c -g -O2 conftest.c >&5
configure:2463: $? = 0
configure:2466: test -z || test ! -s conftest.err
configure:2469: $? = 0
configure:2472: test -s conftest.o
configure:2475: $? = 0
configure:2493: result: none needed
-configure:2511: gcc -c -O2 -g conftest.c >&5
+configure:2511: gcc -c -g -O2 conftest.c >&5
conftest.c:2: error: syntax error before 'me'
configure:2517: $? = 1
configure: failed program was:
@@ -151,7 +151,7 @@
| #define PACKAGE_STRING ""
| #define PACKAGE_BUGREPORT ""
| #define PACKAGE "freesci"
-| #define VERSION "0.3.4c-devel"
+| #define VERSION "0.3.5pre0"
| /* end confdefs.h. */
| #include <ac_nonexistent.h>
configure:2854: result: gcc -E
@@ -169,19 +169,19 @@
| #define PACKAGE_STRING ""
| #define PACKAGE_BUGREPORT ""
| #define PACKAGE "freesci"
-| #define VERSION "0.3.4c-devel"
+| #define VERSION "0.3.5pre0"
| /* end confdefs.h. */
| #include <ac_nonexistent.h>
configure:2966: checking for egrep
configure:2976: result: grep -E
configure:2981: checking for ANSI C header files
-configure:3006: gcc -c -O2 -g conftest.c >&5
+configure:3006: gcc -c -g -O2 conftest.c >&5
configure:3012: $? = 0
configure:3015: test -z || test ! -s conftest.err
configure:3018: $? = 0
configure:3021: test -s conftest.o
configure:3024: $? = 0
-configure:3113: gcc -o conftest -O2 -g conftest.c >&5
+configure:3113: gcc -o conftest -g -O2 conftest.c >&5
conftest.c: In function 'main':
conftest.c:28: warning: incompatible implicit declaration of built-in function
'exit'
configure:3116: $? = 0
@@ -189,7 +189,7 @@
configure:3121: $? = 0
configure:3136: result: yes
configure:3160: checking for sys/types.h
-configure:3176: gcc -c -O2 -g conftest.c >&5
+configure:3176: gcc -c -g -O2 conftest.c >&5
configure:3182: $? = 0
configure:3185: test -z || test ! -s conftest.err
configure:3188: $? = 0
@@ -197,7 +197,7 @@
configure:3194: $? = 0
configure:3205: result: yes
configure:3160: checking for sys/stat.h
-configure:3176: gcc -c -O2 -g conftest.c >&5
+configure:3176: gcc -c -g -O2 conftest.c >&5
configure:3182: $? = 0
configure:3185: test -z || test ! -s conftest.err
configure:3188: $? = 0
@@ -205,7 +205,7 @@
configure:3194: $? = 0
configure:3205: result: yes
configure:3160: checking for stdlib.h
-configure:3176: gcc -c -O2 -g conftest.c >&5
+configure:3176: gcc -c -g -O2 conftest.c >&5
configure:3182: $? = 0
configure:3185: test -z || test ! -s conftest.err
configure:3188: $? = 0
@@ -213,7 +213,7 @@
configure:3194: $? = 0
configure:3205: result: yes
configure:3160: checking for string.h
-configure:3176: gcc -c -O2 -g conftest.c >&5
+configure:3176: gcc -c -g -O2 conftest.c >&5
configure:3182: $? = 0
configure:3185: test -z || test ! -s conftest.err
configure:3188: $? = 0
@@ -221,7 +221,7 @@
configure:3194: $? = 0
configure:3205: result: yes
configure:3160: checking for memory.h
-configure:3176: gcc -c -O2 -g conftest.c >&5
+configure:3176: gcc -c -g -O2 conftest.c >&5
configure:3182: $? = 0
configure:3185: test -z || test ! -s conftest.err
configure:3188: $? = 0
@@ -229,7 +229,7 @@
configure:3194: $? = 0
configure:3205: result: yes
configure:3160: checking for strings.h
-configure:3176: gcc -c -O2 -g conftest.c >&5
+configure:3176: gcc -c -g -O2 conftest.c >&5
configure:3182: $? = 0
configure:3185: test -z || test ! -s conftest.err
configure:3188: $? = 0
@@ -237,7 +237,7 @@
configure:3194: $? = 0
configure:3205: result: yes
configure:3160: checking for inttypes.h
-configure:3176: gcc -c -O2 -g conftest.c >&5
+configure:3176: gcc -c -g -O2 conftest.c >&5
configure:3182: $? = 0
configure:3185: test -z || test ! -s conftest.err
configure:3188: $? = 0
@@ -245,7 +245,7 @@
configure:3194: $? = 0
configure:3205: result: yes
configure:3160: checking for stdint.h
-configure:3176: gcc -c -O2 -g conftest.c >&5
+configure:3176: gcc -c -g -O2 conftest.c >&5
configure:3182: $? = 0
configure:3185: test -z || test ! -s conftest.err
configure:3188: $? = 0
@@ -253,7 +253,7 @@
configure:3194: $? = 0
configure:3205: result: yes
configure:3160: checking for unistd.h
-configure:3176: gcc -c -O2 -g conftest.c >&5
+configure:3176: gcc -c -g -O2 conftest.c >&5
configure:3182: $? = 0
configure:3185: test -z || test ! -s conftest.err
configure:3188: $? = 0
@@ -261,7 +261,7 @@
configure:3194: $? = 0
configure:3205: result: yes
configure:3231: checking limits.h usability
-configure:3243: gcc -c -O2 -g conftest.c >&5
+configure:3243: gcc -c -g -O2 conftest.c >&5
configure:3249: $? = 0
configure:3252: test -z || test ! -s conftest.err
configure:3255: $? = 0
@@ -275,7 +275,7 @@
configure:3346: checking for limits.h
configure:3353: result: yes
configure:3380: checking sys/uio.h usability
-configure:3392: gcc -c -O2 -g conftest.c >&5
+configure:3392: gcc -c -g -O2 conftest.c >&5
configure:3398: $? = 0
configure:3401: test -z || test ! -s conftest.err
configure:3404: $? = 0
@@ -289,7 +289,7 @@
configure:3495: checking for sys/uio.h
configure:3502: result: yes
configure:3529: checking sys/soundcard.h usability
-configure:3541: gcc -c -O2 -g conftest.c >&5
+configure:3541: gcc -c -g -O2 conftest.c >&5
configure:3547: $? = 0
configure:3550: test -z || test ! -s conftest.err
configure:3553: $? = 0
@@ -303,7 +303,7 @@
configure:3644: checking for sys/soundcard.h
configure:3651: result: yes
configure:3678: checking sys/time.h usability
-configure:3690: gcc -c -O2 -g conftest.c >&5
+configure:3690: gcc -c -g -O2 conftest.c >&5
configure:3696: $? = 0
configure:3699: test -z || test ! -s conftest.err
configure:3702: $? = 0
@@ -317,7 +317,7 @@
configure:3793: checking for sys/time.h
configure:3800: result: yes
configure:3827: checking obstack.h usability
-configure:3839: gcc -c -O2 -g conftest.c >&5
+configure:3839: gcc -c -g -O2 conftest.c >&5
configure:3845: $? = 0
configure:3848: test -z || test ! -s conftest.err
configure:3851: $? = 0
@@ -331,7 +331,7 @@
configure:3942: checking for obstack.h
configure:3949: result: yes
configure:3976: checking dirent.h usability
-configure:3988: gcc -c -O2 -g conftest.c >&5
+configure:3988: gcc -c -g -O2 conftest.c >&5
configure:3994: $? = 0
configure:3997: test -z || test ! -s conftest.err
configure:4000: $? = 0
@@ -347,7 +347,7 @@
configure:4116: checking for unistd.h
configure:4121: result: yes
configure:4274: checking fnmatch.h usability
-configure:4286: gcc -c -O2 -g conftest.c >&5
+configure:4286: gcc -c -g -O2 conftest.c >&5
configure:4292: $? = 0
configure:4295: test -z || test ! -s conftest.err
configure:4298: $? = 0
@@ -361,7 +361,7 @@
configure:4389: checking for fnmatch.h
configure:4396: result: yes
configure:4424: checking getopt.h usability
-configure:4436: gcc -c -O2 -g conftest.c >&5
+configure:4436: gcc -c -g -O2 conftest.c >&5
configure:4442: $? = 0
configure:4445: test -z || test ! -s conftest.err
configure:4448: $? = 0
@@ -375,7 +375,7 @@
configure:4539: checking for getopt.h
configure:4546: result: yes
configure:4424: checking setjmp.h usability
-configure:4436: gcc -c -O2 -g conftest.c >&5
+configure:4436: gcc -c -g -O2 conftest.c >&5
configure:4442: $? = 0
configure:4445: test -z || test ! -s conftest.err
configure:4448: $? = 0
@@ -389,7 +389,7 @@
configure:4539: checking for setjmp.h
configure:4546: result: yes
configure:4573: checking fcntl.h usability
-configure:4585: gcc -c -O2 -g conftest.c >&5
+configure:4585: gcc -c -g -O2 conftest.c >&5
configure:4591: $? = 0
configure:4594: test -z || test ! -s conftest.err
configure:4597: $? = 0
@@ -403,7 +403,7 @@
configure:4688: checking for fcntl.h
configure:4695: result: yes
configure:4708: checking for inline
-configure:4729: gcc -c -O2 -g conftest.c >&5
+configure:4729: gcc -c -g -O2 conftest.c >&5
configure:4735: $? = 0
configure:4738: test -z || test ! -s conftest.err
configure:4741: $? = 0
@@ -411,7 +411,7 @@
configure:4747: $? = 0
configure:4759: result: inline
configure:4780: checking for short
-configure:4804: gcc -c -O2 -g conftest.c >&5
+configure:4804: gcc -c -g -O2 conftest.c >&5
configure:4810: $? = 0
configure:4813: test -z || test ! -s conftest.err
configure:4816: $? = 0
@@ -419,13 +419,13 @@
configure:4822: $? = 0
configure:4833: result: yes
configure:4836: checking size of short
-configure:5148: gcc -o conftest -O2 -g conftest.c >&5
+configure:5148: gcc -o conftest -g -O2 conftest.c >&5
configure:5151: $? = 0
configure:5153: ./conftest
configure:5156: $? = 0
configure:5179: result: 2
configure:5186: checking for int
-configure:5210: gcc -c -O2 -g conftest.c >&5
+configure:5210: gcc -c -g -O2 conftest.c >&5
configure:5216: $? = 0
configure:5219: test -z || test ! -s conftest.err
configure:5222: $? = 0
@@ -433,13 +433,13 @@
configure:5228: $? = 0
configure:5239: result: yes
configure:5242: checking size of int
-configure:5554: gcc -o conftest -O2 -g conftest.c >&5
+configure:5554: gcc -o conftest -g -O2 conftest.c >&5
configure:5557: $? = 0
configure:5559: ./conftest
configure:5562: $? = 0
configure:5585: result: 4
configure:5592: checking for long
-configure:5616: gcc -c -O2 -g conftest.c >&5
+configure:5616: gcc -c -g -O2 conftest.c >&5
configure:5622: $? = 0
configure:5625: test -z || test ! -s conftest.err
configure:5628: $? = 0
@@ -447,13 +447,13 @@
configure:5634: $? = 0
configure:5645: result: yes
configure:5648: checking size of long
-configure:5960: gcc -o conftest -O2 -g conftest.c >&5
+configure:5960: gcc -o conftest -g -O2 conftest.c >&5
configure:5963: $? = 0
configure:5965: ./conftest
configure:5968: $? = 0
configure:5991: result: 4
configure:6168: checking for memchr
-configure:6225: gcc -o conftest -O2 -g conftest.c >&5
+configure:6225: gcc -o conftest -g -O2 conftest.c >&5
configure:6231: $? = 0
configure:6234: test -z || test ! -s conftest.err
configure:6237: $? = 0
@@ -461,7 +461,7 @@
configure:6243: $? = 0
configure:6255: result: yes
configure:6168: checking for fnmatch
-configure:6225: gcc -o conftest -O2 -g conftest.c >&5
+configure:6225: gcc -o conftest -g -O2 conftest.c >&5
configure:6231: $? = 0
configure:6234: test -z || test ! -s conftest.err
configure:6237: $? = 0
@@ -469,7 +469,7 @@
configure:6243: $? = 0
configure:6255: result: yes
configure:6168: checking for pipe
-configure:6225: gcc -o conftest -O2 -g conftest.c >&5
+configure:6225: gcc -o conftest -g -O2 conftest.c >&5
configure:6231: $? = 0
configure:6234: test -z || test ! -s conftest.err
configure:6237: $? = 0
@@ -477,7 +477,7 @@
configure:6243: $? = 0
configure:6255: result: yes
configure:6168: checking for socketpair
-configure:6225: gcc -o conftest -O2 -g conftest.c >&5
+configure:6225: gcc -o conftest -g -O2 conftest.c >&5
configure:6231: $? = 0
configure:6234: test -z || test ! -s conftest.err
configure:6237: $? = 0
@@ -485,7 +485,7 @@
configure:6243: $? = 0
configure:6255: result: yes
configure:6168: checking for fork
-configure:6225: gcc -o conftest -O2 -g conftest.c >&5
+configure:6225: gcc -o conftest -g -O2 conftest.c >&5
conftest.c:63: warning: conflicting types for built-in function 'fork'
configure:6231: $? = 0
configure:6234: test -z || test ! -s conftest.err
@@ -494,7 +494,7 @@
configure:6243: $? = 0
configure:6255: result: yes
configure:6168: checking for sched_yield
-configure:6225: gcc -o conftest -O2 -g conftest.c >&5
+configure:6225: gcc -o conftest -g -O2 conftest.c >&5
configure:6231: $? = 0
configure:6234: test -z || test ! -s conftest.err
configure:6237: $? = 0
@@ -502,9 +502,9 @@
configure:6243: $? = 0
configure:6255: result: yes
configure:6168: checking for memf
-configure:6225: gcc -o conftest -O2 -g conftest.c >&5
-/tmp/ccG4Kefw.o: In function
`main':/home/creichen/work/port/freesci/conftest.c:80: undefined reference to
`memf'
-/tmp/ccG4Kefw.o:(.data+0x0): undefined reference to `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'
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.4c-devel"
+| #define VERSION "0.3.5pre0"
| #define STDC_HEADERS 1
| #define HAVE_SYS_TYPES_H 1
| #define HAVE_SYS_STAT_H 1
@@ -594,9 +594,9 @@
| }
configure:6255: result: no
configure:6168: checking for rob
-configure:6225: gcc -o conftest -O2 -g conftest.c >&5
-/tmp/ccm64hSE.o: In function
`main':/home/creichen/work/port/freesci/conftest.c:80: undefined reference to
`rob'
-/tmp/ccm64hSE.o:(.data+0x0): undefined reference to `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'
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.4c-devel"
+| #define VERSION "0.3.5pre0"
| #define STDC_HEADERS 1
| #define HAVE_SYS_TYPES_H 1
| #define HAVE_SYS_STAT_H 1
@@ -686,7 +686,7 @@
| }
configure:6255: result: no
configure:6168: checking for ffs
-configure:6225: gcc -o conftest -O2 -g conftest.c >&5
+configure:6225: gcc -o conftest -g -O2 conftest.c >&5
conftest.c:65: warning: conflicting types for built-in function 'ffs'
configure:6231: $? = 0
configure:6234: test -z || test ! -s conftest.err
@@ -695,7 +695,7 @@
configure:6243: $? = 0
configure:6255: result: yes
configure:6168: checking for getopt_long
-configure:6225: gcc -o conftest -O2 -g conftest.c >&5
+configure:6225: gcc -o conftest -g -O2 conftest.c >&5
configure:6231: $? = 0
configure:6234: test -z || test ! -s conftest.err
configure:6237: $? = 0
@@ -703,7 +703,7 @@
configure:6243: $? = 0
configure:6255: result: yes
configure:6168: checking for isblank
-configure:6225: gcc -o conftest -O2 -g conftest.c >&5
+configure:6225: gcc -o conftest -g -O2 conftest.c >&5
conftest.c:67: warning: conflicting types for built-in function 'isblank'
configure:6231: $? = 0
configure:6234: test -z || test ! -s conftest.err
@@ -712,7 +712,7 @@
configure:6243: $? = 0
configure:6255: result: yes
configure:6168: checking for usleep
-configure:6225: gcc -o conftest -O2 -g conftest.c >&5
+configure:6225: gcc -o conftest -g -O2 conftest.c >&5
configure:6231: $? = 0
configure:6234: test -z || test ! -s conftest.err
configure:6237: $? = 0
@@ -724,7 +724,7 @@
configure:6305: checking for ALSA LDFLAGS
configure:6314: result: -lasound -lm
configure:6318: checking for libasound headers version >= 0.5.0
-configure:6386: gcc -c -O2 -g conftest.c >&5
+configure:6386: gcc -c -g -O2 conftest.c >&5
In file included from conftest.c:46:
/usr/include/sys/asoundlib.h:1:2: warning: #warning This header is deprecated,
use <alsa/asoundlib.h> instead.
configure:6392: $? = 0
@@ -734,7 +734,7 @@
configure:6404: $? = 0
configure:6406: result: found.
configure:6427: checking for snd_rawmidi_open in -lasound
-configure:6457: gcc -o conftest -O2 -g conftest.c -lasound -lasound -lm
>&5
+configure:6457: gcc -o conftest -g -O2 conftest.c -lasound -lasound -lm
>&5
configure:6463: $? = 0
configure:6466: test -z || test ! -s conftest.err
configure:6469: $? = 0
@@ -742,7 +742,7 @@
configure:6475: $? = 0
configure:6488: result: yes
configure:6538: checking sys/asoundlib.h usability
-configure:6550: gcc -c -O2 -g conftest.c >&5
+configure:6550: gcc -c -g -O2 conftest.c >&5
In file included from conftest.c:81:
/usr/include/sys/asoundlib.h:1:2: warning: #warning This header is deprecated,
use <alsa/asoundlib.h> instead.
configure:6556: $? = 0
@@ -760,7 +760,7 @@
configure:6653: checking for sys/asoundlib.h
configure:6660: result: yes
configure:6538: checking alsa/asoundlib.h usability
-configure:6550: gcc -c -O2 -g conftest.c >&5
+configure:6550: gcc -c -g -O2 conftest.c >&5
configure:6556: $? = 0
configure:6559: test -z || test ! -s conftest.err
configure:6562: $? = 0
@@ -778,8 +778,8 @@
configure:6697: checking for ggi
configure:6763: gcc -E conftest.c
configure:6769: $? = 0
-configure:6828: gcc -o conftest -O2 -g -lgii -lgg conftest.c -lasound
-lasound -lm >&5
-/tmp/ccqkL39M.o: In function
`main':/home/creichen/work/port/freesci/conftest.c:54: undefined reference to
`ggiInit'
+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'
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.4c-devel"
+| #define VERSION "0.3.5pre0"
| #define STDC_HEADERS 1
| #define HAVE_SYS_TYPES_H 1
| #define HAVE_SYS_STAT_H 1
@@ -840,7 +840,7 @@
| ;
| return 0;
| }
-configure:6828: gcc -o conftest -O2 -g -lggi -lgii -lgg conftest.c
-lasound -lasound -lm >&5
+configure:6828: gcc -o conftest -g -O2 -lggi -lgii -lgg conftest.c
-lasound -lasound -lm >&5
configure:6834: $? = 0
configure:6837: test -z || test ! -s conftest.err
configure:6840: $? = 0
@@ -848,7 +848,7 @@
configure:6846: $? = 0
configure:6877: result: found
configure:6898: checking for POSIX thread library
-configure:6946: gcc -o conftest -O2 -g conftest.c -lasound -lasound -lm
>&5
+configure:6946: gcc -o conftest -g -O2 conftest.c -lasound -lasound -lm
>&5
configure:6952: $? = 0
configure:6955: test -z || test ! -s conftest.err
configure:6958: $? = 0
@@ -868,7 +868,7 @@
| #define PACKAGE_STRING ""
| #define PACKAGE_BUGREPORT ""
| #define PACKAGE "freesci"
-| #define VERSION "0.3.4c-devel"
+| #define VERSION "0.3.5pre0"
| #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.4c-devel"
+| #define VERSION "0.3.5pre0"
| #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.4c-devel"
+| #define VERSION "0.3.5pre0"
| #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.4c-devel"
+| #define VERSION "0.3.5pre0"
| #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.4c-devel"
+| #define VERSION "0.3.5pre0"
| #define STDC_HEADERS 1
| #define HAVE_SYS_TYPES_H 1
| #define HAVE_SYS_STAT_H 1
@@ -1136,7 +1136,7 @@
| /* end confdefs.h. */
|
| #include <directfb.h>
-configure:7138: gcc -o conftest -O2 -g no conftest.c -lasound -lasound
-lm >&5
+configure:7138: gcc -o conftest -g -O2 no conftest.c -lasound -lasound
-lm >&5
gcc: no: No such file or directory
conftest.c:51:22: error: directfb.h: No such file or directory
configure:7144: $? = 1
@@ -1149,7 +1149,7 @@
| #define PACKAGE_STRING ""
| #define PACKAGE_BUGREPORT ""
| #define PACKAGE "freesci"
-| #define VERSION "0.3.4c-devel"
+| #define VERSION "0.3.5pre0"
| #define STDC_HEADERS 1
| #define HAVE_SYS_TYPES_H 1
| #define HAVE_SYS_STAT_H 1
@@ -1199,7 +1199,7 @@
| ;
| return 0;
| }
-configure:7138: gcc -o conftest -O2 -g -ldirectfb no conftest.c -lasound
-lasound -lm >&5
+configure:7138: gcc -o conftest -g -O2 -ldirectfb no conftest.c -lasound
-lasound -lm >&5
gcc: no: No such file or directory
conftest.c:51:22: error: directfb.h: No such file or directory
configure:7144: $? = 1
@@ -1212,7 +1212,7 @@
| #define PACKAGE_STRING ""
| #define PACKAGE_BUGREPORT ""
| #define PACKAGE "freesci"
-| #define VERSION "0.3.4c-devel"
+| #define VERSION "0.3.5pre0"
| #define STDC_HEADERS 1
| #define HAVE_SYS_TYPES_H 1
| #define HAVE_SYS_STAT_H 1
@@ -1262,7 +1262,7 @@
| ;
| return 0;
| }
-configure:7138: gcc -o conftest -O2 -g -L/usr/lib no conftest.c -lasound
-lasound -lm >&5
+configure:7138: gcc -o conftest -g -O2 -L/usr/lib no conftest.c -lasound
-lasound -lm >&5
gcc: no: No such file or directory
conftest.c:51:22: error: directfb.h: No such file or directory
configure:7144: $? = 1
@@ -1275,7 +1275,7 @@
| #define PACKAGE_STRING ""
| #define PACKAGE_BUGREPORT ""
| #define PACKAGE "freesci"
-| #define VERSION "0.3.4c-devel"
+| #define VERSION "0.3.5pre0"
| #define STDC_HEADERS 1
| #define HAVE_SYS_TYPES_H 1
| #define HAVE_SYS_STAT_H 1
@@ -1325,7 +1325,7 @@
| ;
| return 0;
| }
-configure:7138: gcc -o conftest -O2 -g -L/usr/lib -ldirectfb no conftest.c
-lasound -lasound -lm >&5
+configure:7138: gcc -o conftest -g -O2 -L/usr/lib -ldirectfb no conftest.c
-lasound -lasound -lm >&5
gcc: no: No such file or directory
conftest.c:51:22: error: directfb.h: No such file or directory
configure:7144: $? = 1
@@ -1338,7 +1338,7 @@
| #define PACKAGE_STRING ""
| #define PACKAGE_BUGREPORT ""
| #define PACKAGE "freesci"
-| #define VERSION "0.3.4c-devel"
+| #define VERSION "0.3.5pre0"
| #define STDC_HEADERS 1
| #define HAVE_SYS_TYPES_H 1
| #define HAVE_SYS_STAT_H 1
@@ -1388,7 +1388,7 @@
| ;
| return 0;
| }
-configure:7138: gcc -o conftest -O2 -g -L/usr/local/lib no conftest.c
-lasound -lasound -lm >&5
+configure:7138: gcc -o conftest -g -O2 -L/usr/local/lib no conftest.c
-lasound -lasound -lm >&5
gcc: no: No such file or directory
conftest.c:51:22: error: directfb.h: No such file or directory
configure:7144: $? = 1
@@ -1401,7 +1401,7 @@
| #define PACKAGE_STRING ""
| #define PACKAGE_BUGREPORT ""
| #define PACKAGE "freesci"
-| #define VERSION "0.3.4c-devel"
+| #define VERSION "0.3.5pre0"
| #define STDC_HEADERS 1
| #define HAVE_SYS_TYPES_H 1
| #define HAVE_SYS_STAT_H 1
@@ -1451,7 +1451,7 @@
| ;
| return 0;
| }
-configure:7138: gcc -o conftest -O2 -g -L/usr/local/lib -ldirectfb no
conftest.c -lasound -lasound -lm >&5
+configure:7138: gcc -o conftest -g -O2 -L/usr/local/lib -ldirectfb no
conftest.c -lasound -lasound -lm >&5
gcc: no: No such file or directory
conftest.c:51:22: error: directfb.h: No such file or directory
configure:7144: $? = 1
@@ -1464,7 +1464,7 @@
| #define PACKAGE_STRING ""
| #define PACKAGE_BUGREPORT ""
| #define PACKAGE "freesci"
-| #define VERSION "0.3.4c-devel"
+| #define VERSION "0.3.5pre0"
| #define STDC_HEADERS 1
| #define HAVE_SYS_TYPES_H 1
| #define HAVE_SYS_STAT_H 1
@@ -1514,7 +1514,7 @@
| ;
| return 0;
| }
-configure:7138: gcc -o conftest -O2 -g -L/usr/local/directfb/lib no
conftest.c -lasound -lasound -lm >&5
+configure:7138: gcc -o conftest -g -O2 -L/usr/local/directfb/lib no
conftest.c -lasound -lasound -lm >&5
gcc: no: No such file or directory
conftest.c:51:22: error: directfb.h: No such file or directory
configure:7144: $? = 1
@@ -1527,7 +1527,7 @@
| #define PACKAGE_STRING ""
| #define PACKAGE_BUGREPORT ""
| #define PACKAGE "freesci"
-| #define VERSION "0.3.4c-devel"
+| #define VERSION "0.3.5pre0"
| #define STDC_HEADERS 1
| #define HAVE_SYS_TYPES_H 1
| #define HAVE_SYS_STAT_H 1
@@ -1577,7 +1577,7 @@
| ;
| return 0;
| }
-configure:7138: gcc -o conftest -O2 -g -L/usr/local/directfb/lib -ldirectfb no
conftest.c -lasound -lasound -lm >&5
+configure:7138: gcc -o conftest -g -O2 -L/usr/local/directfb/lib -ldirectfb no
conftest.c -lasound -lasound -lm >&5
gcc: no: No such file or directory
conftest.c:51:22: error: directfb.h: No such file or directory
configure:7144: $? = 1
@@ -1590,7 +1590,7 @@
| #define PACKAGE_STRING ""
| #define PACKAGE_BUGREPORT ""
| #define PACKAGE "freesci"
-| #define VERSION "0.3.4c-devel"
+| #define VERSION "0.3.5pre0"
| #define STDC_HEADERS 1
| #define HAVE_SYS_TYPES_H 1
| #define HAVE_SYS_STAT_H 1
@@ -1642,7 +1642,7 @@
| }
configure:7182: result: failed
configure:7295: checking dmedia/midi.h usability
-configure:7307: gcc -c -O2 -g conftest.c >&5
+configure:7307: gcc -c -g -O2 conftest.c >&5
conftest.c:85:25: error: dmedia/midi.h: No such file or directory
configure:7313: $? = 1
configure: failed program was:
@@ -1654,7 +1654,7 @@
| #define PACKAGE_STRING ""
| #define PACKAGE_BUGREPORT ""
| #define PACKAGE "freesci"
-| #define VERSION "0.3.4c-devel"
+| #define VERSION "0.3.5pre0"
| #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.4c-devel"
+| #define VERSION "0.3.5pre0"
| #define STDC_HEADERS 1
| #define HAVE_SYS_TYPES_H 1
| #define HAVE_SYS_STAT_H 1
@@ -1792,7 +1792,7 @@
configure:7410: checking for dmedia/midi.h
configure:7417: result: no
configure:7453: checking dmedia/audio.h usability
-configure:7465: gcc -c -O2 -g conftest.c >&5
+configure:7465: gcc -c -g -O2 conftest.c >&5
conftest.c:85:26: error: dmedia/audio.h: No such file or directory
configure:7471: $? = 1
configure: failed program was:
@@ -1804,7 +1804,7 @@
| #define PACKAGE_STRING ""
| #define PACKAGE_BUGREPORT ""
| #define PACKAGE "freesci"
-| #define VERSION "0.3.4c-devel"
+| #define VERSION "0.3.5pre0"
| #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.4c-devel"
+| #define VERSION "0.3.5pre0"
| #define STDC_HEADERS 1
| #define HAVE_SYS_TYPES_H 1
| #define HAVE_SYS_STAT_H 1
@@ -1942,7 +1942,7 @@
configure:7568: checking for dmedia/audio.h
configure:7575: result: no
configure:7611: checking fluidsynth.h usability
-configure:7623: gcc -c -O2 -g conftest.c >&5
+configure:7623: gcc -c -g -O2 conftest.c >&5
conftest.c:85:24: error: fluidsynth.h: No such file or directory
configure:7629: $? = 1
configure: failed program was:
@@ -1954,7 +1954,7 @@
| #define PACKAGE_STRING ""
| #define PACKAGE_BUGREPORT ""
| #define PACKAGE "freesci"
-| #define VERSION "0.3.4c-devel"
+| #define VERSION "0.3.5pre0"
| #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.4c-devel"
+| #define VERSION "0.3.5pre0"
| #define STDC_HEADERS 1
| #define HAVE_SYS_TYPES_H 1
| #define HAVE_SYS_STAT_H 1
@@ -2095,7 +2095,7 @@
configure:7815: found /usr/bin/sdl-config
configure:7828: result: /usr/bin/sdl-config
configure:7836: checking for SDL - version >= 1.1.8
-configure:7927: gcc -o conftest -O2 -g -I/usr/include/SDL -D_REENTRANT
conftest.c -lasound -lasound -lm -L/usr/lib -lSDL -lpthread >&5
+configure:7927: gcc -o conftest -g -O2 -I/usr/include/SDL -D_REENTRANT
conftest.c -lasound -lasound -lm -L/usr/lib -lSDL -lpthread >&5
configure:7930: $? = 0
configure:7932: ./conftest
configure:7935: $? = 0
@@ -2105,8 +2105,8 @@
configure:8125: $? = 0
configure:8178: gcc -E conftest.c
configure:8184: $? = 0
-configure:8244: gcc -o conftest -O2 -g conftest.c -lasound -lasound -lm
>&5
-/tmp/ccyB70D5.o: In function
`main':/home/creichen/work/port/freesci/conftest.c:56: undefined reference to
`noecho'
+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'
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.4c-devel"
+| #define VERSION "0.3.5pre0"
| #define STDC_HEADERS 1
| #define HAVE_SYS_TYPES_H 1
| #define HAVE_SYS_STAT_H 1
@@ -2169,7 +2169,7 @@
| ;
| return 0;
| }
-configure:8244: gcc -o conftest -O2 -g -lncurses conftest.c -lasound
-lasound -lm >&5
+configure:8244: gcc -o conftest -g -O2 -lncurses conftest.c -lasound
-lasound -lm >&5
configure:8250: $? = 0
configure:8253: test -z || test ! -s conftest.err
configure:8256: $? = 0
@@ -2177,7 +2177,7 @@
configure:8262: $? = 0
configure:8295: result: found -lncurses
configure:8324: checking readline/readline.h usability
-configure:8336: gcc -c -O2 -g conftest.c >&5
+configure:8336: gcc -c -g -O2 conftest.c >&5
configure:8342: $? = 0
configure:8345: test -z || test ! -s conftest.err
configure:8348: $? = 0
@@ -2191,7 +2191,7 @@
configure:8439: checking for readline/readline.h
configure:8446: result: yes
configure:8476: checking readline/history.h usability
-configure:8488: gcc -c -O2 -g conftest.c >&5
+configure:8488: gcc -c -g -O2 conftest.c >&5
configure:8494: $? = 0
configure:8497: test -z || test ! -s conftest.err
configure:8500: $? = 0
@@ -2206,14 +2206,14 @@
configure:8598: result: yes
configure:8616: checking for X
configure:8850: result: libraries /usr/X11R6/lib, headers /usr/X11R6/include
-configure:9021: gcc -o conftest -O2 -g conftest.c -lasound -lasound -lm
-L/usr/X11R6/lib -lX11 >&5
+configure:9021: gcc -o conftest -g -O2 conftest.c -lasound -lasound -lm
-L/usr/X11R6/lib -lX11 >&5
configure:9027: $? = 0
configure:9030: test -z || test ! -s conftest.err
configure:9033: $? = 0
configure:9036: test -s conftest
configure:9039: $? = 0
configure:9195: checking for gethostbyname
-configure:9252: gcc -o conftest -O2 -g conftest.c -lasound -lasound -lm >&5
+configure:9252: gcc -o conftest -g -O2 conftest.c -lasound -lasound -lm >&5
configure:9258: $? = 0
configure:9261: test -z || test ! -s conftest.err
configure:9264: $? = 0
@@ -2221,7 +2221,7 @@
configure:9270: $? = 0
configure:9282: result: yes
configure:9431: checking for connect
-configure:9488: gcc -o conftest -O2 -g conftest.c -lasound -lasound -lm >&5
+configure:9488: gcc -o conftest -g -O2 conftest.c -lasound -lasound -lm >&5
configure:9494: $? = 0
configure:9497: test -z || test ! -s conftest.err
configure:9500: $? = 0
@@ -2229,7 +2229,7 @@
configure:9506: $? = 0
configure:9518: result: yes
configure:9592: checking for remove
-configure:9649: gcc -o conftest -O2 -g conftest.c -lasound -lasound -lm >&5
+configure:9649: gcc -o conftest -g -O2 conftest.c -lasound -lasound -lm >&5
configure:9655: $? = 0
configure:9658: test -z || test ! -s conftest.err
configure:9661: $? = 0
@@ -2237,7 +2237,7 @@
configure:9667: $? = 0
configure:9679: result: yes
configure:9753: checking for shmat
-configure:9810: gcc -o conftest -O2 -g conftest.c -lasound -lasound -lm >&5
+configure:9810: gcc -o conftest -g -O2 conftest.c -lasound -lasound -lm >&5
configure:9816: $? = 0
configure:9819: test -z || test ! -s conftest.err
configure:9822: $? = 0
@@ -2245,7 +2245,7 @@
configure:9828: $? = 0
configure:9840: result: yes
configure:9923: checking for IceConnectionNumber in -lICE
-configure:9953: gcc -o conftest -O2 -g -L/usr/X11R6/lib conftest.c -lICE
-lasound -lasound -lm >&5
+configure:9953: gcc -o conftest -g -O2 -L/usr/X11R6/lib conftest.c -lICE
-lasound -lasound -lm >&5
configure:9959: $? = 0
configure:9962: test -z || test ! -s conftest.err
configure:9965: $? = 0
@@ -2253,7 +2253,7 @@
configure:9971: $? = 0
configure:9984: result: yes
configure:9997: checking for the X11 MIT-SHM extension
-configure:10034: gcc -c -O2 -g conftest.c >&5
+configure:10034: gcc -c -g -O2 conftest.c >&5
configure:10040: $? = 0
configure:10043: test -z || test ! -s conftest.err
configure:10046: $? = 0
@@ -2261,7 +2261,7 @@
configure:10052: $? = 0
configure:10055: result: found.
configure:10100: checking X11/Xft/Xft.h usability
-configure:10112: gcc -c -O2 -g -I/usr/include/freetype2 conftest.c >&5
+configure:10112: gcc -c -g -O2 -I/usr/include/freetype2 conftest.c >&5
configure:10118: $? = 0
configure:10121: test -z || test ! -s conftest.err
configure:10124: $? = 0
@@ -2275,8 +2275,8 @@
configure:10215: checking for X11/Xft/Xft.h
configure:10222: result: yes
configure:10235: checking for XftDisplayInfoGet in -lXft
-configure:10265: gcc -o conftest -O2 -g -I/usr/include/freetype2 conftest.c
-lXft -lasound -lasound -lm >&5
-/tmp/ccWpbrbq.o: In function
`main':/home/creichen/work/port/freesci/conftest.c:68: undefined reference to
`XftDisplayInfoGet'
+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'
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.4c-devel"
+| #define VERSION "0.3.5pre0"
| #define STDC_HEADERS 1
| #define HAVE_SYS_TYPES_H 1
| #define HAVE_SYS_STAT_H 1
@@ -2353,7 +2353,7 @@
| }
configure:10296: result: no
configure:10316: checking X11/extensions/Xrender.h usability
-configure:10328: gcc -c -O2 -g -I/usr/include/freetype2 conftest.c >&5
+configure:10328: gcc -c -g -O2 -I/usr/include/freetype2 conftest.c >&5
configure:10334: $? = 0
configure:10337: test -z || test ! -s conftest.err
configure:10340: $? = 0
@@ -2367,7 +2367,7 @@
configure:10431: checking for X11/extensions/Xrender.h
configure:10438: result: yes
configure:10451: checking for FcInit in -lfontconfig
-configure:10481: gcc -o conftest -O2 -g -I/usr/include/freetype2 conftest.c
-lfontconfig -lasound -lasound -lm >&5
+configure:10481: gcc -o conftest -g -O2 -I/usr/include/freetype2 conftest.c
-lfontconfig -lasound -lasound -lm >&5
configure:10487: $? = 0
configure:10490: test -z || test ! -s conftest.err
configure:10493: $? = 0
@@ -2375,7 +2375,7 @@
configure:10499: $? = 0
configure:10512: result: yes
configure:10520: checking for Alpha hardware and gcc or ccc style __asm__
-configure:10550: gcc -c -O2 -g -I/usr/include/freetype2 conftest.c >&5
+configure:10550: gcc -c -g -O2 -I/usr/include/freetype2 conftest.c >&5
conftest.c:69:2: error: #error "Not on Alpha"
configure:10556: $? = 1
configure: failed program was:
@@ -2387,7 +2387,7 @@
| #define PACKAGE_STRING ""
| #define PACKAGE_BUGREPORT ""
| #define PACKAGE "freesci"
-| #define VERSION "0.3.4c-devel"
+| #define VERSION "0.3.5pre0"
| #define STDC_HEADERS 1
| #define HAVE_SYS_TYPES_H 1
| #define HAVE_SYS_STAT_H 1
@@ -2458,7 +2458,7 @@
| }
configure:10585: result: not present.
configure:10603: checking for XGrabDevice in -lXi
-configure:10633: gcc -o conftest -O2 -g -I/usr/include/freetype2 conftest.c
-lXi -L/usr/X11R6/lib -lasound -lasound -lm >&5
+configure:10633: gcc -o conftest -g -O2 -I/usr/include/freetype2 conftest.c
-lXi -L/usr/X11R6/lib -lasound -lasound -lm >&5
configure:10639: $? = 0
configure:10642: test -z || test ! -s conftest.err
configure:10645: $? = 0
@@ -2466,7 +2466,7 @@
configure:10651: $? = 0
configure:10664: result: yes
configure:10670: checking for XOpenDisplay in -lX11
-configure:10700: gcc -o conftest -O2 -g -I/usr/include/freetype2 conftest.c
-lX11 -L/usr/X11R6/lib -lasound -lasound -lm >&5
+configure:10700: gcc -o conftest -g -O2 -I/usr/include/freetype2 conftest.c
-lX11 -L/usr/X11R6/lib -lasound -lasound -lm >&5
configure:10706: $? = 0
configure:10709: test -z || test ! -s conftest.err
configure:10712: $? = 0
@@ -2474,7 +2474,7 @@
configure:10718: $? = 0
configure:10731: result: yes
configure:10794: checking for cos in -lm
-configure:10824: gcc -o conftest -O2 -g -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: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
conftest.c:65: warning: conflicting types for built-in function 'cos'
configure:10830: $? = 0
configure:10833: test -z || test ! -s conftest.err
@@ -2483,7 +2483,7 @@
configure:10842: $? = 0
configure:10855: result: yes
configure:10870: checking for Xm/MwmUtil.h
-configure:10886: gcc -c -O2 -g -I/usr/include/freetype2 conftest.c >&5
+configure:10886: 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: failed program was:
@@ -2495,7 +2495,7 @@
| #define PACKAGE_STRING ""
| #define PACKAGE_BUGREPORT ""
| #define PACKAGE "freesci"
-| #define VERSION "0.3.4c-devel"
+| #define VERSION "0.3.5pre0"
| #define STDC_HEADERS 1
| #define HAVE_SYS_TYPES_H 1
| #define HAVE_SYS_STAT_H 1
@@ -2554,7 +2554,7 @@
configure:10977: checking for flex
configure:11003: result: flex
configure:11016: checking for yywrap in -lfl
-configure:11046: gcc -o conftest -O2 -g -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: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
@@ -2566,7 +2566,7 @@
configure:11168: $? = 0
configure:11180: result: lex.yy
configure:11185: checking whether yytext is a pointer
-configure:11201: gcc -o conftest -O2 -g -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: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
@@ -2577,13 +2577,13 @@
configure:11265: found /usr/bin/bison
configure:11275: result: bison -y
configure:11302: checking whether byte ordering is bigendian
-configure:11329: gcc -c -O2 -g -I/usr/include/freetype2 conftest.c >&5
+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 -O2 -g -I/usr/include/freetype2 conftest.c >&5
+configure:11371: 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
@@ -2599,7 +2599,7 @@
| #define PACKAGE_STRING ""
| #define PACKAGE_BUGREPORT ""
| #define PACKAGE "freesci"
-| #define VERSION "0.3.4c-devel"
+| #define VERSION "0.3.5pre0"
| #define STDC_HEADERS 1
| #define HAVE_SYS_TYPES_H 1
| #define HAVE_SYS_STAT_H 1
@@ -2710,7 +2710,7 @@
config.status:786: creating src/menu/Makefile
config.status:786: creating freesci.spec
config.status:852: creating config.h
-config.status:1212: executing default-1 commands
+config.status:1216: executing default-1 commands
## ---------------- ##
## Cache variables. ##
@@ -2723,8 +2723,8 @@
ac_cv_c_inline=inline
ac_cv_env_CC_set=
ac_cv_env_CC_value=
-ac_cv_env_CFLAGS_set=set
-ac_cv_env_CFLAGS_value='-O2 -g'
+ac_cv_env_CFLAGS_set=
+ac_cv_env_CFLAGS_value=
ac_cv_env_CPPFLAGS_set=
ac_cv_env_CPPFLAGS_value=
ac_cv_env_CPP_set=
@@ -2829,7 +2829,7 @@
AUTOHEADER='autoheader'
AUTOMAKE='automake-1.4'
CC='gcc'
-CFLAGS='-O2 -g'
+CFLAGS='-g -O2'
CFSML_FLAGS=''
CPP='gcc -E'
CPPFLAGS=' -I/usr/include/freetype2'
@@ -2863,14 +2863,14 @@
PACKAGE_VERSION=''
PATH_SEPARATOR=':'
RANLIB='ranlib'
-RPM_VERSION='0.3.4c_devel'
+RPM_VERSION='0.3.5pre0'
SCIV_LDFLAGS=''
-SDL_CFLAGS='-O2 -g -I/usr/include/SDL -D_REENTRANT'
+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.4c-devel'
+VERSION='0.3.5pre0'
X_CFLAGS=' -I/usr/X11R6/include'
X_EXTRA_LIBS=''
X_LIBS=' -lXrender -lfontconfig -lXi -lX11'
@@ -2935,6 +2935,7 @@
## confdefs.h. ##
## ----------- ##
+#define FORCE_CONSOLE 1
#define HAVE_ALSA 1
#define HAVE_ALSA_ASOUNDLIB_H 1
#define HAVE_CURSES 1
@@ -2988,44 +2989,9 @@
#define SIZEOF_LONG 4
#define SIZEOF_SHORT 2
#define STDC_HEADERS 1
-#define VERSION "0.3.4c-devel"
+#define VERSION "0.3.5pre0"
+#define WANT_CONSOLE 1
#define WITH_PIC_SCALING 1
#define YYTEXT_POINTER 1
configure: exit 0
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by config.status, which was
-generated by GNU Autoconf 2.59. Invocation command line was
-
- CONFIG_FILES = src/include/Makefile
- CONFIG_HEADERS =
- CONFIG_LINKS =
- CONFIG_COMMANDS =
- $ ./config.status
-
-on maya
-
-config.status:786: creating src/include/Makefile
-config.status:1212: executing default-1 commands
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by config.status, which was
-generated by GNU Autoconf 2.59. Invocation command line was
-
- CONFIG_FILES = src/gfx/Makefile
- CONFIG_HEADERS =
- CONFIG_LINKS =
- CONFIG_COMMANDS =
- $ ./config.status
-
-on maya
-
-config.status:786: creating src/gfx/Makefile
-config.status:1212: executing default-1 commands
Modified: freesci/trunk/configure.in
===================================================================
--- freesci/trunk/configure.in 2006-02-04 20:31:44 UTC (rev 1516)
+++ freesci/trunk/configure.in 2006-02-05 01:13:43 UTC (rev 1517)
@@ -4,7 +4,7 @@
AC_CANONICAL_TARGET([])
AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(freesci, 0.3.4c-devel)
+AM_INIT_AUTOMAKE(freesci, 0.3.5pre0)
AC_PROG_CC
#AC_LIBTOOL_DLOPEN
Modified: freesci/trunk/freesci.spec
===================================================================
--- freesci/trunk/freesci.spec 2006-02-04 20:31:44 UTC (rev 1516)
+++ freesci/trunk/freesci.spec 2006-02-05 01:13:43 UTC (rev 1517)
@@ -1,6 +1,6 @@
Summary: A portable interpreter for SCI games
Name: freesci
-Version: 0.3.4c_devel
+Version: 0.3.5pre0
Release: 1
Group: Games/Adventure
Copyright: GPL
Modified: freesci/trunk/src/gfx/Makefile.am
===================================================================
--- freesci/trunk/src/gfx/Makefile.am 2006-02-04 20:31:44 UTC (rev 1516)
+++ freesci/trunk/src/gfx/Makefile.am 2006-02-05 01:13:43 UTC (rev 1517)
@@ -11,7 +11,9 @@
font-5x8.c font-6x10.c gfx_res_options.c
check_PROGRAMS = gfx_test
-gfx_test_LDADD = libscigraphics.a drivers/libscidrivers.a @X_LIBS@
@ac_glx_libraries@ @ac_ggi_libraries@ @ac_readline@ @ac_curses_libraries@
@ac_png_libraries@ -lm @SDL_LIBS@
+gfx_test_LDADD = libscigraphics.a drivers/libscidrivers.a \
+ @X_LIBS@ @ac_glx_libraries@ @ac_ggi_libraries@ @ac_readline@ \
+ @ac_curses_libraries@ @ac_png_libraries@ -lm @SDL_LIBS@
gfx_test_SOURCES = gfx_test.c
alpha_mvi_crossblit_32.o:
Modified: freesci/trunk/src/gfx/gfx_test.c
===================================================================
--- freesci/trunk/src/gfx/gfx_test.c 2006-02-04 20:31:44 UTC (rev 1516)
+++ freesci/trunk/src/gfx/gfx_test.c 2006-02-05 01:13:43 UTC (rev 1517)
@@ -44,11 +44,24 @@
#include <gfx_tools.h>
#include <gfx_operations.h>
-int
-sci0_palette;
+int sci0_palette;
+
+gfx_pixmap_color_t gfx_sci0_image_colors[1][16];
+
+gfx_pixmap_color_t *
+gfxr_interpreter_get_static_palette(gfx_resstate_t *state, int version, int
*colors_nr, void *internal)
+{
+ return NULL;
+}
+
+
+void sci_sched_yield()
+{
+}
+
int
-sciprintf(char *fmt, ...)
+sciprintf(const char *fmt, ...)
{
va_list argp;
va_start(argp, fmt);
Modified: freesci/trunk/src/gfx/resmgr.c
===================================================================
--- freesci/trunk/src/gfx/resmgr.c 2006-02-04 20:31:44 UTC (rev 1516)
+++ freesci/trunk/src/gfx/resmgr.c 2006-02-05 01:13:43 UTC (rev 1517)
@@ -411,6 +411,33 @@
}
+static void
+set_pic_id(gfx_resource_t *res, int id)
+{
+ if (res->scaled_data.pic) {
+ gfxr_pic_t *pic = res->scaled_data.pic;
+ pic->control_map->ID = id;
+ pic->priority_map->ID = id;
+ pic->visual_map->ID = id;
+ }
+
+ if (res->unscaled_data.pic) {
+ gfxr_pic_t *pic = res->unscaled_data.pic;
+ pic->control_map->ID = id;
+ pic->priority_map->ID = id;
+ pic->visual_map->ID = id;
+ }
+}
+
+static int
+get_pic_id(gfx_resource_t *res)
+{
+ if (res->scaled_data.pic)
+ return res->scaled_data.pic->visual_map->ID;
+ else
+ return res->unscaled_data.pic->visual_map->ID;
+}
+
gfxr_pic_t *
gfxr_add_to_pic(gfx_resstate_t *state, int old_nr, int new_nr, int maps, int
flags,
int old_default_palette, int default_palette, int scaled)
@@ -458,9 +485,14 @@
res->mode = MODE_INVALID; /* Invalidate */
- pic = gfxr_pic_xlate_common(res, maps, scaled, 1/*force*/,
state->driver->mode,
- state->options->pic_xlate_filter, 1,
- state->options);
+ {
+ int old_ID = get_pic_id(res);
+ set_pic_id(res, GFXR_RES_ID(restype, new_nr)); /* To ensure
that our graphical translation optoins work properly */
+ pic = gfxr_pic_xlate_common(res, maps, scaled, 1/*force*/,
state->driver->mode,
+ state->options->pic_xlate_filter, 1,
+ state->options);
+ set_pic_id(res, old_ID);
+ }
if (state->options->pic0_unscaled) /* Scale priority map again, if
needed */
res->scaled_data.pic->priority_map =
gfx_pixmap_scale_index_data(res->scaled_data.pic->priority_map,
state->driver->mode);
Modified: freesci/trunk/src/gfx/resource/sci_pic_0.c
===================================================================
--- freesci/trunk/src/gfx/resource/sci_pic_0.c 2006-02-04 20:31:44 UTC (rev
1516)
+++ freesci/trunk/src/gfx/resource/sci_pic_0.c 2006-02-05 01:13:43 UTC (rev
1517)
@@ -37,8 +37,6 @@
#define GFXR_PIC0_PALETTE_SIZE 40
#define GFXR_PIC0_NUM_PALETTES 4
-#define INTERCOL(a, b) ((int) sqrt((((3.3 * (a))*(a)) + ((1.7 * (b))*(b))) /
5.0))
-/* Macro for color interpolation */
#define SCI_PIC0_MAX_FILL 30 /* Number of times to fill before yielding to
scheduler */
@@ -47,6 +45,8 @@
int sci0_palette = 0;
+#define INTERCOL(a, b) ((int) sqrt((((3.3 * (a))*(a)) + ((1.7 * (b))*(b))) /
5.0))
+/* Macro for color interpolation */
/* Default color maps */
gfx_pixmap_color_t
gfx_sci0_image_colors[SCI0_MAX_PALETTE+1][GFX_SCI0_IMAGE_COLORS_NR] = {
{{GFX_COLOR_SYSTEM, 0x00, 0x00, 0x00}, {GFX_COLOR_SYSTEM, 0x00, 0x00,
0xaa},
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [freesci-develop] r1517 - in freesci/trunk: . src/gfx src/gfx/resource,
jameson <=