pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Nasty attempt to fix building of testnative across various platforms.

Browse source 
The world longs for a hero named CMake.
This commit is contained in:
Ryan C. Gordon 2012-08-09 14:28:45 -04:00
parent 8912814135
commit 82f3760264
3 changed files with 2108 additions and 2161 deletions
Download patch file Download diff file Expand all files Collapse all files

14
test/Makefile.in
View file

@ -121,11 +121,25 @@ testloadso$(EXE): $(srcdir)/testloadso.c
testlock$(EXE): $(srcdir)/testlock.c testlock$(EXE): $(srcdir)/testlock.c
$(CC) -o $@ $? $(CFLAGS) $(LIBS) $(CC) -o $@ $? $(CFLAGS) $(LIBS)
ifeq (@ISMACOSX@,true)
testnative$(EXE): $(srcdir)/testnative.c \ testnative$(EXE): $(srcdir)/testnative.c \
$(srcdir)/testnativecocoa.m \ $(srcdir)/testnativecocoa.m \
$(srcdir)/testnativew32.c \ $(srcdir)/testnativew32.c \
$(srcdir)/testnativex11.c $(srcdir)/testnativex11.c
$(CC) -o $@ $? $(CFLAGS) $(LIBS) -L/usr/X11/lib -lX11 -framework Cocoa $(CC) -o $@ $? $(CFLAGS) $(LIBS) -L/usr/X11/lib -lX11 -framework Cocoa
endif
ifeq (@ISWINDOWS@,true)
testnative$(EXE): $(srcdir)/testnative.c \
$(srcdir)/testnativew32.c
$(CC) -o $@ $? $(CFLAGS) $(LIBS)
endif
ifeq (@ISUNIX@,true)
testnative$(EXE): $(srcdir)/testnative.c \
$(srcdir)/testnativex11.c
$(CC) -o $@ $? $(CFLAGS) $(LIBS) -L/usr/X11/lib -lX11
endif
testoverlay2$(EXE): $(srcdir)/testoverlay2.c testoverlay2$(EXE): $(srcdir)/testoverlay2.c
$(CC) -o $@ $? $(CFLAGS) $(LIBS) $(CC) -o $@ $? $(CFLAGS) $(LIBS)

4240
test/configure vendored
View file

File diff suppressed because it is too large Load diff

15
test/configure.in
View file

@ -13,9 +13,17 @@ dnl Check for compiler environment
AC_C_CONST AC_C_CONST
dnl We only care about this for building testnative at the moment, so these
dnl values shouldn't be considered absolute truth.
dnl (BeOS, for example, sets none of these.)
ISUNIX="false"
ISWINDOWS="false"
ISMACOSX="false"
dnl Figure out which math library to use dnl Figure out which math library to use
case "$host" in case "$host" in
*-*-cygwin* | *-*-mingw32*) *-*-cygwin* | *-*-mingw32*)
ISWINDOWS="true"
EXE=".exe" EXE=".exe"
MATHLIB="" MATHLIB=""
SYS_GL_LIBS="-lopengl32" SYS_GL_LIBS="-lopengl32"
@ -26,11 +34,13 @@ case "$host" in
SYS_GL_LIBS="-lGL" SYS_GL_LIBS="-lGL"
;; ;;
*-*-darwin* ) *-*-darwin* )
ISMACOSX="true"
EXE="" EXE=""
MATHLIB="" MATHLIB=""
SYS_GL_LIBS="-Wl,-framework,OpenGL" SYS_GL_LIBS="-Wl,-framework,OpenGL"
;; ;;
*-*-aix*) *-*-aix*)
ISUNIX="true"
EXE="" EXE=""
if test x$ac_cv_prog_gcc = xyes; then if test x$ac_cv_prog_gcc = xyes; then
CFLAGS="-mthreads" CFLAGS="-mthreads"
@ -56,6 +66,8 @@ case "$host" in
SYS_GL_LIBS="-lGLES_CM" SYS_GL_LIBS="-lGLES_CM"
;; ;;
*) *)
dnl Oh well, call it Unix...
ISUNIX="true"
EXE="" EXE=""
MATHLIB="-lm" MATHLIB="-lm"
SYS_GL_LIBS="-lGL" SYS_GL_LIBS="-lGL"
@ -63,6 +75,9 @@ case "$host" in
esac esac
AC_SUBST(EXE) AC_SUBST(EXE)
AC_SUBST(MATHLIB) AC_SUBST(MATHLIB)
AC_SUBST(ISMACOSX)
AC_SUBST(ISWINDOWS)
AC_SUBST(ISUNIX)
dnl Check for SDL dnl Check for SDL
SDL_VERSION=2.0.0 SDL_VERSION=2.0.0