Skip to content

Commit daf3a80

Browse files
committed
Merge branch 'master' into release-0.15.0
2 parents 54c273e + c211e36 commit daf3a80

File tree

11 files changed

+44
-2000
lines changed

11 files changed

+44
-2000
lines changed

CMakeLists.txt

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -248,26 +248,6 @@ list(REMOVE_ITEM FE_SRC
248248
${PROJECT_SOURCE_DIR}/${DMDFE_PATH}/id.c
249249
${PROJECT_SOURCE_DIR}/${DMDFE_PATH}/impcnvtab.c
250250
)
251-
# Add/remove files for MSVC
252-
if(MSVC)
253-
list(APPEND FE_SRC
254-
${PROJECT_SOURCE_DIR}/vcbuild/strtold.c
255-
# See below why this don't work
256-
# if(CMAKE_CL_64)
257-
# ${PROJECT_SOURCE_DIR}/vcbuild/ldfpu.asm
258-
# endif()
259-
)
260-
if(CMAKE_CL_64)
261-
# MASM support does not work yet!
262-
add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/ldfpu.obj
263-
COMMAND ${CMAKE_ASM_MASM_COMPILER} /c /Fo${CMAKE_CURRENT_BINARY_DIR}/ldfpu.obj ${PROJECT_SOURCE_DIR}/vcbuild/ldfpu.asm
264-
DEPENDS ${PROJECT_SOURCE_DIR}/vcbuild/ldfpu.asm
265-
COMMENT "generate ldfpu.obj")
266-
list(APPEND FE_SRC
267-
${CMAKE_CURRENT_BINARY_DIR}/ldfpu.obj
268-
)
269-
endif()
270-
endif()
271251
set(LDC_SOURCE_FILES
272252
${LDC_GENERATED}
273253
${FE_SRC}

0 commit comments

Comments
 (0)