Mercurial > sdl-ios-xcode
view Makefile.in @ 4426:1bceff8f008f
Fixed bug #943
Ozkan Sezer 2010-02-06 12:31:06 PST
Hi:
Here are some small fixes for compiling SDL against mingw-w64.
(see http://mingw-w64.sourceforge.net/ . Despite the name, it
supports both win32 and win64.)
src/audio/windx5/directx.h and src/video/windx5/directx.h (both
SDL-1.2 and SDL-1.3.) I get compilation errors about some union
not having a member named u1 and alike, because of other system
headers being included before this one and them already defining
DUMMYUNIONNAME and stuff. This header probably assumes that those
stuff are defined in windef.h, but mingw-w64 headers define them
in _mingw.h. Easily fixed by moving NONAMELESSUNION definition to
the top of the file.
src/thread/win32/SDL_systhread.c (both SDL-1.2 and SDL-1.3.) :
The __GNUC__ case for pfnSDL_CurrentBeginThread is 32-bit centric
because _beginthreadex returns uintptr_t, not unsigned long which
is 32 bits in win64. Changing the return type to uintptr_t fixes
it.
video/SDL_blit.h (and configure.in) (SDL-1.3-only) : MinGW-w64
uses msvcrt version of _aligned_malloc and _aligned_free and
they are defined in intrin.h (similar to VC). Adding proper
ifdefs fixes it. (Notes about macros to check: __MINGW32__ is
defined for both mingw.org and for mingw-w64 for both win32 and
win64, __MINGW64__ is only defined for _WIN64, so __MINGW64__
can't be used to detect mingw-w64: including _mingw.h and then
checking for __MINGW64_VERSION_MAJOR does the trick.)
SDL_win32video.h (SDL-1.3-only) : Tweaked the VINWER definition
and location in order to avoid multiple redefinition warnings.
Hope these are useful. Thanks.
author | Sam Lantinga <slouken@libsdl.org> |
---|---|
date | Wed, 10 Mar 2010 15:02:58 +0000 |
parents | 17376128fb56 |
children | 3e69e077cb95 86c171888eee cf7976fd3258 |
line wrap: on
line source
# Makefile to build and install the SDL library top_builddir = . srcdir = @srcdir@ objects = build prefix = @prefix@ exec_prefix = @exec_prefix@ bindir = @bindir@ libdir = @libdir@ includedir = @includedir@ datarootdir = @datarootdir@ datadir = @datadir@ auxdir = @ac_aux_dir@ distpath = $(srcdir)/.. distdir = SDL-@SDL_VERSION@ distfile = $(distdir).tar.gz @SET_MAKE@ SHELL = @SHELL@ CC = @CC@ INCLUDE = @INCLUDE@ CFLAGS = @BUILD_CFLAGS@ EXTRA_CFLAGS = @EXTRA_CFLAGS@ LDFLAGS = @BUILD_LDFLAGS@ EXTRA_LDFLAGS = @EXTRA_LDFLAGS@ LIBTOOL = @LIBTOOL@ INSTALL = @INSTALL@ NASM = @NASM@ @NASMFLAGS@ AR = @AR@ RANLIB = @RANLIB@ WINDRES = @WINDRES@ TARGET = libSDL.la OBJECTS = @OBJECTS@ VERSION_OBJECTS = @VERSION_OBJECTS@ SDLMAIN_TARGET = libSDLmain.a SDLMAIN_OBJECTS = @SDLMAIN_OBJECTS@ # PS3 SPU programs SPU_GCC = @SPU_GCC@ EMBEDSPU = @EMBEDSPU@ #include $(srcdir)/src/video/ps3/spulibs/Makefile DIST = acinclude autogen.sh Borland.html Borland.zip BUGS build-scripts configure configure.in COPYING CREDITS include INSTALL Makefile.minimal Makefile.in README* sdl-config.in sdl.m4 sdl.pc.in SDL.spec SDL.spec.in src test TODO VisualC.html VisualC VisualCE Watcom-Win32.zip WhatsNew Xcode Xcode-iPhoneOS HDRS = SDL.h SDL_assert.h SDL_atomic.h SDL_audio.h SDL_compat.h SDL_cpuinfo.h SDL_endian.h SDL_error.h SDL_events.h SDL_haptic.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_opengles.h SDL_pixels.h SDL_platform.h SDL_power.h SDL_quit.h SDL_rect.h SDL_revision.h SDL_rwops.h SDL_scancode.h SDL_stdinc.h SDL_surface.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 LT_AGE = @LT_AGE@ LT_CURRENT = @LT_CURRENT@ LT_RELEASE = @LT_RELEASE@ LT_REVISION = @LT_REVISION@ LT_LDFLAGS = -no-undefined -rpath $(DESTDIR)$(libdir) -release $(LT_RELEASE) -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) all: $(srcdir)/configure Makefile $(objects) $(objects)/$(TARGET) $(objects)/$(SDLMAIN_TARGET) $(srcdir)/configure: $(srcdir)/configure.in @echo "Warning, configure.in is out of date" #(cd $(srcdir) && sh autogen.sh && sh configure) @sleep 3 Makefile: $(srcdir)/Makefile.in $(SHELL) config.status $@ Makefile.in:; $(objects): $(SHELL) $(auxdir)/mkinstalldirs $@ # To make sure parallel builds will not fail $(srcdir)/include/SDL_revision.h: update-revision update-revision: $(SHELL) $(auxdir)/updaterev.sh .PHONY: all update-revision install install-bin install-hdrs install-lib install-data uninstall uninstall-bin uninstall-hdrs uninstall-lib uninstall-data clean distclean dist $(OBJECTS:.lo=.d) -include $(OBJECTS:.lo=.d) @DEPENDS@ @VERSION_DEPENDS@ @SDLMAIN_DEPENDS@ $(objects)/$(TARGET): $(OBJECTS) $(VERSION_OBJECTS) $(LIBTOOL) --mode=link $(CC) -o $@ $(OBJECTS) $(VERSION_OBJECTS) $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) $(objects)/$(SDLMAIN_TARGET): $(SDLMAIN_OBJECTS) $(AR) cru $@ $(SDLMAIN_OBJECTS) $(RANLIB) $@ install: all install-bin install-hdrs install-lib install-data install-bin: $(SHELL) $(auxdir)/mkinstalldirs $(DESTDIR)$(bindir) $(INSTALL) -m 755 sdl-config $(DESTDIR)$(bindir)/sdl-config install-hdrs: $(SHELL) $(auxdir)/mkinstalldirs $(DESTDIR)$(includedir)/SDL for file in $(HDRS); do \ $(INSTALL) -m 644 $(srcdir)/include/$$file $(DESTDIR)$(includedir)/SDL/$$file; \ done $(INSTALL) -m 644 include/SDL_config.h $(DESTDIR)$(includedir)/SDL/SDL_config.h install-lib: $(objects) $(objects)/$(TARGET) $(objects)/$(SDLMAIN_TARGET) $(SHELL) $(auxdir)/mkinstalldirs $(DESTDIR)$(libdir) $(LIBTOOL) --mode=install $(INSTALL) $(objects)/$(TARGET) $(DESTDIR)$(libdir)/$(TARGET) $(INSTALL) -m 644 $(objects)/$(SDLMAIN_TARGET) $(DESTDIR)$(libdir)/$(SDLMAIN_TARGET) $(RANLIB) $(DESTDIR)$(libdir)/$(SDLMAIN_TARGET) install-data: $(SHELL) $(auxdir)/mkinstalldirs $(DESTDIR)$(datadir)/aclocal $(INSTALL) -m 644 $(srcdir)/sdl.m4 $(DESTDIR)$(datadir)/aclocal/sdl.m4 $(SHELL) $(auxdir)/mkinstalldirs $(DESTDIR)$(libdir)/pkgconfig $(INSTALL) -m 644 sdl.pc $(DESTDIR)$(libdir)/pkgconfig uninstall: uninstall-bin uninstall-hdrs uninstall-lib uninstall-data uninstall-bin: rm -f $(DESTDIR)$(bindir)/sdl-config uninstall-hdrs: for file in $(HDRS); do \ rm -f $(DESTDIR)$(includedir)/SDL/$$file; \ done rm -f $(DESTDIR)$(includedir)/SDL/SDL_config.h -rmdir $(DESTDIR)$(includedir)/SDL uninstall-lib: $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$(TARGET) rm -f $(DESTDIR)$(libdir)/$(SDLMAIN_TARGET) uninstall-data: rm -f $(DESTDIR)$(datadir)/aclocal/sdl.m4 rm -f $(DESTDIR)$(libdir)/pkgconfig/sdl.pc clean: rm -rf $(objects) if test -f test/Makefile; then (cd test; $(MAKE) $@); fi distclean: clean rm -f Makefile include/SDL_config.h sdl-config rm -f SDL.qpg rm -f config.status config.cache config.log libtool rm -rf $(srcdir)/autom4te* find $(srcdir) \( \ -name '*~' -o \ -name '*.bak' -o \ -name '*.old' -o \ -name '*.rej' -o \ -name '*.orig' -o \ -name '.#*' \) \ -exec rm -f {} \; cp $(srcdir)/include/SDL_config.h.default $(srcdir)/include/SDL_config.h if test -f test/Makefile; then (cd test; $(MAKE) $@); fi dist $(distfile): $(SHELL) $(auxdir)/mkinstalldirs $(distdir) tar cf - $(DIST) | (cd $(distdir); tar xf -) cp $(distdir)/include/SDL_config.h.default $(distdir)/include/SDL_config.h $(SHELL) $(distdir)/build-scripts/updaterev.sh rm -rf `find $(distdir) -name .svn` find $(distdir) \( \ -name '*~' -o \ -name '*.bak' -o \ -name '*.old' -o \ -name '*.rej' -o \ -name '*.orig' -o \ -name '.#*' \) \ -exec rm -f {} \; if test -f $(distdir)/test/Makefile; then (cd $(distdir)/test && make distclean); fi tar cvf - $(distdir) | gzip --best >$(distfile) rm -rf $(distdir) rpm: $(distfile) rpmbuild -ta $? # Run indent on the source to standardize coding style indent: @echo "Running indent... modified files:" @cd $(srcdir) && \ find . \( \ -name '*.h' -o \ -name '*.c' -o \ -name '*.cc' \) \ -print | fgrep -v ./Xcode | \ while read file; do \ indent "$$file" -o "$$file.indent"; \ if cmp "$$file" "$$file.indent" >/dev/null; then \ rm -f "$$file.indent"; \ else \ echo "$$file"; \ mv -f "$$file.indent" "$$file"; \ fi; \ done # Run indent and then commit modified files commit: indent svn commit # Create a SVN snapshot that people can run update on snapshot: $(SHELL) $(auxdir)/snapshot.sh