Makefile.am
author Sam Lantinga <slouken@libsdl.org>
Thu, 02 Feb 2006 06:26:39 +0000
changeset 1321 e05bc5d315e3
parent 1131 e044e7c70a50
permissions -rw-r--r--
Date: Wed, 1 Feb 2006 18:20:33 -0800 From: Eric Wing Subject: SDL/Universal Binary updates Hi Sam, Attached is a big set of changes to the Xcode projects to support Universal Binaries. I have also included .dmgs that include the prebuilt frameworks. Ryan, I also updated SMPEG which is also in the package. The SDL and smpeg binaries were built against the CVS version (pulled maybe a month ago?). I do not have an Intel Mac to test on so I have no idea if this stuff actually works. However, Christian Walther has been a big help in testing 10.2.8 and 10.3.9 so I'm fairly confident we got the build settings correct for at least PPC. I have attempted to document the important things for producing these Universal Binaries. Documentation is somewhat scattered through out everything, but there is a big centralized piece of documentation in the UniversalBinaryNotes.rtf in the SDL.dmg. As far as Universal Binaries are concerned, the big things were: - Build with gcc 3.3 on PPC, 4.0 on Intel. - We couldn't get any of the MMX/SSE code to compile/link (SDL and smpeg). - All 3rd party dependencies had to be rebuilt as Universal There were also a bunch of non-Universal things that have been updated: - I converted the SDL-satellites to create .dmg's instead of .pkg installers - Updated all 3rd party static libraries with current versions. (I think libpng was the most dramatic going from 1.0.? to 1.2.8 with API breakage. I haven't found any problems so far in doing this.) - Changed some compiler optimization settings - Finally updated the exports list for SDL_mixer - Tried to include a static smpeg in SDL_mixer (multiple build variants in Xcode project now) - Enabled Altivec in SDL (we forgot to add the flags to Xcode last time) - More documentation Since so many things have changed, there might be new problems introduced. The big issue I've found so far is with SDL_mixer. As I mentioned on the mailing list, MP3's produce an assertion failure. And the MikMod problem reported on Bugzilla continues to persist. There's probably a bunch of other stuff I'm forgetting. There really were hundreds of little things I mucked with so it's hard to remember them all. If you have any questions, feel free to ask. Thanks, Eric
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
0
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
     1
# The top-level input Makefile for SDL
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
     2
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
     3
# require automake 1.4
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
     4
AUTOMAKE_OPTIONS = 1.4
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
     5
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
     6
## Any directories that you want built and installed should go here.
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
     7
SUBDIRS = src include docs
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
     8
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
     9
## Any directories you want a part of the distribution should be listed
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
    10
## here, as well as have a Makefile generated at the end of configure.in
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
    11
##
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
    12
## This only works for subdirectories one level deep.
351
b1cae30740a2 Fixed failed make when running "make distclean"
Sam Lantinga <slouken@libsdl.org>
parents: 292
diff changeset
    13
DIST_SUBDIRS = $(SUBDIRS)
0
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
    14
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
    15
# SDL runtime configuration script
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
    16
bin_SCRIPTS = sdl-config
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
    17
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
    18
# All the rest of the distributed files
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
    19
EXTRA_DIST =		\
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
    20
	BUGS		\
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
    21
	TODO		\
465
25f475cd4981 Updated the Borland C++ projects (thanks Dominique!)
Sam Lantinga <slouken@libsdl.org>
parents: 453
diff changeset
    22
	COPYING		\
25f475cd4981 Updated the Borland C++ projects (thanks Dominique!)
Sam Lantinga <slouken@libsdl.org>
parents: 453
diff changeset
    23
	CREDITS		\
25f475cd4981 Updated the Borland C++ projects (thanks Dominique!)
Sam Lantinga <slouken@libsdl.org>
parents: 453
diff changeset
    24
	INSTALL		\
240
529ba31e8679 Include the README files with the source distribution
Sam Lantinga <slouken@libsdl.org>
parents: 168
diff changeset
    25
	README		\
