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

- updated for debian compliance

This commit is contained in:
Mark Vejvoda 2012-11-12 04:42:05 +00:00
parent df51816eb5
commit 2469503128
5 changed files with 2 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mk/cmake/Modules/FindLUA.cmake
View File

@ -9,9 +9,6 @@
# Redistribution and use is allowed according to the terms of the BSD license. # Redistribution and use is allowed according to the terms of the BSD license.
# For details see the accompanying COPYING-CMAKE-SCRIPTS file. # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
# [RCL] FIXME: is it future proof with names like lua5.1? Kubuntu does not provide
# a generic (version-independent) include directory for LUA...
OPTION(WANT_STATIC_LIBS "builds as many static libs as possible" OFF) OPTION(WANT_STATIC_LIBS "builds as many static libs as possible" OFF)
IF(WANT_STATIC_LIBS) IF(WANT_STATIC_LIBS)
OPTION(LUA_STATIC "Set to ON to link your project with static library (instead of DLL)." ON) OPTION(LUA_STATIC "Set to ON to link your project with static library (instead of DLL)." ON)

9
mk/cmake/Modules/FindwxWidgets.cmake
View File

@ -90,8 +90,6 @@
# License text for the above reference.) # License text for the above reference.)
# #
# FIXME: check this and provide a correct sample usage...
# Remember to connect back to the upper text.
# Sample usage with monolithic wx build: # Sample usage with monolithic wx build:
# #
# FIND_PACKAGE(wxWidgets COMPONENTS mono) # FIND_PACKAGE(wxWidgets COMPONENTS mono)
@ -138,8 +136,6 @@
# checking whether a minimal set was found. # checking whether a minimal set was found.
# FIXME: This and all the DBG_MSG calls should be removed after the
# module stabilizes.
# #
# Helper macro to control the debugging output globally. There are # Helper macro to control the debugging output globally. There are
# two versions for controlling how verbose your output should be. # two versions for controlling how verbose your output should be.
@ -257,7 +253,7 @@ IF(wxWidgets_FIND_STYLE STREQUAL "win32")
DBG_MSG_V("m_ucd = ${_UCD}") DBG_MSG_V("m_ucd = ${_UCD}")
DBG_MSG_V("m_dbg = ${_DBG}") DBG_MSG_V("m_dbg = ${_DBG}")
# FIXME: What if both regex libs are available. regex should be # What if both regex libs are available. regex should be
# found outside the loop and only wx${LIB}${_UCD}${_DBG}. # found outside the loop and only wx${LIB}${_UCD}${_DBG}.
# Find wxWidgets common libraries. # Find wxWidgets common libraries.
FOREACH(LIB ${wxWidgets_COMMON_LIBRARIES} scintilla) FOREACH(LIB ${wxWidgets_COMMON_LIBRARIES} scintilla)
@ -888,7 +884,7 @@ MARK_AS_ADVANCED(wxWidgets_wxrc_EXECUTABLE)
# using this approach. # using this approach.
# #
FUNCTION(WX_SPLIT_ARGUMENTS_ON _keyword _leftvar _rightvar) FUNCTION(WX_SPLIT_ARGUMENTS_ON _keyword _leftvar _rightvar)
# FIXME: Document that the input variables will be cleared. # Document that the input variables will be cleared.
#LIST(APPEND ${_leftvar} "") #LIST(APPEND ${_leftvar} "")
#LIST(APPEND ${_rightvar} "") #LIST(APPEND ${_rightvar} "")
SET(${_leftvar} "") SET(${_leftvar} "")
@ -920,7 +916,6 @@ ENDFUNCTION(WX_SPLIT_ARGUMENTS_ON)
# <depends_path> # <depends_path>
# ) # )
# #
# FIXME: Add documentation here...
# #
FUNCTION(WX_GET_DEPENDENCIES_FROM_XML FUNCTION(WX_GET_DEPENDENCIES_FROM_XML
_depends _depends

6
source/shared_lib/CMakeLists.txt
View File

@ -411,7 +411,6 @@ IF(BUILD_MEGAGLEST_MODEL_VIEWER OR BUILD_MEGAGLEST_MAP_EDITOR OR BUILD_MEGAGLEST
#MESSAGE(STATUS "Source files: ${MG_SOURCE_FILES}") #MESSAGE(STATUS "Source files: ${MG_SOURCE_FILES}")
#MESSAGE(STATUS "Include dirs: ${INCLUDE_DIRECTORIES}") #MESSAGE(STATUS "Include dirs: ${INCLUDE_DIRECTORIES}")
# FIXME: hackish, should be tested for
IF(APPLE) IF(APPLE)
SET(PLATFORM_SPECIFIC_DEFINES "-DHAVE_SYS_IOCTL_H") SET(PLATFORM_SPECIFIC_DEFINES "-DHAVE_SYS_IOCTL_H")
ELSEIF(WIN32) ELSEIF(WIN32)
@ -420,11 +419,6 @@ IF(BUILD_MEGAGLEST_MODEL_VIEWER OR BUILD_MEGAGLEST_MAP_EDITOR OR BUILD_MEGAGLEST
SET(PLATFORM_SPECIFIC_DEFINES "-DX11_AVAILABLE -DHAVE_SYS_IOCTL_H") SET(PLATFORM_SPECIFIC_DEFINES "-DX11_AVAILABLE -DHAVE_SYS_IOCTL_H")
ENDIF() ENDIF()
# FIXME: hackish...
# IF(WANT_STREFLOP)
# SET(STREFLOP_PROPERTIES "-DSTREFLOP_SSE -DLIBM_COMPILING_FLT32")
# ENDIF()
SET_SOURCE_FILES_PROPERTIES(${MG_SOURCE_FILES} PROPERTIES COMPILE_FLAGS SET_SOURCE_FILES_PROPERTIES(${MG_SOURCE_FILES} PROPERTIES COMPILE_FLAGS
"${PLATFORM_SPECIFIC_DEFINES} ${STREFLOP_PROPERTIES} ${CXXFLAGS}") "${PLATFORM_SPECIFIC_DEFINES} ${STREFLOP_PROPERTIES} ${CXXFLAGS}")

2
source/shared_lib/sources/streflop/CMakeLists.txt
View File

@ -12,8 +12,6 @@ INCLUDE_DIRECTORIES(
) )
SET(STREFLOP_SRC ${STREFLOP_GLOBBED_CPP}) SET(STREFLOP_SRC ${STREFLOP_GLOBBED_CPP})
# use SSE unconditionally (FIXME?)
#SET_SOURCE_FILES_PROPERTIES(${STREFLOP_SRC} PROPERTIES COMPILE_FLAGS "-DSTREFLOP_SSE -DLIBM_COMPILING_FLT32 -O3 ${CXXFLAGS}")
ADD_LIBRARY(streflop STATIC EXCLUDE_FROM_ALL ADD_LIBRARY(streflop STATIC EXCLUDE_FROM_ALL
${STREFLOP_SRC} ${STREFLOP_SRC}

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

@ -53,7 +53,6 @@ __ieee754_gammaf_r (Simple x, int *signgamp)
return x - x; return x - x;
} }
/* XXX FIXME. */
return __ieee754_expf (__ieee754_lgammaf_r (x, signgamp)); return __ieee754_expf (__ieee754_lgammaf_r (x, signgamp));
} }
} }