Mercurial > sdl-ios-xcode
annotate src/main/macosx/Makefile.am @ 1258:b2283b0ded26
Date: Thu, 19 Jan 2006 20:02:29 +0200
From: Vassilis Virvilis <vasvir@iit.demokritos.gr>
Subject: [SDL] Request: Please reconsider adding tag in SDL_Event
Hi,
Patch in question:
--- include/SDL_events.h 20 Aug 2004 18:57:01 -0000 1.11
+++ include/SDL_events.h 19 Jan 2006 17:35:09 -0000
@@ -214,7 +214,7 @@
} SDL_SysWMEvent;
/* General event structure */
-typedef union {
+typedef union SDL_Event {
Uint8 type;
SDL_ActiveEvent active;
SDL_KeyboardEvent key;
Reasoning:
----------
1) Allows forward declaration of the SDL_Event union in C++. Please
note that in plain C it is possible to forward declare it.
2) Forward declaration is good because it allows encapsulation. It hides
the specific implementation and does not necessarily exposes SDL staff
to my appication's namespace
3) It can't harm plain C because tags are living in a different namespace
than typenames
4) It is already done like this in other places in SDL. Check for example
SDL_KeySym, and SDL_.*Event structures.
5) Right now I have to include SDL/event.h from a C++ header file. See 2)
author | Sam Lantinga <slouken@libsdl.org> |
---|---|
date | Fri, 20 Jan 2006 13:07:25 +0000 |
parents | 91a5db3e930a |
children |
rev | line source |
---|---|
194
ba9e0fcc2ae2
Oops, back out that SDL_main -> SDLMain conversion
Sam Lantinga <slouken@libsdl.org>
parents:
191
diff
changeset
|
1 # On OS X, install the SDLMain.nib. |
168
e92aa316c517
Added Max's patches for building MacOS X apps on command line
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
2 # We use an ugly hack to force the creation of the |
e92aa316c517
Added Max's patches for building MacOS X apps on command line
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
3 # destination dir, maybe somebody with more automake |
e92aa316c517
Added Max's patches for building MacOS X apps on command line
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
4 # experience knows how to do this properly? |
e92aa316c517
Added Max's patches for building MacOS X apps on command line
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
5 |
e92aa316c517
Added Max's patches for building MacOS X apps on command line
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
6 if TARGET_MACOSX |
218
91a5db3e930a
Hack workaround to fix MacOS X install problems
Sam Lantinga <slouken@libsdl.org>
parents:
213
diff
changeset
|
7 hackhacknibdatadir = $(nibdatadir)/SDLMain.nib |
91a5db3e930a
Hack workaround to fix MacOS X install problems
Sam Lantinga <slouken@libsdl.org>
parents:
213
diff
changeset
|
8 hackhacknibdata_DATA = info.nib |
91a5db3e930a
Hack workaround to fix MacOS X install problems
Sam Lantinga <slouken@libsdl.org>
parents:
213
diff
changeset
|
9 |
168
e92aa316c517
Added Max's patches for building MacOS X apps on command line
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
10 nibdatadir = $(datadir)/sdl |
e92aa316c517
Added Max's patches for building MacOS X apps on command line
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
11 nibdata_DATA = \ |
194
ba9e0fcc2ae2
Oops, back out that SDL_main -> SDLMain conversion
Sam Lantinga <slouken@libsdl.org>
parents:
191
diff
changeset
|
12 SDLMain.nib/classes.nib \ |
ba9e0fcc2ae2
Oops, back out that SDL_main -> SDLMain conversion
Sam Lantinga <slouken@libsdl.org>
parents:
191
diff
changeset
|
13 SDLMain.nib/info.nib \ |
ba9e0fcc2ae2
Oops, back out that SDL_main -> SDLMain conversion
Sam Lantinga <slouken@libsdl.org>
parents:
191
diff
changeset
|
14 SDLMain.nib/objects.nib \ |
168
e92aa316c517
Added Max's patches for building MacOS X apps on command line
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
15 Info.plist |
e92aa316c517
Added Max's patches for building MacOS X apps on command line
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
16 endif |
176
c9bc7f33d56f
*** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
168
diff
changeset
|
17 |
218
91a5db3e930a
Hack workaround to fix MacOS X install problems
Sam Lantinga <slouken@libsdl.org>
parents:
213
diff
changeset
|
18 EXTRA_DIST = SDLMain.h SDLMain.m info.nib |
176
c9bc7f33d56f
*** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
168
diff
changeset
|
19 |
c9bc7f33d56f
*** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
168
diff
changeset
|
20 # The nib and exports directories need to be copied into place |
c9bc7f33d56f
*** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
168
diff
changeset
|
21 # when building a distribution. |
c9bc7f33d56f
*** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
168
diff
changeset
|
22 dist-hook: |
194
ba9e0fcc2ae2
Oops, back out that SDL_main -> SDLMain conversion
Sam Lantinga <slouken@libsdl.org>
parents:
191
diff
changeset
|
23 cp -rp SDLMain.nib $(distdir) |
176
c9bc7f33d56f
*** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
168
diff
changeset
|
24 cp -rp exports $(distdir) |
c9bc7f33d56f
*** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
168
diff
changeset
|
25 (cd $(distdir) && rm -rf `find . -name CVS`) |