zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-11 23:32:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of https://github.com/rheit/zdoom

Browse source
This commit is contained in:
Christoph Oelckers 2014-07-09 09:16:30 +02:00
commit e691341541
3 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
CMakeLists.txt
View file

@ -227,6 +227,12 @@ endif( GME_FOUND AND NOT FORCE_INTERNAL_GME )
set( LZMA_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/lzma/C" ) set( LZMA_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/lzma/C" )
if( NOT CMAKE_CROSSCOMPILING )
if( NOT CROSS_EXPORTS )
set( CROSS_EXPORTS "" )
endif( NOT CROSS_EXPORTS )
endif( NOT CMAKE_CROSSCOMPILING )
add_subdirectory( lzma ) add_subdirectory( lzma )
add_subdirectory( tools ) add_subdirectory( tools )
add_subdirectory( dumb ) add_subdirectory( dumb )

2
gdtoa/CMakeLists.txt
View file

@ -34,7 +34,7 @@ if( NOT MSVC AND NOT APPLE )
DEPENDS qnan ) DEPENDS qnan )
set( GEN_FP_FILES arith.h gd_qnan.h ) set( GEN_FP_FILES arith.h gd_qnan.h )
set( GEN_FP_DEPS ${CMAKE_CURRENT_BINARY_DIR}/arith.h ${CMAKE_CURRENTY_BINARY_DIR}/gd_qnan.h ) set( GEN_FP_DEPS ${CMAKE_CURRENT_BINARY_DIR}/arith.h ${CMAKE_CURRENT_BINARY_DIR}/gd_qnan.h )
endif( NOT MSVC AND NOT APPLE ) endif( NOT MSVC AND NOT APPLE )
add_library( gdtoa add_library( gdtoa

7
src/CMakeLists.txt
View file

@ -595,12 +595,13 @@ else( WIN32 )
endif( APPLE ) endif( APPLE )
endif( WIN32 ) endif( WIN32 )
if( NOT ASM_SOURCES )
set( ASM_SOURCES "" )
endif( NOT ASM_SOURCES )
if( NO_ASM ) if( NO_ASM )
add_definitions( -DNOASM ) add_definitions( -DNOASM )
else( NO_ASM ) else( NO_ASM )
if( NOT ASM_SOURCES )
set( ASM_SOURCES "" )
endif( NOT ASM_SOURCES )
if( X64 ) if( X64 )
ADD_ASM_FILE( asm_x86_64 tmap3 ) ADD_ASM_FILE( asm_x86_64 tmap3 )
else( X64 ) else( X64 )