[libflac] fix build with MSBuild generator

This commit is contained in:
codicodi 2017-04-27 14:17:29 +02:00
parent d6d506d678
commit f3e520b2d7
2 changed files with 8 additions and 7 deletions

View File

@ -25,12 +25,13 @@ endif()
if(LIBFLAC_ARCHITECTURE MATCHES x86) if(LIBFLAC_ARCHITECTURE MATCHES x86)
add_definitions(-DFLAC__CPU_IA32) add_definitions(-DFLAC__CPU_IA32)
add_definitions(-DFLAC__HAS_NASM) add_definitions(-DFLAC__HAS_NASM)
enable_language(ASM_NASM) file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/nasm)
list(APPEND LIBFLAC_SOURCES foreach(ASM_SOURCE cpu_asm fixed_asm lpc_asm)
src/libFLAC/ia32/cpu_asm.nasm execute_process(COMMAND nasm "-i${PROJECT_SOURCE_DIR}/src/libFLAC/ia32/" -f win32 -d OBJ_FORMAT_win32 -f win32
src/libFLAC/ia32/fixed_asm.nasm -o "${CMAKE_BINARY_DIR}/nasm/${ASM_SOURCE}.obj" "${PROJECT_SOURCE_DIR}/src/libFLAC/ia32/${ASM_SOURCE}.nasm"
src/libFLAC/ia32/lpc_asm.nasm) WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
set(CMAKE_ASM_NASM_FLAGS "-i\"${PROJECT_SOURCE_DIR}/src/libFLAC/ia32/\" -f win32 -d OBJ_FORMAT_win32") list(APPEND LIBFLAC_SOURCES ${CMAKE_BINARY_DIR}/nasm/${ASM_SOURCE}.obj)
endforeach()
elseif(LIBFLAC_ARCHITECTURE MATCHES x64) elseif(LIBFLAC_ARCHITECTURE MATCHES x64)
add_definitions(-DFLAC__CPU_X86_64) add_definitions(-DFLAC__CPU_X86_64)
add_definitions(-DENABLE_64_BIT_WORDS) add_definitions(-DENABLE_64_BIT_WORDS)

View File

@ -1,4 +1,4 @@
Source: libflac Source: libflac
Version: 1.3.2-1 Version: 1.3.2-2
Description: Library for manipulating FLAC files Description: Library for manipulating FLAC files
Build-Depends: libogg Build-Depends: libogg