Mercurial > sdl-ios-xcode
annotate src/video/directfb/SDL_DirectFB_dyn.c @ 5030:6a0803e47c7b
Greg Jandl to SDL
I *think* the patch below works correctly: sdl-config gets the -march
flag and SDL builds fine. Perhaps there's a better way to get the
-march flag into both CFLAGS and SDL_FLAGS w/o dragging along more
cruft, but adding it to BASE_CFLAGS seemed the best bet to my eyes.
author | Sam Lantinga <slouken@libsdl.org> |
---|---|
date | Wed, 19 Jan 2011 00:07:43 -0800 |
parents | b196d2758026 |
children | 164f20ba08eb |
rev | line source |
---|---|
3000
61081db2385a
Whoops, missing files from Couriersud's update
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
1 /* |
61081db2385a
Whoops, missing files from Couriersud's update
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
2 SDL - Simple DirectMedia Layer |
3697 | 3 Copyright (C) 1997-2010 Sam Lantinga |
3000
61081db2385a
Whoops, missing files from Couriersud's update
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
4 |
61081db2385a
Whoops, missing files from Couriersud's update
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
5 This library is free software; you can redistribute it and/or |
61081db2385a
Whoops, missing files from Couriersud's update
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
6 modify it under the terms of the GNU Lesser General Public |
61081db2385a
Whoops, missing files from Couriersud's update
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
7 License as published by the Free Software Foundation; either |
61081db2385a
Whoops, missing files from Couriersud's update
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
8 version 2.1 of the License, or (at your option) any later version. |
61081db2385a
Whoops, missing files from Couriersud's update
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
9 |
61081db2385a
Whoops, missing files from Couriersud's update
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
10 This library is distributed in the hope that it will be useful, |
61081db2385a
Whoops, missing files from Couriersud's update
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
11 but WITHOUT ANY WARRANTY; without even the implied warranty of |
61081db2385a
Whoops, missing files from Couriersud's update
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
61081db2385a
Whoops, missing files from Couriersud's update
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
13 Lesser General Public License for more details. |
61081db2385a
Whoops, missing files from Couriersud's update
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
14 |
61081db2385a
Whoops, missing files from Couriersud's update
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
15 You should have received a copy of the GNU Lesser General Public |
61081db2385a
Whoops, missing files from Couriersud's update
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
16 License along with this library; if not, write to the Free Software |
61081db2385a
Whoops, missing files from Couriersud's update
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
17 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA |
61081db2385a
Whoops, missing files from Couriersud's update
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
18 |
61081db2385a
Whoops, missing files from Couriersud's update
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
19 Sam Lantinga |
61081db2385a
Whoops, missing files from Couriersud's update
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
20 slouken@libsdl.org |
61081db2385a
Whoops, missing files from Couriersud's update
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
21 */ |
61081db2385a
Whoops, missing files from Couriersud's update
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
22 #include "SDL_config.h" |
61081db2385a
Whoops, missing files from Couriersud's update
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
23 |
3023
d72a0dd80e8b
DirectFB cleanups & simple window manager
Couriersud <couriersud@arcor.de>
parents:
3000
diff
changeset
|
24 #include "SDL_DirectFB_video.h" |
3000
61081db2385a
Whoops, missing files from Couriersud's update
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
25 #include "SDL_DirectFB_dyn.h" |
61081db2385a
Whoops, missing files from Couriersud's update
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
26 |
61081db2385a
Whoops, missing files from Couriersud's update
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
27 #ifdef SDL_VIDEO_DRIVER_DIRECTFB_DYNAMIC |
61081db2385a
Whoops, missing files from Couriersud's update
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
28 #include "SDL_name.h" |
61081db2385a
Whoops, missing files from Couriersud's update
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
29 #include "SDL_loadso.h" |
61081db2385a
Whoops, missing files from Couriersud's update
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
30 |
61081db2385a
Whoops, missing files from Couriersud's update
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
31 #define DFB_SYM(ret, name, args, al, func) ret (*name) args; |
61081db2385a
Whoops, missing files from Couriersud's update
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
32 static struct _SDL_DirectFB_Symbols |
61081db2385a
Whoops, missing files from Couriersud's update
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
33 { |
4636 | 34 DFB_SYMS |
35 const unsigned int *directfb_major_version; | |
3000
61081db2385a
Whoops, missing files from Couriersud's update
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
36 const unsigned int *directfb_minor_version; |
61081db2385a
Whoops, missing files from Couriersud's update
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
37 const unsigned int *directfb_micro_version; |
61081db2385a
Whoops, missing files from Couriersud's update
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
38 } SDL_DirectFB_Symbols; |
61081db2385a
Whoops, missing files from Couriersud's update
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
39 #undef DFB_SYM |
61081db2385a
Whoops, missing files from Couriersud's update
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
40 |
61081db2385a
Whoops, missing files from Couriersud's update
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
41 #define DFB_SYM(ret, name, args, al, func) ret name args { func SDL_DirectFB_Symbols.name al ; } |
61081db2385a
Whoops, missing files from Couriersud's update
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
42 DFB_SYMS |
61081db2385a
Whoops, missing files from Couriersud's update
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
43 #undef DFB_SYM |
61081db2385a
Whoops, missing files from Couriersud's update
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
44 static void *handle = NULL; |
61081db2385a
Whoops, missing files from Couriersud's update
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
45 |
61081db2385a
Whoops, missing files from Couriersud's update
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
46 int |
61081db2385a
Whoops, missing files from Couriersud's update
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
47 SDL_DirectFB_LoadLibrary(void) |
61081db2385a
Whoops, missing files from Couriersud's update
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
48 { |
61081db2385a
Whoops, missing files from Couriersud's update
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
49 int retval = 0; |
61081db2385a
Whoops, missing files from Couriersud's update
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
50 |
61081db2385a
Whoops, missing files from Couriersud's update
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
51 if (handle == NULL) { |
61081db2385a
Whoops, missing files from Couriersud's update
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
52 handle = SDL_LoadObject(SDL_VIDEO_DRIVER_DIRECTFB_DYNAMIC); |
61081db2385a
Whoops, missing files from Couriersud's update
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
53 if (handle != NULL) { |
61081db2385a
Whoops, missing files from Couriersud's update
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
54 retval = 1; |
61081db2385a
Whoops, missing files from Couriersud's update
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
55 #define DFB_SYM(ret, name, args, al, func) if (!(SDL_DirectFB_Symbols.name = SDL_LoadFunction(handle, # name))) retval = 0; |
61081db2385a
Whoops, missing files from Couriersud's update
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
56 DFB_SYMS |
61081db2385a
Whoops, missing files from Couriersud's update
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
57 #undef DFB_SYM |
61081db2385a
Whoops, missing files from Couriersud's update
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
58 if (! |
61081db2385a
Whoops, missing files from Couriersud's update
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
59 (SDL_DirectFB_Symbols.directfb_major_version = |
61081db2385a
Whoops, missing files from Couriersud's update
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
60 SDL_LoadFunction(handle, "directfb_major_version"))) |
61081db2385a
Whoops, missing files from Couriersud's update
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
61 retval = 0; |
61081db2385a
Whoops, missing files from Couriersud's update
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
62 if (! |
61081db2385a
Whoops, missing files from Couriersud's update
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
63 (SDL_DirectFB_Symbols.directfb_minor_version = |
61081db2385a
Whoops, missing files from Couriersud's update
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
64 SDL_LoadFunction(handle, "directfb_minor_version"))) |
61081db2385a
Whoops, missing files from Couriersud's update
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
65 retval = 0; |
61081db2385a
Whoops, missing files from Couriersud's update
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
66 if (! |
61081db2385a
Whoops, missing files from Couriersud's update
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
67 (SDL_DirectFB_Symbols.directfb_micro_version = |
61081db2385a
Whoops, missing files from Couriersud's update
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
68 SDL_LoadFunction(handle, "directfb_micro_version"))) |
61081db2385a
Whoops, missing files from Couriersud's update
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
69 retval = 0; |
61081db2385a
Whoops, missing files from Couriersud's update
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
70 } |
61081db2385a
Whoops, missing files from Couriersud's update
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
71 } |
61081db2385a
Whoops, missing files from Couriersud's update
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
72 if (retval) { |
3023
d72a0dd80e8b
DirectFB cleanups & simple window manager
Couriersud <couriersud@arcor.de>
parents:
3000
diff
changeset
|
73 const char *stemp = DirectFBCheckVersion(DIRECTFB_MAJOR_VERSION, |
d72a0dd80e8b
DirectFB cleanups & simple window manager
Couriersud <couriersud@arcor.de>
parents:
3000
diff
changeset
|
74 DIRECTFB_MINOR_VERSION, |
d72a0dd80e8b
DirectFB cleanups & simple window manager
Couriersud <couriersud@arcor.de>
parents:
3000
diff
changeset
|
75 DIRECTFB_MICRO_VERSION); |
3000
61081db2385a
Whoops, missing files from Couriersud's update
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
76 /* Version Check */ |
3023
d72a0dd80e8b
DirectFB cleanups & simple window manager
Couriersud <couriersud@arcor.de>
parents:
3000
diff
changeset
|
77 if (stemp != NULL) { |
3000
61081db2385a
Whoops, missing files from Couriersud's update
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
78 fprintf(stderr, |
61081db2385a
Whoops, missing files from Couriersud's update
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
79 "DirectFB Lib: Version mismatch. Compiled: %d.%d.%d Library %d.%d.%d\n", |
61081db2385a
Whoops, missing files from Couriersud's update
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
80 DIRECTFB_MAJOR_VERSION, DIRECTFB_MINOR_VERSION, |
61081db2385a
Whoops, missing files from Couriersud's update
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
81 DIRECTFB_MICRO_VERSION, |
61081db2385a
Whoops, missing files from Couriersud's update
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
82 *SDL_DirectFB_Symbols.directfb_major_version, |
61081db2385a
Whoops, missing files from Couriersud's update
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
83 *SDL_DirectFB_Symbols.directfb_minor_version, |
61081db2385a
Whoops, missing files from Couriersud's update
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
84 *SDL_DirectFB_Symbols.directfb_micro_version); |
61081db2385a
Whoops, missing files from Couriersud's update
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
85 retval = 0; |
61081db2385a
Whoops, missing files from Couriersud's update
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
86 } |
61081db2385a
Whoops, missing files from Couriersud's update
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
87 } |
61081db2385a
Whoops, missing files from Couriersud's update
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
88 if (!retval) |
61081db2385a
Whoops, missing files from Couriersud's update
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
89 SDL_DirectFB_UnLoadLibrary(); |
61081db2385a
Whoops, missing files from Couriersud's update
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
90 return retval; |
61081db2385a
Whoops, missing files from Couriersud's update
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
91 } |
61081db2385a
Whoops, missing files from Couriersud's update
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
92 |
61081db2385a
Whoops, missing files from Couriersud's update
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
93 void |
61081db2385a
Whoops, missing files from Couriersud's update
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
94 SDL_DirectFB_UnLoadLibrary(void) |
61081db2385a
Whoops, missing files from Couriersud's update
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
95 { |
61081db2385a
Whoops, missing files from Couriersud's update
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
96 if (handle != NULL) { |
61081db2385a
Whoops, missing files from Couriersud's update
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
97 SDL_UnloadObject(handle); |
61081db2385a
Whoops, missing files from Couriersud's update
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
98 handle = NULL; |
61081db2385a
Whoops, missing files from Couriersud's update
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
99 } |
61081db2385a
Whoops, missing files from Couriersud's update
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
100 } |
61081db2385a
Whoops, missing files from Couriersud's update
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
101 |
61081db2385a
Whoops, missing files from Couriersud's update
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
102 #else |
61081db2385a
Whoops, missing files from Couriersud's update
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
103 int |
61081db2385a
Whoops, missing files from Couriersud's update
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
104 SDL_DirectFB_LoadLibrary(void) |
61081db2385a
Whoops, missing files from Couriersud's update
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
105 { |
61081db2385a
Whoops, missing files from Couriersud's update
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
106 return 1; |
61081db2385a
Whoops, missing files from Couriersud's update
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
107 } |
61081db2385a
Whoops, missing files from Couriersud's update
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
108 |
61081db2385a
Whoops, missing files from Couriersud's update
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
109 void |
61081db2385a
Whoops, missing files from Couriersud's update
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
110 SDL_DirectFB_UnLoadLibrary(void) |
61081db2385a
Whoops, missing files from Couriersud's update
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
111 { |
61081db2385a
Whoops, missing files from Couriersud's update
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
112 } |
61081db2385a
Whoops, missing files from Couriersud's update
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
113 #endif |