[修正] UI改良,boostを静的リンクするように変更

devil-tamachan · Aug 11, 2017 · fb477e7 · fb477e7
1 parent 7fd2ffa
commit fb477e7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -4,6 +4,7 @@ project (MQShrinkWrap)
 add_definitions(-D_UNICODE -DUNICODE)
 
 add_definitions( -DBOOST_ALL_NO_LIB )
+set( Boost_USE_STATIC_LIBS   ON )
 find_package(Boost 1.64.0 COMPONENTS program_options filesystem REQUIRED)
 include_directories(${Boost_INCLUDE_DIRS})
 link_directories(${Boost_LIBRARY_DIR})

diff --git a/MQShrinkWrap.cpp b/MQShrinkWrap.cpp
@@ -150,10 +150,13 @@ ShrinkDialog::ShrinkDialog(MQWindowBase& parent) : MQDialog(parent)
   MQFrame *paramFrame = CreateHorizontalFrame(mainFrame);
   paramFrame->SetMatrixColumn(2);
 
+  CreateLabel(paramFrame, L"吸着させる頂点");
+  CreateLabel(paramFrame, L"選択された頂点");
+
   CreateLabel(paramFrame, L"吸着先");
   combo_guideobj = CreateComboBox(paramFrame);
 
-  CreateLabel(paramFrame, L"\"吸着先オブジェクト\"から非表示オブジェを除く");
+  CreateLabel(paramFrame, L"\"吸着先\"から非表示オブジェを除く");
   check_visibleObjOnly = CreateCheckBox(paramFrame);
   check_visibleObjOnly->SetChecked(true);
   check_visibleObjOnly->AddChangedEvent(this, &ShrinkDialog::uiChanged);