FMudanyali/FreeGLUT-Vita
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Need for our XParseGeometry implementation now detected by CMake

Browse Source 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1113 7f0cb862-5218-0410-a997-914c9d46530a
This commit is contained in:
dcnieho 2012-03-11 15:26:01 +00:00
parent b66e4bfa9d
commit 2549248d0c
3 changed files with 27 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
freeglut/freeglut/CMakeLists.txt
View File

@ -43,8 +43,6 @@ ENDIF()
IF(WIN32) # TODO: is this true for 64 bit as well? Chaneg to WINDOWS? IF(WIN32) # TODO: is this true for 64 bit as well? Chaneg to WINDOWS?
LIST(APPEND FREEGLUT_SRCS LIST(APPEND FREEGLUT_SRCS
src/util/xparsegeometry_repl.c # TODO: instead of this, detect if function is available and include if not
src/util/xparsegeometry_repl.h
src/mswin/fg_cursor_mswin.c src/mswin/fg_cursor_mswin.c
src/mswin/fg_display_mswin.c src/mswin/fg_display_mswin.c
src/mswin/fg_ext_mswin.c src/mswin/fg_ext_mswin.c
@ -62,8 +60,6 @@ IF(WIN32) # TODO: is this true for 64 bit as well? Chaneg to WINDOWS?
) )
ELSEIF(ANDROID) ELSEIF(ANDROID)
LIST(APPEND FREEGLUT_SRCS LIST(APPEND FREEGLUT_SRCS
src/util/xparsegeometry_repl.c
src/util/xparsegeometry_repl.h
src/egl/fg_internal_egl.h src/egl/fg_internal_egl.h
src/egl/fg_display_egl.c src/egl/fg_display_egl.c
src/egl/fg_init_egl.c src/egl/fg_init_egl.c
@ -172,6 +168,13 @@ CHECK_INCLUDE_FILES(usbhid.h HAVE_USBHID_H)
CHECK_FUNCTION_EXISTS(gettimeofday HAVE_GETTIMEOFDAY) CHECK_FUNCTION_EXISTS(gettimeofday HAVE_GETTIMEOFDAY)
CHECK_FUNCTION_EXISTS(vfprintf HAVE_VFPRINTF) CHECK_FUNCTION_EXISTS(vfprintf HAVE_VFPRINTF)
CHECK_FUNCTION_EXISTS(_doprnt HAVE_DOPRNT) CHECK_FUNCTION_EXISTS(_doprnt HAVE_DOPRNT)
CHECK_FUNCTION_EXISTS(XParseGeometry HAVE_XPARSEGEOMETRY)
IF (NOT HAVE_XPARSEGEOMETRY)
LIST(APPEND FREEGLUT_SRCS
src/util/xparsegeometry_repl.c
src/util/xparsegeometry_repl.h)
SET(NEED_XPARSEGEOMETRY_IMPL TRUE)
ENDIF()
# decide on suitable type for internal time keeping, 64-bit if possible # decide on suitable type for internal time keeping, 64-bit if possible
CHECK_INCLUDE_FILES(stdint.h HAVE_STDINT_H) CHECK_INCLUDE_FILES(stdint.h HAVE_STDINT_H)
CHECK_INCLUDE_FILES(inttypes.h HAVE_INTTYPES_H) CHECK_INCLUDE_FILES(inttypes.h HAVE_INTTYPES_H)

1
freeglut/freeglut/config.h.in
View File

@ -12,6 +12,7 @@
#cmakedefine HAVE_GETTIMEOFDAY #cmakedefine HAVE_GETTIMEOFDAY
#cmakedefine HAVE_VFPRINTF #cmakedefine HAVE_VFPRINTF
#cmakedefine HAVE_DOPRNT #cmakedefine HAVE_DOPRNT
#cmakedefine NEED_XPARSEGEOMETRY_IMPL
#cmakedefine HAVE_STDINT_H #cmakedefine HAVE_STDINT_H
#cmakedefine HAVE_INTTYPES_H #cmakedefine HAVE_INTTYPES_H
#define HAVE_ULONG_LONG ${HAVE_ULONG_LONG} #define HAVE_ULONG_LONG ${HAVE_ULONG_LONG}

2
freeglut/freeglut/src/fg_init.c
View File

@ -315,7 +315,7 @@ void fgDeinitialize( void )
/* -- INTERFACE FUNCTIONS -------------------------------------------------- */ /* -- INTERFACE FUNCTIONS -------------------------------------------------- */
#if !TARGET_HOST_POSIX_X11 #if defined(NEED_XPARSEGEOMETRY_IMPL)
# include "util/xparsegeometry_repl.h" # include "util/xparsegeometry_repl.h"
#endif #endif