diff options
| author | Martijn Berger <martijn.berger@gmail.com> | 2016-03-31 15:05:38 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-04-05 11:36:11 +0300 |
| commit | 02081f86d1eefaec54a4758939b004d921175715 (patch) | |
| tree | f4d6b1eaba135900e599af74b2c4e21c55369458 | |
| parent | 8efe90f0a01fa3fcae68c02952aefb9c15c7c0d0 (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 198995a3874..1efaa142625 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1300,7 +1300,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 e825f53994b..ff6544cf0e3 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -1090,17 +1090,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 ".") |