Explorar o código

remove all unnecessary stuff from visualtest configury.

Ozkan Sezer %!s(int64=3) %!d(string=hai) anos
pai
achega
b8d839c0c0
Modificáronse 4 ficheiros con 62 adicións e 932 borrados
  1. 0 23
      visualtest/config.h
  2. 0 22
      visualtest/config.h.in
  3. 60 758
      visualtest/configure
  4. 2 129
      visualtest/configure.ac

+ 0 - 23
visualtest/config.h

@@ -1,23 +0,0 @@
-/* config.h.  Generated from config.h.in by configure.  */
-/* config.h.in.  Generated from configure.in by autoheader.  */
-
-/* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT "[email protected]"
-
-/* Define to the full name of this package. */
-#define PACKAGE_NAME "sdlvisualtest"
-
-/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "sdlvisualtest 0.01"
-
-/* Define to the one symbol short name of this package. */
-#define PACKAGE_TARNAME "sdlvisualtest"
-
-/* Define to the home page for this package. */
-#define PACKAGE_URL ""
-
-/* Define to the version of this package. */
-#define PACKAGE_VERSION "0.01"
-
-/* Define to empty if `const' does not conform to ANSI C. */
-/* #undef const */

+ 0 - 22
visualtest/config.h.in

@@ -1,22 +0,0 @@
-/* config.h.in.  Generated from configure.ac by autoheader.  */
-
-/* Define to the address where bug reports for this package should be sent. */
-#undef PACKAGE_BUGREPORT
-
-/* Define to the full name of this package. */
-#undef PACKAGE_NAME
-
-/* Define to the full name and version of this package. */
-#undef PACKAGE_STRING
-
-/* Define to the one symbol short name of this package. */
-#undef PACKAGE_TARNAME
-
-/* Define to the home page for this package. */
-#undef PACKAGE_URL
-
-/* Define to the version of this package. */
-#undef PACKAGE_VERSION
-
-/* Define to empty if `const' does not conform to ANSI C. */
-#undef const

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 60 - 758
visualtest/configure


+ 2 - 129
visualtest/configure.ac

@@ -1,5 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 dnl Process this file with autoconf to produce a configure script.
-AC_INIT([sdlvisualtest], [0.01], [[email protected]])
+AC_INIT
+AC_CONFIG_SRCDIR([unittest/testquit.c])
 
 
 dnl Detect the canonical build and host environments
 dnl Detect the canonical build and host environments
 AC_CONFIG_AUX_DIR([../build-scripts])
 AC_CONFIG_AUX_DIR([../build-scripts])
@@ -8,82 +9,18 @@ AC_CANONICAL_HOST
 dnl Check for tools
 dnl Check for tools
 AC_PROG_CC
 AC_PROG_CC
 
 
-dnl Check for compiler environment
-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  (Haiku, for example, sets none of these.)
-ISUNIX="false"
-ISWINDOWS="false"
-ISMACOSX="false"
-
 dnl Figure out which math or extra library to use
 dnl Figure out which math or extra library to use
 case "$host" in
 case "$host" in
     *-*-cygwin* | *-*-mingw*)
     *-*-cygwin* | *-*-mingw*)
-        ISWINDOWS="true"
         EXE=".exe"
         EXE=".exe"
-        MATHLIB=""
         EXTRALIB="-lshlwapi"
         EXTRALIB="-lshlwapi"
-        SYS_GL_LIBS="-lopengl32"
-        ;;
-    *-*-haiku*)
-        EXE=""
-        MATHLIB=""
-        EXTRALIB=""
-        SYS_GL_LIBS="-lGL"
-        ;;
-    *-*-darwin*)
-        ISMACOSX="true"
-        EXE=""
-        MATHLIB=""
-        EXTRALIB=""
-        ;;
-    *-*-aix*)
-        ISUNIX="true"
-        EXE=""
-        if test x$ac_cv_c_compiler_gnu = xyes; then
-            CFLAGS="-mthreads"
-        fi
-        MATHLIB=""
-        EXTRALIB=""
-        SYS_GL_LIBS=""
-        ;;
-    *-*-mint*)
-        EXE=""
-        MATHLIB=""
-        EXTRALIB=""
-        AC_PATH_PROG(OSMESA_CONFIG, osmesa-config, no)
-        if test "x$OSMESA_CONFIG" = "xyes"; then
-            OSMESA_CFLAGS=`$OSMESA_CONFIG --cflags`
-            OSMESA_LIBS=`$OSMESA_CONFIG --libs`
-            CFLAGS="$CFLAGS $OSMESA_CFLAGS"
-            SYS_GL_LIBS="$OSMESA_LIBS"
-        else
-            SYS_GL_LIBS="-lOSMesa"
-        fi
-        ;;
-    *-*-qnx*)
-        EXE=""
-        MATHLIB=""
-        EXTRALIB=""
-        SYS_GL_LIBS="-lGLES_CM"
         ;;
         ;;
     *)
     *)
