3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Modified to compile on Ubuntu

Browse Source
This commit is contained in:
Vojtech Bubnik 2017-08-17 19:43:14 +02:00
parent 94483202ec
commit 952ca18bf9
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -1,5 +1,5 @@
# Boost 1.63 requires CMake 3.7 or newer # Boost 1.63 requires CMake 3.7 or newer
cmake_minimum_required(VERSION 3.7) cmake_minimum_required(VERSION 2.8)
project(Slic3r) project(Slic3r)

14
cmake/modules/FindAlienWx.cmake
View File

@ -40,13 +40,13 @@ my \$defines = ' ' . Alien::wxWidgets->defines;
my \$cflags = Alien::wxWidgets->c_flags; my \$cflags = Alien::wxWidgets->c_flags;
my \$linkflags = Alien::wxWidgets->link_flags; my \$linkflags = Alien::wxWidgets->link_flags;
my \$libraries = ' ' . Alien::wxWidgets->libraries(@components); my \$libraries = ' ' . Alien::wxWidgets->libraries(@components);
my @libraries = Alien::wxWidgets->link_libraries(@components); #my @libraries = Alien::wxWidgets->link_libraries(@components);
my @implib = Alien::wxWidgets->import_libraries(@components); #my @implib = Alien::wxWidgets->import_libraries(@components);
my @shrlib = Alien::wxWidgets->shared_libraries(@components); #my @shrlib = Alien::wxWidgets->shared_libraries(@components);
my @keys = Alien::wxWidgets->library_keys; # 'gl', 'adv', ... #my @keys = Alien::wxWidgets->library_keys; # 'gl', 'adv', ...
my \$library_path = Alien::wxWidgets->shared_library_path; #my \$library_path = Alien::wxWidgets->shared_library_path;
my \$key = Alien::wxWidgets->key; #my \$key = Alien::wxWidgets->key;
my \$prefix = Alien::wxWidgets->prefix; #my \$prefix = Alien::wxWidgets->prefix;
my \$filename = '${AlienWx_TEMP_INCLUDE}'; my \$filename = '${AlienWx_TEMP_INCLUDE}';
open(my $fh, '>', \$filename) or die \"Could not open file '\$filename' \$!\"; open(my $fh, '>', \$filename) or die \"Could not open file '\$filename' \$!\";

8
xs/CMakeLists.txt
View File

@ -116,10 +116,10 @@ find_package(PerlEmbed REQUIRED)
target_include_directories(XS PRIVATE ${PERL_INCLUDE_PATH}) target_include_directories(XS PRIVATE ${PERL_INCLUDE_PATH})
target_compile_options(XS PRIVATE ${PerlEmbed_CCFLAGS}) target_compile_options(XS PRIVATE ${PerlEmbed_CCFLAGS})
# If the Perl is compiled with optimization off, disable optimization over the whole project. # If the Perl is compiled with optimization off, disable optimization over the whole project.
if ("-Od" IN_LIST PerlEmbed_CCFLAGS OR "/Od" IN_LIST PerlEmbed_CCFLAGS) #if ("-Od" IN_LIST PerlEmbed_CCFLAGS OR "/Od" IN_LIST PerlEmbed_CCFLAGS)
set(CMAKE_CXX_FLAGS_RELEASE /Od) # set(CMAKE_CXX_FLAGS_RELEASE /Od)
set(CMAKE_C_FLAGS_RELEASE /Od) # set(CMAKE_C_FLAGS_RELEASE /Od)
endif() #endif()
target_link_libraries(XS ${PERL_LIBRARY}) target_link_libraries(XS ${PERL_LIBRARY})
## REQUIRED packages ## REQUIRED packages