529ba31e8679 Include the README files with the source distribution
Sam Lantinga <slouken@libsdl.org>
parents: 168
diff changeset
    26
	README.AmigaOS	\
529ba31e8679 Include the README files with the source distribution
Sam Lantinga <slouken@libsdl.org>
parents: 168
diff changeset
    27
	README.CVS	\
509
dad72daf44b3 Added initial support for Dreamcast (thanks HERO!)
Sam Lantinga <slouken@libsdl.org>
parents: 465
diff changeset
    28
	README.DC	\
240
529ba31e8679 Include the README files with the source distribution
Sam Lantinga <slouken@libsdl.org>
parents: 168
diff changeset
    29
	README.Epoc	\
529ba31e8679 Include the README files with the source distribution
Sam Lantinga <slouken@libsdl.org>
parents: 168
diff changeset
    30
	README.MacOS	\
529ba31e8679 Include the README files with the source distribution
Sam Lantinga <slouken@libsdl.org>
parents: 168
diff changeset
    31
	README.MacOSX	\
281
c5010ab8ba35 Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents: 274
diff changeset
    32
	README.MiNT	\
240
529ba31e8679 Include the README files with the source distribution
Sam Lantinga <slouken@libsdl.org>
parents: 168
diff changeset
    33
	README.NanoX	\
433
706de3956894 Added initial support for PicoGUI (thanks Micah!)
Sam Lantinga <slouken@libsdl.org>
parents: 386
diff changeset
    34
	README.PicoGUI	\
267
b0a5d198755b *** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents: 254
diff changeset
    35
	README.QNX	\
386
2c5d4c22a2ac Added a README for Qtopia
Sam Lantinga <slouken@libsdl.org>
parents: 367
diff changeset
    36
	README.Qtopia	\
240
529ba31e8679 Include the README files with the source distribution
Sam Lantinga <slouken@libsdl.org>
parents: 168
diff changeset
    37
	README.WinCE	\
529ba31e8679 Include the README files with the source distribution
Sam Lantinga <slouken@libsdl.org>
parents: 168
diff changeset
    38
	README-SDL.txt	\
465
25f475cd4981 Updated the Borland C++ projects (thanks Dominique!)
Sam Lantinga <slouken@libsdl.org>
parents: 453
diff changeset
    39
	Borland.html	\
274
051b991765ba David Snopek added Borland compiler support
Sam Lantinga <slouken@libsdl.org>
parents: 267
diff changeset
    40
	Borland.zip	\
465
25f475cd4981 Updated the Borland C++ projects (thanks Dominique!)
Sam Lantinga <slouken@libsdl.org>
parents: 453
diff changeset
    41
	VisualC.html	\
25f475cd4981 Updated the Borland C++ projects (thanks Dominique!)
Sam Lantinga <slouken@libsdl.org>
parents: 453
diff changeset
    42
	VisualC.zip	\
453
a6fa62b1be09 Updated for embedded Visual C++ 4.0
Sam Lantinga <slouken@libsdl.org>
parents: 433
diff changeset
    43
	VisualCE.zip	\
509
dad72daf44b3 Added initial support for Dreamcast (thanks HERO!)
Sam Lantinga <slouken@libsdl.org>
parents: 465
diff changeset
    44
	Makefile.dc	\
465
25f475cd4981 Updated the Borland C++ projects (thanks Dominique!)
Sam Lantinga <slouken@libsdl.org>
parents: 453
diff changeset
    45
	MPWmake.sea.bin	\
0
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
    46
	CWprojects.sea.bin \
54
028447a8a758 *** empty log message ***
Sam Lantinga <slouken@lokigames.com>
parents: 3
diff changeset
    47
	PBProjects.tar.gz \
254
4fc12b8edf74 *** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents: 240
diff changeset
    48
	EpocBuildFiles.zip \
1010
2cd32a2d1f11 Whoops. :)
Sam Lantinga <slouken@libsdl.org>
parents: 831
diff changeset
    49
	Xcode.tar.gz	\
