Rampoina
/
MegaGlest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- attempt to cleanup a few warnings 

- attempt to get git rev info each compile (not just when running cmake)
This commit is contained in:
SoftCoder 2013-12-11 23:16:56 -08:00
parent c91b92901b
commit c887b0c357
4 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
CMakeLists.txt
View File

@ -191,6 +191,7 @@ IF(CMAKE_COMPILER_IS_GNUCXX OR MINGW)
# Get the git revision info for the binary
SET(HAS_GIT "FALSE")
SET(GIT_LIVE_REV_CMD "")
OPTION(WANT_GIT_STAMP "use git revision stamp" ON)
IF(WANT_GIT_STAMP)
@ -218,16 +219,19 @@ IF(CMAKE_COMPILER_IS_GNUCXX OR MINGW)
OUTPUT_STRIP_TRAILING_WHITESPACE
)
MESSAGE(STATUS "Using GIT revision stamp: [${GIT_COMMIT_COUNT}.${GIT_SHA1}]")
SET(GIT_LIVE_REV_CMD "`git log -1 --format=%h`.`git rev-list HEAD --count`")
MESSAGE(STATUS "Using GIT revision stamp: [${GIT_COMMIT_COUNT}.${GIT_SHA1}] CMD [${GIT_LIVE_REV_CMD}]")
ENDIF()
ENDIF()
IF(APPLE AND NOT CMAKE_COMPILER_IS_GNUCXX)
SET(GIT_VERSION_CMD "-DGITVERSION='\\\\'${GIT_COMMIT_COUNT}.${GIT_SHA1}\\\\''")
ELSE()
SET(GIT_VERSION_CMD "-DGITVERSION='\\\"${GIT_COMMIT_COUNT}.${GIT_SHA1}\\\"'")
ENDIF()
IF(APPLE AND NOT CMAKE_COMPILER_IS_GNUCXX)
SET(GIT_VERSION_CMD "-DGITVERSION='\\\\'${GIT_LIVE_REV_CMD}\\\\''")
ELSE()
SET(GIT_VERSION_CMD "-DGITVERSION='\\\"${GIT_LIVE_REV_CMD}\\\"'")
# SET(SVN_VERSION_CMD "-DSVNVERSION='\\\"`svnversion -n ${PROJECT_SOURCE_DIR}`\\\"'")
ENDIF()
IF(CMAKE_INSTALL_PREFIX STREQUAL "")
MESSAGE(STATUS "*NOTE: NOT USING a Custom Data Install Path...")

6
source/shared_lib/include/streflop/libm/headers/features.h
View File

@ -287,11 +287,17 @@
#endif
/* We do support the IEC 559 math functionality, real and complex. */
#if !defined(__STDC_IEC_559__)
#define __STDC_IEC_559__ 1
#endif
#if !defined(__STDC_IEC_559_COMPLEX__)
#define __STDC_IEC_559_COMPLEX__ 1
#endif
/* wchar_t uses ISO 10646-1 (2nd ed., published 2000-09-15) / Unicode 3.1. */
#if !defined(__STDC_ISO_10646__)
#define __STDC_ISO_10646__ 200009L
#endif
/* This macro indicates that the installed library is the GNU C Library.
For historic reasons the value now is 6 and this will stay from now

2
source/shared_lib/sources/streflop/libm/flt-32/e_gammaf_r.cpp
View File

@ -46,7 +46,7 @@ __ieee754_gammaf_r (Simple x, int *signgamp)
*signgamp = 0;
return (x - x) / (x - x);
}
if (hx == 0xff800000)
if ((u_int32_t)hx == 0xff800000)
{
/* x == -Inf. According to ISO this is NaN. */
*signgamp = 0;

1
source/shared_lib/sources/streflop/libm/flt-32/e_lgammaf_r.cpp
View File

@ -163,6 +163,7 @@ static Simple zero= 0.0000000000e+00f;
GET_FLOAT_WORD(hx,x);
/* purge off +-inf, NaN, +-0, and negative arguments */
nadj = 0;
*signgamp = 1;
ix = hx&0x7fffffff;
if(ix>=0x7f800000) return x*x;