Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartijn Berger <martijn.berger@gmail.com>2016-03-31 15:05:38 +0300
committerMartijn Berger <martijn.berger@gmail.com>2016-03-31 15:05:46 +0300
commitc0cb9d75d625b75f2da9cd8389d2481711576c12 (patch)
treebac92c3916bd390ab757ac7ed735848b4a45e812 /source/creator
parent791a0852e8d7f17887896245ef62a826b2228648 (diff)
CMAKE disable building the windows launcher, fix type in delayloading of debug dll
Diffstat (limited to 'source/creator')
-rw-r--r--source/creator/CMakeLists.txt12
1 files changed, 1 insertions, 11 deletions
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 ".")