1128
9bad9361d390 *** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents: 1010
diff changeset
    50
	Xcode21.tar.gz	\
1321
e05bc5d315e3 Date: Wed, 1 Feb 2006 18:20:33 -0800
Sam Lantinga <slouken@libsdl.org>
parents: 1131
diff changeset
    51
	XcodeUniversal.tar.gz	\
465
25f475cd4981 Updated the Borland C++ projects (thanks Dominique!)
Sam Lantinga <slouken@libsdl.org>
parents: 453
diff changeset
    52
	WhatsNew	\
25f475cd4981 Updated the Borland C++ projects (thanks Dominique!)
Sam Lantinga <slouken@libsdl.org>
parents: 453
diff changeset
    53
	docs.html	\
292
eadc0746dfaf Added SDL_LockRect() and SDL_UnlockRect()
Sam Lantinga <slouken@libsdl.org>
parents: 281
diff changeset
    54
	sdl.m4		\
465
25f475cd4981 Updated the Borland C++ projects (thanks Dominique!)
Sam Lantinga <slouken@libsdl.org>
parents: 453
diff changeset
    55
	SDL.spec	\
25f475cd4981 Updated the Borland C++ projects (thanks Dominique!)
Sam Lantinga <slouken@libsdl.org>
parents: 453
diff changeset
    56
	autogen.sh	\
25f475cd4981 Updated the Borland C++ projects (thanks Dominique!)
Sam Lantinga <slouken@libsdl.org>
parents: 453
diff changeset
    57
	strip_fPIC.sh
0
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
    58
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
    59
# M4 macro file for inclusion with autoconf
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
    60
m4datadir = $(datadir)/aclocal
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
    61
m4data_DATA = sdl.m4
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
    62
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
    63
# Rule to build tar-gzipped distribution package
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
    64
$(PACKAGE)-$(VERSION).tar.gz: dist
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
    65
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
    66
# Rule to build RPM distribution package
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
    67
rpm: $(PACKAGE)-$(VERSION).tar.gz
138
69ee0b88b615 Applied Paul Jenner's patches to fix "make distcheck" and "make rpm"
Sam Lantinga <slouken@libsdl.org>
parents: 123
diff changeset
    68
	rpm -ta $(PACKAGE)-$(VERSION).tar.gz
0
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
    69
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
    70
# Rule to rebuild the export lists for BeOS, MacOS and Win32.
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
    71
exports:
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
    72
	(cd src/main/beos/exports; $(MAKE))
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
    73
	(cd src/main/macos/exports; $(MAKE))
754
623b453a3219 Fixed "dist" make target for newer versions of automake
Sam Lantinga <slouken@libsdl.org>
parents: 720
diff changeset
    74
	(cd src/main/macosx/exports; $(MAKE))
0
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
    75
	(cd src/main/win32/exports; $(MAKE))
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
    76
123
d49e9d023119 Fixed the project builder project archive
Sam Lantinga <slouken@libsdl.org>
parents: 116
diff changeset
    77
# Rule to build the Project Builder archive in MacOS X
d49e9d023119 Fixed the project builder project archive
Sam Lantinga <slouken@libsdl.org>
parents: 116
diff changeset
    78
PBProjects.tar.gz:
d49e9d023119 Fixed the project builder project archive
Sam Lantinga <slouken@libsdl.org>
parents: 116
diff changeset
    79
	rm -f `find . -name .DS_Store`
d49e9d023119 Fixed the project builder project archive
Sam Lantinga <slouken@libsdl.org>
parents: 116
diff changeset
    80
	if [ -d PBProjects ]; then \
168
e92aa316c517 Added Max's patches for building MacOS X apps on command line
Sam Lantinga <slouken@libsdl.org>
parents: 138
diff changeset
    81
	    tar zcvf $@ PBProjects; \
123
d49e9d023119 Fixed the project builder project archive
Sam Lantinga <slouken@libsdl.org>
parents: 116
diff changeset
    82
	fi