-        dnl Oh well, call it Unix...
-        ISUNIX="true"
         EXE=""
         EXE=""
-        MATHLIB="-lm"
         EXTRALIB=""
         EXTRALIB=""
-        SYS_GL_LIBS="-lGL"
         ;;
         ;;
 esac
 esac
 AC_SUBST(EXE)
 AC_SUBST(EXE)
-AC_SUBST(MATHLIB)
-AC_SUBST(EXTRALIB)
-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
@@ -94,75 +31,11 @@ AM_PATH_SDL2($SDL_VERSION,
 CFLAGS="$CFLAGS $SDL_CFLAGS"
 CFLAGS="$CFLAGS $SDL_CFLAGS"
 LIBS="$LIBS -lSDL2_test $SDL_LIBS $EXTRALIB"
 LIBS="$LIBS -lSDL2_test $SDL_LIBS $EXTRALIB"
 
 
-dnl Check for X11 path, needed for OpenGL on some systems
-AC_PATH_X
-if test x$have_x = xyes; then
-    if test x$ac_x_includes = xno || test x$ac_x_includes = x; then
-        :
-    else
-        CFLAGS="$CFLAGS -I$ac_x_includes"
-    fi
-    if test x$ac_x_libraries = xno || test x$ac_x_libraries = x; then
-        :
-    else
-        XPATH="-L$ac_x_libraries"
-    fi
-fi
-
-dnl Check for OpenGL
-AC_MSG_CHECKING(for OpenGL support)
-have_opengl=no
-AC_TRY_COMPILE([
- #include "SDL_opengl.h"
-],[
-],[
-have_opengl=yes
-])
-AC_MSG_RESULT($have_opengl)
-
-dnl Check for OpenGL ES
-AC_MSG_CHECKING(for OpenGL ES support)
-have_opengles=no
-AC_TRY_COMPILE([
- #if defined (__IPHONEOS__)
-    #include <OpenGLES/ES1/gl.h>
- #else
-    #include <GLES/gl.h>
- #endif /* __QNXNTO__ */
-],[
-],[
-have_opengles=yes
-])
-AC_MSG_RESULT($have_opengles)
-
-GLLIB=""
-if test x$have_opengles = xyes; then
-    CFLAGS="$CFLAGS -DHAVE_OPENGLES"
-    GLLIB="$XPATH -lGLESv1_CM"
-elif test x$have_opengl = xyes; then
-    CFLAGS="$CFLAGS -DHAVE_OPENGL"
-    GLLIB="$XPATH $SYS_GL_LIBS"
-else
-    GLLIB=""
-fi
-
-AC_SUBST(GLLIB)
-
-dnl Check for SDL_ttf
-AC_CHECK_LIB(SDL2_ttf, TTF_Init, have_SDL_ttf=yes)
-if test x$have_SDL_ttf = xyes; then
-    CFLAGS="$CFLAGS -DHAVE_SDL_TTF"
-    SDL_TTF_LIB="-lSDL2_ttf"
-fi
-AC_SUBST(SDL_TTF_LIB)
-
 PKG_CHECK_MODULES(LIBUNWIND, libunwind, have_libunwind=yes, have_libunwind=no)
 PKG_CHECK_MODULES(LIBUNWIND, libunwind, have_libunwind=yes, have_libunwind=no)
 if test x$have_libunwind = xyes ; then
 if test x$have_libunwind = xyes ; then
    LIBS="$LIBS $LIBUNWIND_LIBS"
    LIBS="$LIBS $LIBUNWIND_LIBS"
 fi
 fi
 
 
 dnl Finally create all the generated files
 dnl Finally create all the generated files
-dnl AC_OUTPUT([Makefile])
-AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_FILES([Makefile])
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT
 AC_OUTPUT

Algúns arquivos non se mostraron porque demasiados arquivos cambiaron neste cambio