Commit: 02081f86d1eefaec54a4758939b004d921175715
Author: Martijn Berger
Date: Thu Mar 31 14:05:38 2016 +0200
Branches: blender-v2.77-release
https://developer.blender.org/rB02081f86d1eefaec54a4758939b004d921175715
CMAKE disable building the windows launcher, fix type in delayloading of debug
dll
===================================================================
M CMakeLists.txt
M source/creator/CMakeLists.txt
===================================================================
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 198995a..1efaa14 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 e825f53..ff6544c 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 ".")
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
