Mercurial > sdl-ios-xcode
changeset 2983:388c5a2daeac
Fine tuned revision code, updated testver
| author | Sam Lantinga <slouken@libsdl.org> |
|---|---|
| date | Sun, 04 Jan 2009 05:27:13 +0000 |
| parents | b64c1d23039b |
| children | 0b160c970b7e |
| files | Makefile.in src/SDL.c test/testver.c |
| diffstat | 3 files changed, 14 insertions(+), 18 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile.in Sun Jan 04 05:08:12 2009 +0000 +++ b/Makefile.in Sun Jan 04 05:27:13 2009 +0000 @@ -35,6 +35,7 @@ TARGET = libSDL.la SOURCES = @SOURCES@ OBJECTS = @OBJECTS@ +REVISION = $(srcdir)/include/SDL_revision.h SDLMAIN_TARGET = libSDLmain.a SDLMAIN_SOURCES = @SDLMAIN_SOURCES@ @@ -66,6 +67,8 @@ update-revision: $(SHELL) $(auxdir)/updaterev.sh +$(REVISION): update-revision + .PHONY: all update-revision 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 depend: @SOURCES="$(SOURCES)" INCLUDE="$(INCLUDE)" output="$(depend)" \ @@ -78,7 +81,7 @@ include $(depend) -$(objects)/$(TARGET): update-revision $(OBJECTS) +$(objects)/$(TARGET): $(REVISION) $(OBJECTS) $(LIBTOOL) --mode=link $(CC) -o $@ $(OBJECTS) $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) $(objects)/$(SDLMAIN_TARGET): $(SDLMAIN_OBJECTS)
--- a/src/SDL.c Sun Jan 04 05:08:12 2009 +0000 +++ b/src/SDL.c Sun Jan 04 05:27:13 2009 +0000 @@ -300,7 +300,7 @@ int SDL_GetRevision() { - SDL_REVISION; + return SDL_REVISION; } #if defined(__OS2__)
--- a/test/testver.c Sun Jan 04 05:08:12 2009 +0000 +++ b/test/testver.c Sun Jan 04 05:27:13 2009 +0000 @@ -12,26 +12,19 @@ main(int argc, char *argv[]) { SDL_version compiled; + SDL_version linked; - /* Initialize SDL */ - if (SDL_Init(0) < 0) { - fprintf(stderr, "Couldn't initialize SDL: %s\n", SDL_GetError()); - exit(1); - } -#ifdef DEBUG - fprintf(stderr, "SDL initialized\n"); -#endif -#if SDL_VERSION_ATLEAST(1, 2, 0) - printf("Compiled with SDL 1.2 or newer\n"); +#if SDL_VERSION_ATLEAST(1, 3, 0) + printf("Compiled with SDL 1.3 or newer\n"); #else - printf("Compiled with SDL older than 1.2\n"); + printf("Compiled with SDL older than 1.3\n"); #endif SDL_VERSION(&compiled); - printf("Compiled version: %d.%d.%d\n", - compiled.major, compiled.minor, compiled.patch); - printf("Linked version: %d.%d.%d\n", - SDL_Linked_Version()->major, - SDL_Linked_Version()->minor, SDL_Linked_Version()->patch); + printf("Compiled version: %d.%d.%d-%d\n", + compiled.major, compiled.minor, compiled.patch, SDL_REVISION); + SDL_GetVersion(&linked); + printf("Linked version: %d.%d.%d-%d\n", + linked.major, linked.minor, linked.patch, SDL_GetRevision()); SDL_Quit(); return (0); }