d49e9d023119 Fixed the project builder project archive
Sam Lantinga <slouken@libsdl.org>
parents: 116
diff changeset
    83
0
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
    84
# Rule to install the libraries only - prevent rebuilding apps
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
    85
install-lib:
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
    86
	cd src && $(MAKE) install-libLTLIBRARIES
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
    87
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
    88
# Run ldconfig after installing the library:
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
    89
install-hook:
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
    90
	-ldconfig
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
    91
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
    92
# Grab the test programs for the distribution:
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
    93
dist-hook:
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
    94
	if test -f test/Makefile; then (cd test; make distclean); fi
754
623b453a3219 Fixed "dist" make target for newer versions of automake
Sam Lantinga <slouken@libsdl.org>
parents: 720
diff changeset
    95
	rm -rf $(srcdir)/test/autom4te*
138
69ee0b88b615 Applied Paul Jenner's patches to fix "make distcheck" and "make rpm"
Sam Lantinga <slouken@libsdl.org>
parents: 123
diff changeset
    96
	cp -rp $(srcdir)/test $(distdir)
0
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
    97
	rm -rf `find $(distdir) -type d -name CVS -print`
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
    98
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
    99
# Create a CVS snapshot that people can run update -d on
365
263374148386 *** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents: 362
diff changeset
   100
CVSROOT = :pserver:guest@libsdl.org:/home/sdlweb/libsdl.org/cvs
0
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
   101
snapshot:
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
   102
	cvs -d $(CVSROOT) login
3
3b97b708523c Use correct repository when generating CVS snapshots
Sam Lantinga <slouken@lokigames.com>
parents: 0
diff changeset
   103
	cvs -d $(CVSROOT) checkout SDL12
831
26fe9256c48b Remove automake junk before generating a snapshot
Sam Lantinga <slouken@libsdl.org>
parents: 754
diff changeset
   104
	(cd SDL12 && ./autogen.sh && rm -rf autom4te.cache)
3
3b97b708523c Use correct repository when generating CVS snapshots
Sam Lantinga <slouken@lokigames.com>
parents: 0
diff changeset
   105
	mv SDL12 SDL-1.2
0
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
   106
	tar zcvf $(HOME)/SDL-1.2.tar.gz SDL-1.2
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
   107
	rm -rf SDL-1.2
720
f90d80d68071 N Sep 17 8791 Sam Lantinga Re: tks source released
Sam Lantinga <slouken@libsdl.org>
parents: 521
diff changeset
   108
snapshot13:
f90d80d68071 N Sep 17 8791 Sam Lantinga Re: tks source released
Sam Lantinga <slouken@libsdl.org>
parents: 521
diff changeset
   109
	cvs -d $(CVSROOT) login
f90d80d68071 N Sep 17 8791 Sam Lantinga Re: tks source released
Sam Lantinga <slouken@libsdl.org>
parents: 521
diff changeset
   110
	cvs -d $(CVSROOT) checkout -r branch_1_3_x SDL12
831
26fe9256c48b Remove automake junk before generating a snapshot
Sam Lantinga <slouken@libsdl.org>
parents: 754
diff changeset
   111
	(cd SDL12 && ./autogen.sh && rm -rf autom4te.cache)
720
f90d80d68071 N Sep 17 8791 Sam Lantinga Re: tks source released
Sam Lantinga <slouken@libsdl.org>
parents: 521
diff changeset
   112
	mv SDL12 SDL-1.3
f90d80d68071 N Sep 17 8791 Sam Lantinga Re: tks source released
Sam Lantinga <slouken@libsdl.org>
parents: 521
diff changeset
   113
	tar zcvf $(HOME)/SDL-1.3.tar.gz SDL-1.3
f90d80d68071 N Sep 17 8791 Sam Lantinga Re: tks source released
Sam Lantinga <slouken@libsdl.org>
parents: 521
diff changeset
   114
	rm -rf SDL-1.3