Skip to content
This repository has been archived by the owner. It is now read-only.
Permalink
Browse files

Fine tuned revision code, updated testver

  • Loading branch information
slouken committed Jan 4, 2009
1 parent bac9b61 commit 9949283f7aea14447235a20439f69c95ab9b483e
Showing with 14 additions and 18 deletions.
  1. +4 −1 Makefile.in
  2. +1 −1 src/SDL.c
  3. +9 −16 test/testver.c
@@ -35,6 +35,7 @@ WINDRES = @WINDRES@
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 @@ $(objects):
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 @@ depend:

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)
@@ -300,7 +300,7 @@ SDL_GetVersion(SDL_version * ver)
int
SDL_GetRevision()
{
SDL_REVISION;
return SDL_REVISION;
}

#if defined(__OS2__)
@@ -12,26 +12,19 @@ int
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);
}

0 comments on commit 9949283

Please sign in to comment.