[Bf-blender-cvs] [c0cb9d7] master: CMAKE disable building the windows launcher, fix type in delayloading of debug dll

[Martijn Berger]

Commit: c0cb9d75d625b75f2da9cd8389d2481711576c12
Author: Martijn Berger
Date:   Thu Mar 31 14:05:38 2016 +0200
Branches: master
https://developer.blender.org/rBc0cb9d75d625b75f2da9cd8389d2481711576c12

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 99c0799..f05e968 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 32ab74b..273e5b3 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 ".")