Mercurial > sdl-ios-xcode
annotate Makefile.in @ 3978:b966761fef6c SDL-1.2
Significantly improved XIM support.
Fixes Bugzilla #429.
Selected notes from the patch's README:
= FIXES =
This patch fixes the above issues as follows.
== X11 events ==
Moved XFilterEvent just after XNextEvent so that all events are passed
to it. Also, XFilterEvent will receive masks indicated by IM through
XNFilterEvents IC value as well as masks surpplied by SDL.
X11_KeyRepeat is called between XNextEvent and XFilterEvent, after
testing an event is a KeyRelease. I'm not 100% comfortable to do so,
but I couldn't find a better timing to call it, and use of the
function is inevitable.
== Xutf8LookupString ==
Used a longer buffer to receive UTF-8 string. If it is insufficient,
a dynamic storage of the requested size will be allocated. The
initial size of the buffer is set to 32, because the Japanese text
converted from the most widely used benchmark key sequence for
Japanese IM, "WATASHINONAMAEHANAKANODESU." has ten Japanese characters
in it, that occupies 30 bytes when encoded in UTF-8.
== SDL_keysym.unicode ==
On Windows version of SDL implementation, SDL_keysym.unicode stores
UTF-16 encoded unicode characters, one UTF-16 encoding unit per an SDL
event. A Unicode supplementary characters are sent to an application
as two events. (One with a high surrogate and another with a low
surrogate.) The behavior seems reasonable since it is upward
compatible with existing handling of BMP characters.
I wrote a UTF-8 to UTF-16 conversion function for the purpose. It is
designed with the execution speed in mind, having a minimum set of
features that my patch requires.
author | Ryan C. Gordon <icculus@icculus.org> |
---|---|
date | Mon, 25 Jun 2007 19:58:32 +0000 |
parents | e6112676c9a0 |
children | 2c66ac13144f |
rev | line source |
---|---|
1362 | 1 # Makefile to build and install the SDL library |
2 | |
3 top_builddir = . | |
4 srcdir = @srcdir@ | |
5 objects = build | |
6 depend = build-deps | |
7 prefix = @prefix@ | |
8 exec_prefix = @exec_prefix@ | |
1390 | 9 bindir = $(DESTDIR)@bindir@ |
10 libdir = $(DESTDIR)@libdir@ | |
11 includedir = $(DESTDIR)@includedir@ | |
12 datadir = $(DESTDIR)@datadir@ | |
13 mandir = $(DESTDIR)@mandir@ | |
1391
7dc446173e37
Blargle-fnargle dependencies and build rules
Sam Lantinga <slouken@libsdl.org>
parents:
1390
diff
changeset
|
14 auxdir = @ac_aux_dir@ |
1362 | 15 distpath = $(srcdir)/.. |
16 distdir = SDL-@SDL_VERSION@ | |
17 distfile = $(distdir).tar.gz | |
18 | |
1380
d94b080ff6ce
Completely removed dependency on automake
Sam Lantinga <slouken@libsdl.org>
parents:
1362
diff
changeset
|
19 @SET_MAKE@ |
1362 | 20 SHELL = @SHELL@ |
21 CC = @CC@ | |
22 INCLUDE = @INCLUDE@ | |
23 CFLAGS = @BUILD_CFLAGS@ | |
1521
9b9212e4810c
CFLAGS are separate from EXTRA_CFLAGS
Sam Lantinga <slouken@libsdl.org>
parents:
1494
diff
changeset
|
24 EXTRA_CFLAGS = @EXTRA_CFLAGS@ |
1393
cd3362657144
Pass LDFLAGS to the build system
Sam Lantinga <slouken@libsdl.org>
parents:
1391
diff
changeset
|
25 LDFLAGS = @BUILD_LDFLAGS@ |
1521
9b9212e4810c
CFLAGS are separate from EXTRA_CFLAGS
Sam Lantinga <slouken@libsdl.org>
parents:
1494
diff
changeset
|
26 EXTRA_LDFLAGS = @EXTRA_LDFLAGS@ |
1362 | 27 LIBTOOL = @LIBTOOL@ |
28 INSTALL = @INSTALL@ | |
29 NASM = @NASM@ @NASMFLAGS@ | |
1419
36a5068bf7df
*** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
1414
diff
changeset
|
30 AR = @AR@ |
36a5068bf7df
*** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
1414
diff
changeset
|
31 RANLIB = @RANLIB@ |
1362 | 32 |
33 TARGET = libSDL.la | |
34 SOURCES = @SOURCES@ | |
35 OBJECTS = @OBJECTS@ | |
36 | |
1397
b189a73aa335
Added rules to build libSDLmain.a
Sam Lantinga <slouken@libsdl.org>
parents:
1394
diff
changeset
|
37 SDLMAIN_TARGET = libSDLmain.a |
b189a73aa335
Added rules to build libSDLmain.a
Sam Lantinga <slouken@libsdl.org>
parents:
1394
diff
changeset
|
38 SDLMAIN_SOURCES = @SDLMAIN_SOURCES@ |
b189a73aa335
Added rules to build libSDLmain.a
Sam Lantinga <slouken@libsdl.org>
parents:
1394
diff
changeset
|
39 SDLMAIN_OBJECTS = @SDLMAIN_OBJECTS@ |
b189a73aa335
Added rules to build libSDLmain.a
Sam Lantinga <slouken@libsdl.org>
parents:
1394
diff
changeset
|
40 |
3969
e6112676c9a0
Removed some more EPOC stuff I missed.
Ryan C. Gordon <icculus@icculus.org>
parents:
3961
diff
changeset
|
41 DIST = acinclude.m4 autogen.sh Borland.html Borland.zip BUGS build-scripts configure configure.in COPYING CREDITS CWprojects.sea.bin docs docs.html include INSTALL Makefile.dc Makefile.minimal Makefile.in MPWmake.sea.bin README* sdl-config.in sdl.m4 sdl.pc.in SDL.qpg.in SDL.spec SDL.spec.in src test TODO VisualCE.zip VisualC.html VisualC.zip Watcom-OS2.zip Watcom-Win32.zip WhatsNew Xcode.tar.gz |
1362 | 42 |
3961
4b093ecae4a7
Don't install the extra SDL config headers or SDL_copying.h
Sam Lantinga <slouken@libsdl.org>
parents:
3906
diff
changeset
|
43 HDRS = SDL.h SDL_active.h SDL_audio.h SDL_byteorder.h SDL_cdrom.h SDL_cpuinfo.h SDL_endian.h SDL_error.h SDL_events.h SDL_getenv.h SDL_joystick.h SDL_keyboard.h SDL_keysym.h SDL_loadso.h SDL_main.h SDL_mouse.h SDL_mutex.h SDL_name.h SDL_opengl.h SDL_platform.h SDL_quit.h SDL_rwops.h SDL_stdinc.h SDL_syswm.h SDL_thread.h SDL_timer.h SDL_types.h SDL_version.h SDL_video.h begin_code.h close_code.h |
4b093ecae4a7
Don't install the extra SDL config headers or SDL_copying.h
Sam Lantinga <slouken@libsdl.org>
parents:
3906
diff
changeset
|
44 |
1362 | 45 LT_AGE = @LT_AGE@ |
46 LT_CURRENT = @LT_CURRENT@ | |
47 LT_RELEASE = @LT_RELEASE@ | |
48 LT_REVISION = @LT_REVISION@ | |
49 LT_LDFLAGS = -no-undefined -rpath $(libdir) -release $(LT_RELEASE) -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) | |
50 | |
1622 | 51 all: $(srcdir)/configure Makefile $(objects) $(objects)/$(TARGET) $(objects)/$(SDLMAIN_TARGET) |
52 | |
53 $(srcdir)/configure: $(srcdir)/configure.in | |
54 @echo "Warning, configure.in is out of date" | |
55 #(cd $(srcdir) && sh autogen.sh && sh configure) | |
1623
09375aed0208
Added a delay so the warning message isn't accidentally missed.
Sam Lantinga <slouken@libsdl.org>
parents:
1622
diff
changeset
|
56 @sleep 3 |
1362 | 57 |
58 Makefile: $(srcdir)/Makefile.in | |
59 $(SHELL) config.status $@ | |
60 | |
61 $(objects): | |
1391
7dc446173e37
Blargle-fnargle dependencies and build rules
Sam Lantinga <slouken@libsdl.org>
parents:
1390
diff
changeset
|
62 $(SHELL) $(auxdir)/mkinstalldirs $@ |
1362 | 63 |
64 .PHONY: all depend install install-bin install-hdrs install-lib install-data install-man uninstall uninstall-bin uninstall-hdrs uninstall-lib uninstall-data uninstall-man clean distclean dist | |
65 depend: | |
1634
14f302c5b32c
Don't hardcode the output directory
Sam Lantinga <slouken@libsdl.org>
parents:
1623
diff
changeset
|
66 @SOURCES="$(SOURCES)" INCLUDE="$(INCLUDE)" output="$(depend)" \ |
1391
7dc446173e37
Blargle-fnargle dependencies and build rules
Sam Lantinga <slouken@libsdl.org>
parents:
1390
diff
changeset
|
67 $(SHELL) $(auxdir)/makedep.sh |
1419
36a5068bf7df
*** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
1414
diff
changeset
|
68 @for src in $(SDLMAIN_SOURCES); do \ |
1397
b189a73aa335
Added rules to build libSDLmain.a
Sam Lantinga <slouken@libsdl.org>
parents:
1394
diff
changeset
|
69 obj=`echo $$src | sed -e 's|.*/||' -e 's|\.[^\.]*$$|.o|'`; \ |
1634
14f302c5b32c
Don't hardcode the output directory
Sam Lantinga <slouken@libsdl.org>
parents:
1623
diff
changeset
|
70 echo "\$$(objects)/$$obj: $$src" >>$(depend); \ |
1522
1078552c83a0
*** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
1521
diff
changeset
|
71 echo " \$$(CC) \$$(CFLAGS) \$$(EXTRA_CFLAGS) -c $$src -o \$$@" >>$(depend); \ |
1397
b189a73aa335
Added rules to build libSDLmain.a
Sam Lantinga <slouken@libsdl.org>
parents:
1394
diff
changeset
|
72 done |
1362 | 73 |
74 include $(depend) | |
75 | |
76 $(objects)/$(TARGET): $(OBJECTS) | |
1521
9b9212e4810c
CFLAGS are separate from EXTRA_CFLAGS
Sam Lantinga <slouken@libsdl.org>
parents:
1494
diff
changeset
|
77 $(LIBTOOL) --mode=link $(CC) -o $@ $(OBJECTS) $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) |
1362 | 78 |
1397
b189a73aa335
Added rules to build libSDLmain.a
Sam Lantinga <slouken@libsdl.org>
parents:
1394
diff
changeset
|
79 $(objects)/$(SDLMAIN_TARGET): $(SDLMAIN_OBJECTS) |
1419
36a5068bf7df
*** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
1414
diff
changeset
|
80 $(AR) cru $@ $(SDLMAIN_OBJECTS) |
36a5068bf7df
*** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
1414
diff
changeset
|
81 $(RANLIB) $@ |
1397
b189a73aa335
Added rules to build libSDLmain.a
Sam Lantinga <slouken@libsdl.org>
parents:
1394
diff
changeset
|
82 |
1764
4b2f27334dce
The install target depends on the libraries being built
Sam Lantinga <slouken@libsdl.org>
parents:
1750
diff
changeset
|
83 install: all install-bin install-hdrs install-lib install-data install-man |
1362 | 84 install-bin: |
1391
7dc446173e37
Blargle-fnargle dependencies and build rules
Sam Lantinga <slouken@libsdl.org>
parents:
1390
diff
changeset
|
85 $(SHELL) $(auxdir)/mkinstalldirs $(bindir) |
1476
14937d7b7527
Date: Mon, 6 Mar 2006 19:00:45 +0100
Sam Lantinga <slouken@libsdl.org>
parents:
1451
diff
changeset
|
86 $(INSTALL) -m 755 sdl-config $(bindir)/sdl-config |
1362 | 87 install-hdrs: |
1391
7dc446173e37
Blargle-fnargle dependencies and build rules
Sam Lantinga <slouken@libsdl.org>
parents:
1390
diff
changeset
|
88 $(SHELL) $(auxdir)/mkinstalldirs $(includedir)/SDL |
3961
4b093ecae4a7
Don't install the extra SDL config headers or SDL_copying.h
Sam Lantinga <slouken@libsdl.org>
parents:
3906
diff
changeset
|
89 for file in $(HDRS); do \ |
4b093ecae4a7
Don't install the extra SDL config headers or SDL_copying.h
Sam Lantinga <slouken@libsdl.org>
parents:
3906
diff
changeset
|
90 $(INSTALL) -m 644 $(srcdir)/include/$$file $(includedir)/SDL/$$file; \ |
1362 | 91 done |
1394
e57f8d1344b6
Set the install permissions correctly
Sam Lantinga <slouken@libsdl.org>
parents:
1393
diff
changeset
|
92 $(INSTALL) -m 644 include/SDL_config.h $(includedir)/SDL/SDL_config.h |
1362 | 93 install-lib: |
1391
7dc446173e37
Blargle-fnargle dependencies and build rules
Sam Lantinga <slouken@libsdl.org>
parents:
1390
diff
changeset
|
94 $(SHELL) $(auxdir)/mkinstalldirs $(libdir) |
1362 | 95 $(LIBTOOL) --mode=install $(INSTALL) $(objects)/$(TARGET) $(libdir)/$(TARGET) |
1397
b189a73aa335
Added rules to build libSDLmain.a
Sam Lantinga <slouken@libsdl.org>
parents:
1394
diff
changeset
|
96 $(INSTALL) -m 644 $(objects)/$(SDLMAIN_TARGET) $(libdir)/$(SDLMAIN_TARGET) |
1419
36a5068bf7df
*** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
1414
diff
changeset
|
97 $(RANLIB) $(libdir)/$(SDLMAIN_TARGET) |
1362 | 98 install-data: |
1391
7dc446173e37
Blargle-fnargle dependencies and build rules
Sam Lantinga <slouken@libsdl.org>
parents:
1390
diff
changeset
|
99 $(SHELL) $(auxdir)/mkinstalldirs $(datadir)/aclocal |
1394
e57f8d1344b6
Set the install permissions correctly
Sam Lantinga <slouken@libsdl.org>
parents:
1393
diff
changeset
|
100 $(INSTALL) -m 644 $(srcdir)/sdl.m4 $(datadir)/aclocal/sdl.m4 |
1865
d688ac43a76b
Bug #250, pkg-config support contributed by Mikael Eriksson
Sam Lantinga <slouken@libsdl.org>
parents:
1848
diff
changeset
|
101 $(SHELL) $(auxdir)/mkinstalldirs $(libdir)/pkgconfig |
1894
c69cee13dd76
sdl.pc is in build directory, not source
Patrice Mandin <patmandin@gmail.com>
parents:
1865
diff
changeset
|
102 $(INSTALL) -m 644 sdl.pc $(libdir)/pkgconfig |
1362 | 103 install-man: |
1391
7dc446173e37
Blargle-fnargle dependencies and build rules
Sam Lantinga <slouken@libsdl.org>
parents:
1390
diff
changeset
|
104 $(SHELL) $(auxdir)/mkinstalldirs $(mandir)/man3 |
1362 | 105 for src in $(srcdir)/docs/man3/*.3; do \ |
106 file=`echo $$src | sed -e 's|^.*/||'`; \ | |
1394
e57f8d1344b6
Set the install permissions correctly
Sam Lantinga <slouken@libsdl.org>
parents:
1393
diff
changeset
|
107 $(INSTALL) -m 644 $$src $(mandir)/man3/$$file; \ |
1362 | 108 done |
109 | |
1603 | 110 uninstall: uninstall-bin uninstall-hdrs uninstall-lib uninstall-data uninstall-man |
1362 | 111 uninstall-bin: |
112 rm -f $(bindir)/sdl-config | |
113 uninstall-hdrs: | |
3961
4b093ecae4a7
Don't install the extra SDL config headers or SDL_copying.h
Sam Lantinga <slouken@libsdl.org>
parents:
3906
diff
changeset
|
114 for file in $(HDRS); do \ |
1362 | 115 rm -f $(includedir)/SDL/$$file; \ |
116 done | |
117 rm -f $(includedir)/SDL/SDL_config.h | |
1603 | 118 -rmdir $(includedir)/SDL |
1362 | 119 uninstall-lib: |
120 $(LIBTOOL) --mode=uninstall rm -f $(libdir)/$(TARGET) | |
1397
b189a73aa335
Added rules to build libSDLmain.a
Sam Lantinga <slouken@libsdl.org>
parents:
1394
diff
changeset
|
121 rm -f $(libdir)/$(SDLMAIN_TARGET) |
1362 | 122 uninstall-data: |
123 rm -f $(datadir)/aclocal/sdl.m4 | |
124 uninstall-man: | |
125 for src in $(srcdir)/docs/man3/*.3; do \ | |
126 file=`echo $$src | sed -e 's|^.*/||'`; \ | |
127 rm -f $(mandir)/man3/$$file; \ | |
128 done | |
129 | |
130 clean: | |
131 rm -rf $(objects) | |
1380
d94b080ff6ce
Completely removed dependency on automake
Sam Lantinga <slouken@libsdl.org>
parents:
1362
diff
changeset
|
132 if test -f test/Makefile; then (cd test; $(MAKE) $@); fi |
1362 | 133 |
134 distclean: clean | |
135 rm -f Makefile include/SDL_config.h sdl-config | |
136 rm -f SDL.qpg | |
137 rm -f config.status config.cache config.log libtool $(depend) | |
138 rm -rf $(srcdir)/autom4te* | |
1603 | 139 find $(srcdir) \( \ |
140 -name '*~' -o \ | |
141 -name '*.bak' -o \ | |
142 -name '*.old' -o \ | |
143 -name '*.rej' -o \ | |
144 -name '*.orig' -o \ | |
145 -name '.#*' \) \ | |
1362 | 146 -exec rm -f {} \; |
1603 | 147 cp $(srcdir)/include/SDL_config.h.default $(srcdir)/include/SDL_config.h |
1380
d94b080ff6ce
Completely removed dependency on automake
Sam Lantinga <slouken@libsdl.org>
parents:
1362
diff
changeset
|
148 if test -f test/Makefile; then (cd test; $(MAKE) $@); fi |
1362 | 149 |
150 dist $(distfile): | |
1391
7dc446173e37
Blargle-fnargle dependencies and build rules
Sam Lantinga <slouken@libsdl.org>
parents:
1390
diff
changeset
|
151 $(SHELL) $(auxdir)/mkinstalldirs $(distdir) |
1362 | 152 tar cf - $(DIST) | (cd $(distdir); tar xf -) |
1603 | 153 cp $(distdir)/include/SDL_config.h.default $(distdir)/include/SDL_config.h |
1651
0a9be1057095
subversion conversion complete!
Sam Lantinga <slouken@libsdl.org>
parents:
1634
diff
changeset
|
154 rm -rf `find $(distdir) -name .svn` |
1846
699eaff87cbb
Whoops, clean files in the dist directory
Sam Lantinga <slouken@libsdl.org>
parents:
1845
diff
changeset
|
155 find $(distdir) \( \ |
1845 | 156 -name '*~' -o \ |
157 -name '*.bak' -o \ | |
158 -name '*.old' -o \ | |
159 -name '*.rej' -o \ | |
160 -name '*.orig' -o \ | |
161 -name '.#*' \) \ | |
162 -exec rm -f {} \; | |
1848
3c5eed71a332
Clean out the tests before creating distribution archive
Sam Lantinga <slouken@libsdl.org>
parents:
1846
diff
changeset
|
163 if test -f $(distdir)/test/Makefile; then (cd $(distdir)/test && make distclean); fi |
1362 | 164 tar cvf - $(distdir) | gzip --best >$(distfile) |
165 rm -rf $(distdir) | |
166 | |
167 rpm: $(distfile) | |
168 rpmbuild -ta $? | |
1424
7a610f25c12f
Updated MacOS Classic MPW build
Sam Lantinga <slouken@libsdl.org>
parents:
1419
diff
changeset
|
169 |
1651
0a9be1057095
subversion conversion complete!
Sam Lantinga <slouken@libsdl.org>
parents:
1634
diff
changeset
|
170 # Create a SVN snapshot that people can run update on |
1424
7a610f25c12f
Updated MacOS Classic MPW build
Sam Lantinga <slouken@libsdl.org>
parents:
1419
diff
changeset
|
171 snapshot: |
3906 | 172 svn co http://svn.libsdl.org/branches/SDL-1.2 |
3848
4de14c915f4c
Updated the snapshot build target to reflect the new source location
Sam Lantinga <slouken@libsdl.org>
parents:
1894
diff
changeset
|
173 (cd SDL-1.2 && ./autogen.sh && rm -rf autom4te.cache) |
4de14c915f4c
Updated the snapshot build target to reflect the new source location
Sam Lantinga <slouken@libsdl.org>
parents:
1894
diff
changeset
|
174 cp SDL-1.2/include/SDL_config.h.default SDL-1.2/include/SDL_config.h |
1448
9a845c7b8b35
Build both the .tar.gz and .zip archives when creating a CVS snapshot.
Sam Lantinga <slouken@libsdl.org>
parents:
1442
diff
changeset
|
175 tar zcf $(HOME)/SDL-1.2.tar.gz SDL-1.2 |
1451
b89bce877c0d
Argh, I forgot that zip merges files into the archive instead of recreating it.
Sam Lantinga <slouken@libsdl.org>
parents:
1448
diff
changeset
|
176 rm -f $(HOME)/SDL-1.2.zip |
1448
9a845c7b8b35
Build both the .tar.gz and .zip archives when creating a CVS snapshot.
Sam Lantinga <slouken@libsdl.org>
parents:
1442
diff
changeset
|
177 zip -r $(HOME)/SDL-1.2.zip SDL-1.2 |
1424
7a610f25c12f
Updated MacOS Classic MPW build
Sam Lantinga <slouken@libsdl.org>
parents:
1419
diff
changeset
|
178 rm -rf SDL-1.2 |