Mercurial > sdl-ios-xcode
annotate build-scripts/makedep.sh @ 4223:63fd67e17705 SDL-1.2
Fixed bug #727
Lorenzo Desole 2009-04-19 07:36:10 PDT
I am one of the developers of a multimedia application (My Media System MMS),
which uses SDL.
MMS is normally running in fullscreen mode but it switches it off before
launching external applications (mplayer, xine, etc.).
The problem with fullscreen is that when the latter is switched off either via
SDL_WM_ToggleFullScreen() or SDL_SetVideoMode(), SDL compares the current
screen sizes with the ones saved when the video system was initted, and if they
don't match, it calls XF86VidModeSwitchToMode() to switch to the old modeline.
This makes it impossible for external programs and for MMS itself to use RandR
to change the screen size, because next time fullscreen mode is turned off, it
bombs out with the following error:
X Error of failed request: BadValue (integer parameter out of range for
operation)
Major opcode of failed request: 136 (XFree86-VidModeExtension)
Minor opcode of failed request: 10 (XF86VidModeSwitchToMode)
[...]
Obviously this happens only if the new screen resolution is smaller than the
original one and XF86VidModeSwitchToMode() can't succeed.
I couldn't find any way to inform SDL that the screen resolution it uses as
reference is no longer valid.
This can be fixed by adding "save_mode(this)" to
./src/video/x11/SDL_x11modes.c, API X11_EnterFullScreen(_THIS), like this:
int X11_EnterFullScreen(_THIS)
{
int okay;
+ save_mode(this);
I can't rule out possible side effects, but I don't see any.
While I admit this is a minor issue for the general users, it is a major
showstopper for our program where the ability to change screen resolution and
refresh rate according to the movie being played, is very important.
Thanks in advance.
author | Sam Lantinga <slouken@libsdl.org> |
---|---|
date | Mon, 21 Sep 2009 11:14:36 +0000 |
parents | 5e6f2972f963 |
children | 93994f65c74c d2517c0de52b |
rev | line source |
---|---|
1361
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
1 #!/bin/sh |
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
2 # |
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
3 # Generate dependencies from a list of source files |
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
4 |
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
5 # Check to make sure our environment variables are set |
1634
14f302c5b32c
Don't hardcode the output directory
Sam Lantinga <slouken@libsdl.org>
parents:
1521
diff
changeset
|
6 if test x"$INCLUDE" = x -o x"$SOURCES" = x -o x"$output" = x; then |
14f302c5b32c
Don't hardcode the output directory
Sam Lantinga <slouken@libsdl.org>
parents:
1521
diff
changeset
|
7 echo "SOURCES, INCLUDE, and output needs to be set" |
1361
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
8 exit 1 |
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
9 fi |
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
10 cache_prefix=".#$$" |
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
11 |
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
12 generate_var() |
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
13 { |
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
14 echo $1 | sed -e 's|^.*/||' -e 's|\.|_|g' |
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
15 } |
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
16 |
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
17 search_deps() |
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
18 { |
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
19 base=`echo $1 | sed 's|/[^/]*$||'` |
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
20 grep '#include "' <$1 | sed -e 's|.*"\([^"]*\)".*|\1|' | \ |
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
21 while read file |
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
22 do cache=${cache_prefix}_`generate_var $file` |
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
23 if test -f $cache; then |
1391
7dc446173e37
Blargle-fnargle dependencies and build rules
Sam Lantinga <slouken@libsdl.org>
parents:
1388
diff
changeset
|
24 : # We already ahve this cached |
7dc446173e37
Blargle-fnargle dependencies and build rules
Sam Lantinga <slouken@libsdl.org>
parents:
1388
diff
changeset
|
25 else |
7dc446173e37
Blargle-fnargle dependencies and build rules
Sam Lantinga <slouken@libsdl.org>
parents:
1388
diff
changeset
|
26 : >$cache |
7dc446173e37
Blargle-fnargle dependencies and build rules
Sam Lantinga <slouken@libsdl.org>
parents:
1388
diff
changeset
|
27 for path in $base `echo $INCLUDE | sed 's|-I||g'` |
7dc446173e37
Blargle-fnargle dependencies and build rules
Sam Lantinga <slouken@libsdl.org>
parents:
1388
diff
changeset
|
28 do dep="$path/$file" |
7dc446173e37
Blargle-fnargle dependencies and build rules
Sam Lantinga <slouken@libsdl.org>
parents:
1388
diff
changeset
|
29 if test -f "$dep"; then |
7dc446173e37
Blargle-fnargle dependencies and build rules
Sam Lantinga <slouken@libsdl.org>
parents:
1388
diff
changeset
|
30 echo " $dep \\" >>$cache |
7dc446173e37
Blargle-fnargle dependencies and build rules
Sam Lantinga <slouken@libsdl.org>
parents:
1388
diff
changeset
|
31 search_deps $dep >>$cache |
7dc446173e37
Blargle-fnargle dependencies and build rules
Sam Lantinga <slouken@libsdl.org>
parents:
1388
diff
changeset
|
32 break |
7dc446173e37
Blargle-fnargle dependencies and build rules
Sam Lantinga <slouken@libsdl.org>
parents:
1388
diff
changeset
|
33 fi |
7dc446173e37
Blargle-fnargle dependencies and build rules
Sam Lantinga <slouken@libsdl.org>
parents:
1388
diff
changeset
|
34 done |
1361
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
35 fi |
1391
7dc446173e37
Blargle-fnargle dependencies and build rules
Sam Lantinga <slouken@libsdl.org>
parents:
1388
diff
changeset
|
36 cat $cache |
1361
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
37 done |
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
38 } |
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
39 |
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
40 :>${output}.new |
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
41 for src in $SOURCES |
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
42 do echo "Generating dependencies for $src" |
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
43 ext=`echo $src | sed 's|.*\.\(.*\)|\1|'` |
4078
5e6f2972f963
Added support for building version.rc in Windows build.
Sam Lantinga <slouken@libsdl.org>
parents:
1634
diff
changeset
|
44 if test x"$ext" = x"rc"; then |
5e6f2972f963
Added support for building version.rc in Windows build.
Sam Lantinga <slouken@libsdl.org>
parents:
1634
diff
changeset
|
45 obj=`echo $src | sed "s|^.*/\([^ ]*\)\..*|\1.o|g"` |
5e6f2972f963
Added support for building version.rc in Windows build.
Sam Lantinga <slouken@libsdl.org>
parents:
1634
diff
changeset
|
46 else |
5e6f2972f963
Added support for building version.rc in Windows build.
Sam Lantinga <slouken@libsdl.org>
parents:
1634
diff
changeset
|
47 obj=`echo $src | sed "s|^.*/\([^ ]*\)\..*|\1.lo|g"` |
5e6f2972f963
Added support for building version.rc in Windows build.
Sam Lantinga <slouken@libsdl.org>
parents:
1634
diff
changeset
|
48 fi |
1634
14f302c5b32c
Don't hardcode the output directory
Sam Lantinga <slouken@libsdl.org>
parents:
1521
diff
changeset
|
49 echo "\$(objects)/$obj: $src \\" >>${output}.new |
1388
9a9b87172b4b
Fixed build dependencies... ugh
Sam Lantinga <slouken@libsdl.org>
parents:
1361
diff
changeset
|
50 search_deps $src | sort | uniq >>${output}.new |
1361
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
51 case $ext in |
1416 | 52 c) cat >>${output}.new <<__EOF__ |
53 | |
1521
9b9212e4810c
CFLAGS are separate from EXTRA_CFLAGS
Sam Lantinga <slouken@libsdl.org>
parents:
1493
diff
changeset
|
54 \$(LIBTOOL) --mode=compile \$(CC) \$(CFLAGS) \$(EXTRA_CFLAGS) -c $src -o \$@ |
1416 | 55 |
56 __EOF__ | |
57 ;; | |
58 cc) cat >>${output}.new <<__EOF__ | |
59 | |
1521
9b9212e4810c
CFLAGS are separate from EXTRA_CFLAGS
Sam Lantinga <slouken@libsdl.org>
parents:
1493
diff
changeset
|
60 \$(LIBTOOL) --mode=compile \$(CC) \$(CFLAGS) \$(EXTRA_CFLAGS) -c $src -o \$@ |
1416 | 61 |
62 __EOF__ | |
63 ;; | |
64 m) cat >>${output}.new <<__EOF__ | |
65 | |
1521
9b9212e4810c
CFLAGS are separate from EXTRA_CFLAGS
Sam Lantinga <slouken@libsdl.org>
parents:
1493
diff
changeset
|
66 \$(LIBTOOL) --mode=compile \$(CC) \$(CFLAGS) \$(EXTRA_CFLAGS) -c $src -o \$@ |
1416 | 67 |
68 __EOF__ | |
69 ;; | |
70 asm) cat >>${output}.new <<__EOF__ | |
71 | |
1417
24fbbedd2ad6
*** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
1416
diff
changeset
|
72 \$(LIBTOOL) --tag=CC --mode=compile \$(auxdir)/strip_fPIC.sh \$(NASM) $src -o \$@ |
1416 | 73 |
74 __EOF__ | |
75 ;; | |
1459
1e8582152d44
Date: Wed, 01 Mar 2006 10:14:31 +0000
Sam Lantinga <slouken@libsdl.org>
parents:
1417
diff
changeset
|
76 S) cat >>${output}.new <<__EOF__ |
1e8582152d44
Date: Wed, 01 Mar 2006 10:14:31 +0000
Sam Lantinga <slouken@libsdl.org>
parents:
1417
diff
changeset
|
77 |
1521
9b9212e4810c
CFLAGS are separate from EXTRA_CFLAGS
Sam Lantinga <slouken@libsdl.org>
parents:
1493
diff
changeset
|
78 \$(LIBTOOL) --mode=compile \$(CC) \$(CFLAGS) \$(EXTRA_CFLAGS) -c $src -o \$@ |
1459
1e8582152d44
Date: Wed, 01 Mar 2006 10:14:31 +0000
Sam Lantinga <slouken@libsdl.org>
parents:
1417
diff
changeset
|
79 |
1e8582152d44
Date: Wed, 01 Mar 2006 10:14:31 +0000
Sam Lantinga <slouken@libsdl.org>
parents:
1417
diff
changeset
|
80 __EOF__ |
1e8582152d44
Date: Wed, 01 Mar 2006 10:14:31 +0000
Sam Lantinga <slouken@libsdl.org>
parents:
1417
diff
changeset
|
81 ;; |
4078
5e6f2972f963
Added support for building version.rc in Windows build.
Sam Lantinga <slouken@libsdl.org>
parents:
1634
diff
changeset
|
82 rc) cat >>${output}.new <<__EOF__ |
5e6f2972f963
Added support for building version.rc in Windows build.
Sam Lantinga <slouken@libsdl.org>
parents:
1634
diff
changeset
|
83 |
5e6f2972f963
Added support for building version.rc in Windows build.
Sam Lantinga <slouken@libsdl.org>
parents:
1634
diff
changeset
|
84 \$(WINDRES) $src \$@ |
5e6f2972f963
Added support for building version.rc in Windows build.
Sam Lantinga <slouken@libsdl.org>
parents:
1634
diff
changeset
|
85 |
5e6f2972f963
Added support for building version.rc in Windows build.
Sam Lantinga <slouken@libsdl.org>
parents:
1634
diff
changeset
|
86 __EOF__ |
5e6f2972f963
Added support for building version.rc in Windows build.
Sam Lantinga <slouken@libsdl.org>
parents:
1634
diff
changeset
|
87 ;; |
1361
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
88 *) echo "Unknown file extension: $ext";; |
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
89 esac |
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
90 echo "" >>${output}.new |
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
91 done |
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
92 mv ${output}.new ${output} |
1493
ce28f14c4502
Clean up temporary files. I'm not sure how this got removed, but whatever...
Sam Lantinga <slouken@libsdl.org>
parents:
1459
diff
changeset
|
93 rm -f ${cache_prefix}* |