diff options
author | Martijn Berger <martijn.berger@gmail.com> | 2016-03-31 15:05:38 +0300 |
---|---|---|
committer | Martijn Berger <martijn.berger@gmail.com> | 2016-03-31 15:05:46 +0300 |
commit | c0cb9d75d625b75f2da9cd8389d2481711576c12 (patch) | |
tree | bac92c3916bd390ab757ac7ed735848b4a45e812 | |
parent | 791a0852e8d7f17887896245ef62a826b2228648 (diff) |
CMAKE disable building the windows launcher, fix type in delayloading of debug dll
-rw-r--r-- | CMakeLists.txt | 2 | ||||
-rw-r--r-- | source/creator/CMakeLists.txt | 12 |
2 files changed, 2 insertions, 12 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 99c07996598..f05e9680c0a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1316,7 +1316,7 @@ elseif(WIN32) set(OPENMP_DLL_NAME "vcomp140") endif() set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} /DELAYLOAD:${OPENMP_DLL_NAME}.dll delayimp.lib") - set(PLATFORM_LINKFLAGS_DEBUG "${PLATFORM_LINKFLAGS_DEBUG} /DELAYLOAD::${OPENMP_DLL_NAME}d.dll delayimp.lib") + set(PLATFORM_LINKFLAGS_DEBUG "${PLATFORM_LINKFLAGS_DEBUG} /DELAYLOAD:${OPENMP_DLL_NAME}d.dll delayimp.lib") endif() if(NOT DEFINED LIBDIR) diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index 32ab74b860e..273e5b33d0d 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -1100,17 +1100,7 @@ setup_liblinks(blender) # Setup launcher if(WIN32 AND NOT WITH_PYTHON_MODULE) - set(LAUNCHER_SRC - creator_launch_win.c - ${CMAKE_SOURCE_DIR}/release/windows/icons/winblender.rc - ) - add_executable(blender-launcher ${LAUNCHER_SRC}) - target_link_libraries(blender-launcher bf_intern_utfconv ${PLATFORM_LINKLIBS}) - - set_target_properties(blender PROPERTIES OUTPUT_NAME blender-app) - set_target_properties(blender-launcher PROPERTIES OUTPUT_NAME blender) - - install(TARGETS blender blender-launcher + install(TARGETS blender COMPONENT Blender DESTINATION ".") |