Fixed compilation on Windows,

removed debugging menu and debugging output.
prusa3d · Mar 6, 2018 · e26ccfc · e26ccfc
1 parent ca0f613
commit e26ccfc
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 18 deletions.
diff --git a/lib/Slic3r/GUI/MainFrame.pm b/lib/Slic3r/GUI/MainFrame.pm
@@ -174,7 +174,6 @@ sub _init_tabpanel {
     EVT_COMMAND($self, -1, $BUTTON_BROWSE_EVENT, sub {
         my ($self, $event) = @_;
         my $msg = $event->GetString;
-        print "BUTTON_BROWSE_EVENT: ", $msg, "\n";
 
         # look for devices
         my $entries;
@@ -197,7 +196,6 @@ sub _init_tabpanel {
     EVT_COMMAND($self, -1, $BUTTON_TEST_EVENT, sub {
         my ($self, $event) = @_;
         my $msg = $event->GetString;
-        print "BUTTON_TEST_EVENT: ", $msg, "\n";
 
         my $ua = LWP::UserAgent->new;
         $ua->timeout(10);
@@ -410,13 +408,6 @@ sub _init_menubar {
         });
     }
 
-    my $hokusMenu = Wx::Menu->new;    # XXX: tmp
-    {
-        $self->_append_menu_item($hokusMenu, "Pokus", "Pokus", sub {
-            Slic3r::Http::pokus();
-        });
-    }
-
     # menubar
     # assign menubar to frame after appending items, otherwise special items
     # will not be handled correctly
@@ -431,7 +422,6 @@ sub _init_menubar {
         # (Select application language from the list of installed languages)
         Slic3r::GUI::add_debug_menu($menubar, $self->{lang_ch_event});
         $menubar->Append($helpMenu, L("&Help"));
-        $menubar->Append($hokusMenu, "Hoku&s");
         # Add an optional debug menu. In production code, the add_debug_menu() call should do nothing.
         $self->SetMenuBar($menubar);
     }

diff --git a/xs/CMakeLists.txt b/xs/CMakeLists.txt
@@ -533,14 +533,21 @@ find_package(CURL REQUIRED)
 include_directories(${CURL_INCLUDE_DIRS})
 target_link_libraries(XS ${CURL_LIBRARIES})
 
-if (SLIC3R_STATIC AND CMAKE_SYSTEM_NAME STREQUAL "Linux")
-    # As of now, our build system produces a statically linked libcurl,
-    # which links the OpenSSL library dynamically.
-    find_package(OpenSSL REQUIRED)
-    message("OpenSSL include dir: ${OPENSSL_INCLUDE_DIR}")
-    message("OpenSSL libraries: ${OPENSSL_LIBRARIES}")
-    include_directories(${OPENSSL_INCLUDE_DIR})
-    target_link_libraries(XS ${OPENSSL_LIBRARIES})
+if (SLIC3R_STATIC)
+    if (NOT APPLE)
+        # libcurl is always linked dynamically to the system libcurl on OSX.
+        # On other systems, libcurl is linked statically if SLIC3R_STATIC is set.
+        add_definitions(-DCURL_STATICLIB)
+    endif()
+    if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
+        # As of now, our build system produces a statically linked libcurl,
+        # which links the OpenSSL library dynamically.
+        find_package(OpenSSL REQUIRED)
+        message("OpenSSL include dir: ${OPENSSL_INCLUDE_DIR}")
+        message("OpenSSL libraries: ${OPENSSL_LIBRARIES}")
+        include_directories(${OPENSSL_INCLUDE_DIR})
+        target_link_libraries(XS ${OPENSSL_LIBRARIES})
+    endif()
 endif()
 
 ## OPTIONAL packages