=== modified file '3d-viewer/CMakeLists.txt' --- 3d-viewer/CMakeLists.txt 2015-12-15 00:43:00 +0000 +++ 3d-viewer/CMakeLists.txt 2016-03-04 10:48:06 +0000 @@ -1,14 +1,17 @@ add_definitions(-DPCBNEW) -include_directories(BEFORE ${INC_BEFORE}) +# hack +include_directories( BEFORE . ) include_directories( textures ../pcbnew ../polygon +) + +include_directories( SYSTEM ${GLEW_INCLUDE_DIR} ${GLM_INCLUDE_DIR} - ${INC_AFTER} - ) +) set(3D-VIEWER_SRCS dialogs/dialog_3D_view_option_base.cpp === modified file 'CMakeLists.txt' --- CMakeLists.txt 2016-02-29 19:08:03 +0000 +++ CMakeLists.txt 2016-03-04 12:40:58 +0000 @@ -19,7 +19,7 @@ # KiCad build options should be added below. # # If you add a new build option, please add it's state to the CopyVersionInfoToClipboard() -# function in common/basicframe.cpp so that build option settings can be included in bug +# function in common/dialog_about/dialog_about.cpp so that build option settings can be included in bug # reports. # @@ -246,10 +246,10 @@ # By default images in menu items are enabled on all platforms except OSX. -if( NOT APPLE ) +if( APPLE ) + set( USE_IMAGES_IN_MENUS OFF CACHE BOOL "Enable images in menus" ) +else() set( USE_IMAGES_IN_MENUS ON CACHE BOOL "Enable images in menus" ) -else() - set( USE_IMAGES_IN_MENUS OFF CACHE BOOL "Enable images in menus" ) endif() @@ -439,7 +439,9 @@ # # Find CURL library, required for github plugin # -find_package( CURL REQUIRED ) +if( BUILD_GITHUB_PLUGIN ) + find_package( CURL REQUIRED ) +endif() # # Find Cairo library, required @@ -462,29 +464,36 @@ check_find_package_result( GDI_PLUS_FOUND "GDI+" ) endif() -# Assist with header file searching optimization: -# INC_BEFORE and INC_AFTER are two lists which go at the front and back of the -# header file search lists, respectively. -# INC_BEFORE is for use with "include_directories( BEFORE ...)", which _reverses_ -# the order during insertion. (So put first wanted last, which is -# ${CMAKE_SOURCE_DIR/include.) Use '.' for current source dir since -# we don't want expansion here and now, which would happen if using ${CMAKE_CURRENT_SOURCE_DIR}. -# Instead we use '.' which is applicable to any source directory below here as a result of -# this lack of expansion. -set( INC_BEFORE - . +include_directories( ${CMAKE_SOURCE_DIR}/include - ) + ${CMAKE_BINARY_DIR} +) -set( INC_AFTER +include_directories( AFTER SYSTEM ${Boost_INCLUDE_DIR} - ${CMAKE_BINARY_DIR} - ) +) + +# KiCad build version string defaults to undefined which forces the build version header +# command to look for Bazaar to create the version string header. +set( KICAD_BUILD_VERSION "" CACHE STRING "Version string defined at configuration time." ) + +# Generate version header file. +add_custom_target( + version_header ALL + COMMAND ${CMAKE_COMMAND} + -DKICAD_BUILD_VERSION=${KICAD_BUILD_VERSION} + -DOUTPUT_FILE=${CMAKE_BINARY_DIR}/kicad_build_version.h + -DSRC_PATH=${PROJECT_SOURCE_DIR} + -DCMAKE_MODULE_PATH=${CMAKE_MODULE_PATH} + -P ${CMAKE_MODULE_PATH}/WriteVersionHeader.cmake + WORKING_DIRECTORY ${CMAKE_BINARY_DIR} + COMMENT "Generating version string header" +) # Find Python and other scripting resources if( KICAD_SCRIPTING OR KICAD_SCRIPTING_MODULES ) - # force a python version < 3.0 + # Force Python2 at least 2.6 set( PythonInterp_FIND_VERSION 2.6 ) set( PythonLibs_FIND_VERSION 2.6 ) @@ -566,7 +575,8 @@ # Infrequently needed headers go at end of search paths, append to INC_AFTER which # although is used for all components, should be a harmless hit for something like eeschema # so long as unused search paths are at the end like this. - set( INC_AFTER ${INC_AFTER} ${PYTHON_INCLUDE_DIRS} ${CMAKE_CURRENT_SOURCE_DIR}/scripting ) + # set( INC_AFTER ${INC_AFTER} ${PYTHON_INCLUDE_DIRS} ${CMAKE_CURRENT_SOURCE_DIR}/scripting ) + include_directories( ${CMAKE_SOURCE_DIR}/scripting ) #message( STATUS "/ INC_AFTER:${INC_AFTER}" ) @@ -623,8 +633,7 @@ endif() # Generate config.h. -configure_file( ${PROJECT_SOURCE_DIR}/CMakeModules/config.h.cmake - ${CMAKE_BINARY_DIR}/config.h ) +configure_file( ${PROJECT_SOURCE_DIR}/CMakeModules/config.h.cmake ${CMAKE_BINARY_DIR}/config.h ) ### # Generate Map file === modified file 'common/CMakeLists.txt' --- common/CMakeLists.txt 2016-01-16 01:56:57 +0000 +++ common/CMakeLists.txt 2016-03-04 12:35:14 +0000 @@ -1,20 +1,22 @@ -include_directories( BEFORE ${INC_BEFORE} ) -include_directories( +# These 2 are only necessary until includes are changed to relative paths +include_directories( BEFORE . ) # A drity hack +include_directories( BEFORE ./dialogs ./widgets ./dialog_about + ../3d-viewer + ../pcbnew + ../polygon +) + +include_directories( AFTER SYSTEM ${CAIRO_INCLUDE_DIR} ${GLEW_INCLUDE_DIR} ${GLM_INCLUDE_DIR} ${CURL_INCLUDE_DIRS} - ../3d-viewer - ../pcbnew - ../polygon - ${INC_AFTER} - ) - - -if( NOT APPLE ) # windows and linux use openssl under curl +) + +if( BUILD_GITHUB_PLUGIN AND NOT APPLE ) # windows and linux use openssl under curl find_package( OpenSSL REQUIRED ) endif() @@ -123,24 +125,6 @@ ) endif() - -# KiCad build version string defaults to undefined which forces the build version header -# command to look for Bazaar to create the version string header. -set( KICAD_BUILD_VERSION "" CACHE STRING "Version string defined at configuration time." ) - -# Generate version header file. -add_custom_target( - version_header ALL - COMMAND ${CMAKE_COMMAND} - -DKICAD_BUILD_VERSION=${KICAD_BUILD_VERSION} - -DOUTPUT_FILE=${CMAKE_BINARY_DIR}/kicad_build_version.h - -DSRC_PATH=${PROJECT_SOURCE_DIR} - -DCMAKE_MODULE_PATH=${CMAKE_MODULE_PATH} - -P ${CMAKE_MODULE_PATH}/WriteVersionHeader.cmake - WORKING_DIRECTORY ${CMAKE_BINARY_DIR} - COMMENT "Generating version string header" - ) - set( COMMON_ABOUT_DLG_SRCS dialog_about/AboutDialog_main.cpp dialog_about/dialog_about.cpp @@ -497,4 +481,3 @@ target_link_libraries( dsntest common ${wxWidgets_LIBRARIES} rt ) add_dependencies( dsntest lib-dependencies ) - === modified file 'common/base_struct.cpp' --- common/base_struct.cpp 2015-08-07 16:17:51 +0000 +++ common/base_struct.cpp 2016-03-04 10:48:57 +0000 @@ -27,15 +27,17 @@ * @brief Implementation of EDA_ITEM base class for KiCad. */ -#include + +#include + +#include +#include + +#include +#include #include -#include -#include -#include -#include -#include -#include +// This needs to be removed/moved into common #include "../eeschema/dialogs/dialog_schematic_find.h" === modified file 'common/common_plotDXF_functions.cpp' --- common/common_plotDXF_functions.cpp 2016-02-10 16:02:40 +0000 +++ common/common_plotDXF_functions.cpp 2016-03-04 09:42:05 +0000 @@ -1,7 +1,3 @@ -/** - * @file common_plotDXF_functions.cpp - * @brief KiCad: Common plot DXF Routines. - */ /* * This program source code file is part of KiCad, a free EDA CAD application. * @@ -25,6 +21,11 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ +/** + * @file common_plotDXF_functions.cpp + * @brief KiCad: Common plot DXF Routines. + */ + #include #include #include @@ -854,4 +855,3 @@ putc( '\n', outputFile ); } } - === modified file 'cvpcb/CMakeLists.txt' --- cvpcb/CMakeLists.txt 2016-02-29 19:08:03 +0000 +++ cvpcb/CMakeLists.txt 2016-03-04 11:11:13 +0000 @@ -1,16 +1,18 @@ add_definitions( -DCVPCB ) -include_directories( BEFORE ${INC_BEFORE} ) -include_directories( +include_directories( BEFORE . ) # HACK +include_directories( BEFORE ./dialogs ../3d-viewer ../pcbnew ../pcbnew/dialogs ../polygon ../common +) + +include_directories( SYSTEM ${GLM_INCLUDE_DIR} - ${INC_AFTER} - ) +) set( CVPCB_DIALOGS === modified file 'cvpcb/dialogs/dialog_display_options.cpp' --- cvpcb/dialogs/dialog_display_options.cpp 2016-02-25 09:52:29 +0000 +++ cvpcb/dialogs/dialog_display_options.cpp 2016-03-04 11:10:59 +0000 @@ -1,7 +1,3 @@ -/** - * @file cvpcb/dialogs/dialog_display_options.cpp - */ - /* * This program source code file is part of KiCad, a free EDA CAD application. * @@ -25,6 +21,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ +/** + * @file cvpcb/dialogs/dialog_display_options.cpp + */ + #include #include @@ -34,7 +34,7 @@ #include #include -#include +#include "dialog_display_options.h" void DISPLAY_FOOTPRINTS_FRAME::InstallOptionsDisplay( wxCommandEvent& event ) === modified file 'cvpcb/dialogs/dialog_display_options.h' --- cvpcb/dialogs/dialog_display_options.h 2012-09-12 17:28:55 +0000 +++ cvpcb/dialogs/dialog_display_options.h 2016-03-04 11:14:08 +0000 @@ -1,10 +1,3 @@ -/** - * @file cvpcb/dialogs/dialog_display_options.h - */ - -#ifndef _DIALOG_DISPLAY_OPTIONS_H_ -#define _DIALOG_DISPLAY_OPTIONS_H_ - /* * This program source code file is part of KiCad, a free EDA CAD application. * @@ -28,7 +21,14 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ -#include +#ifndef _DIALOG_DISPLAY_OPTIONS_H_ +#define _DIALOG_DISPLAY_OPTIONS_H_ + +/** + * @file cvpcb/dialogs/dialog_display_options.h + */ + +#include "dialog_display_options_base.h" /* Class DIALOG_FOOTPRINTS_DISPLAY_OPTIONS * derived from DIALOG_FOOTPRINTS_DISPLAY_OPTIONS_BASE, === modified file 'eeschema/CMakeLists.txt' --- eeschema/CMakeLists.txt 2016-02-29 19:08:03 +0000 +++ eeschema/CMakeLists.txt 2016-03-04 11:16:15 +0000 @@ -1,14 +1,13 @@ add_definitions( -DEESCHEMA ) -include_directories( BEFORE ${INC_BEFORE} ) +include_directories( BEFORE . ) # HACK include_directories( ./dialogs ./netlist_exporters ./widgets ../common ../common/dialogs - ${INC_AFTER} - ) +) set( EESCHEMA_DLGS === modified file 'gerbview/CMakeLists.txt' --- gerbview/CMakeLists.txt 2016-02-29 19:08:03 +0000 +++ gerbview/CMakeLists.txt 2016-03-04 11:33:06 +0000 @@ -1,13 +1,12 @@ add_definitions(-DGERBVIEW) -include_directories( BEFORE ${INC_BEFORE} ) +include_directories( BEFORE . ) # HACK include_directories( ../pcbnew dialogs ../3d-viewer ../polygon - ${INC_AFTER} - ) +) set( DIALOGS_SRCS === modified file 'include/geometry/shape.h' --- include/geometry/shape.h 2015-06-12 15:12:02 +0000 +++ include/geometry/shape.h 2016-03-04 09:50:13 +0000 @@ -31,7 +31,7 @@ #include #include -#include +#include "seg.h" /** * Enum SHAPE_TYPE === modified file 'include/geometry/shape_poly_set.h' --- include/geometry/shape_poly_set.h 2015-12-15 20:21:25 +0000 +++ include/geometry/shape_poly_set.h 2016-03-04 09:49:48 +0000 @@ -25,12 +25,13 @@ #ifndef __SHAPE_POLY_SET_H #define __SHAPE_POLY_SET_H + #include #include -#include -#include #include "clipper.hpp" +#include "shape.h" +#include "shape_line_chain.h" /** === modified file 'include/math/vector2d.h' --- include/math/vector2d.h 2016-01-17 15:59:24 +0000 +++ include/math/vector2d.h 2016-03-04 10:33:26 +0000 @@ -34,7 +34,7 @@ #include #include -#include +#include "math_util.h" #ifdef WX_COMPATIBILITY #include === modified file 'kicad/CMakeLists.txt' --- kicad/CMakeLists.txt 2016-02-29 19:08:03 +0000 +++ kicad/CMakeLists.txt 2016-03-04 13:21:57 +0000 @@ -1,17 +1,9 @@ add_definitions( -DKICAD ) -include_directories( BEFORE ${INC_BEFORE} ) -include_directories( - ${INC_AFTER} - ) - - set( KICAD_SRCS class_treeprojectfiles.cpp class_treeproject_item.cpp commandframe.cpp - dialogs/dialog_template_selector_base.cpp - dialogs/dialog_template_selector.cpp files-io.cpp kicad.cpp mainframe.cpp @@ -20,7 +12,11 @@ prjconfig.cpp project_template.cpp tree_project_frame.cpp - ) + + # dialogs + dialogs/dialog_template_selector_base.cpp + dialogs/dialog_template_selector.cpp +) if( MINGW ) # KICAD_RESOURCES variable is set by the macro. @@ -44,7 +40,6 @@ add_executable( kicad WIN32 MACOSX_BUNDLE ${KICAD_SRCS} - ${KICAD_EXTRA_SRCS} ${KICAD_RESOURCES} ) @@ -58,30 +53,30 @@ ) endif() -if( APPLE ) +if ( APPLE ) set_target_properties( kicad PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist - ) - target_link_libraries( kicad - common - bitmaps - polygon - ${wxWidgets_LIBRARIES} - ) -else() - target_link_libraries( kicad - common - bitmaps - polygon - ${wxWidgets_LIBRARIES} + ) +endif() + +target_link_libraries( kicad + common + bitmaps + polygon + ${wxWidgets_LIBRARIES} +) + +if( NOT APPLE ) + target_link_libraries( kicad ${GDI_PLUS_LIBRARIES} - ) + ) endif() install( TARGETS kicad DESTINATION ${KICAD_BIN} COMPONENT binary - ) +) + if( APPLE ) # "install( CODE ... )" will launch its own CMake, so no variables from # this CMake instance are accessible... use helper to transfer @@ -106,9 +101,6 @@ # override default embedded path settings ${OSX_BUNDLE_OVERRIDE_PATHS} - # do all the work - include( BundleUtilities ) - fixup_bundle( ${OSX_BUNDLE_INSTALL_BIN_DIR}/kicad \"\${BUNDLE_FIX_LIBS}\" \"\" === modified file 'kicad/dialogs/dialog_template_selector.cpp' --- kicad/dialogs/dialog_template_selector.cpp 2015-07-28 13:05:47 +0000 +++ kicad/dialogs/dialog_template_selector.cpp 2016-03-04 13:13:47 +0000 @@ -22,11 +22,12 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "dialog_template_selector.h" #include #include +#include "dialog_template_selector.h" + TEMPLATE_SELECTION_PANEL::TEMPLATE_SELECTION_PANEL( wxNotebookPage* aParent, const wxString& aPath ) : === modified file 'kicad/dialogs/dialog_template_selector.h' --- kicad/dialogs/dialog_template_selector.h 2015-07-28 13:05:47 +0000 +++ kicad/dialogs/dialog_template_selector.h 2016-03-04 13:14:02 +0000 @@ -25,8 +25,8 @@ #ifndef PROJECT_TEMPLATE_SELECTOR_H #define PROJECT_TEMPLATE_SELECTOR_H -#include -#include "project_template.h" +#include "../project_template.h" +#include "dialog_template_selector_base.h" class DIALOG_TEMPLATE_SELECTOR; === modified file 'pagelayout_editor/CMakeLists.txt' --- pagelayout_editor/CMakeLists.txt 2016-02-29 19:08:03 +0000 +++ pagelayout_editor/CMakeLists.txt 2016-03-04 12:38:58 +0000 @@ -1,10 +1,9 @@ add_definitions(-DPL_EDITOR) -include_directories(BEFORE ${INC_BEFORE}) -include_directories( +include_directories( BEFORE . ) # HACK +include_directories( BEFORE dialogs ../common/dialogs - ${INC_AFTER} ) set( PL_EDITOR_SRCS === modified file 'pcb_calculator/CMakeLists.txt' --- pcb_calculator/CMakeLists.txt 2016-01-28 16:53:24 +0000 +++ pcb_calculator/CMakeLists.txt 2016-03-04 13:31:33 +0000 @@ -1,14 +1,13 @@ -include_directories( BEFORE ${INC_BEFORE} ) -include_directories( +include_directories( BEFORE . ) # HACK +include_directories( BEFORE bitmaps dialogs transline attenuators ../polygon ../common - ${INC_AFTER} - ) +) set( PCB_CALCULATOR_SRCS attenuators.cpp @@ -16,13 +15,18 @@ colorcode.cpp electrical_spacing_values.cpp params_read_write.cpp + pcb_calculator_datafile_keywords.cpp pcb_calculator_frame.cpp datafile_read_write.cpp regulators_funct.cpp tracks_width_versus_current.cpp transline_ident.cpp UnitSelector.cpp - pcb_calculator_datafile_keywords.cpp + + # attenuators + attenuators/attenuator_classes.cpp + + # transline transline/transline.cpp transline/c_microstrip.cpp transline/microstrip.cpp @@ -32,10 +36,11 @@ transline/stripline.cpp transline/twistedpair.cpp transline_dlg_funct.cpp - attenuators/attenuator_classes.cpp + + # dialogs dialogs/pcb_calculator_frame_base.cpp dialogs/dialog_regulator_data_base.cpp - ) +) if( MINGW ) # PCB_CALCULATOR_RESOURCES variable is set by the macro. @@ -59,17 +64,19 @@ ../common/single_top.cpp ../common/pgm_base.cpp ${PCB_CALCULATOR_RESOURCES} - ) +) + set_source_files_properties( ../common/single_top.cpp PROPERTIES COMPILE_DEFINITIONS "TOP_FRAME=FRAME_CALC;BUILD_KIWAY_DLL" - ) +) + target_link_libraries( pcb_calculator #singletop # replaces common, giving us restrictive control and link warnings. # There's way too much crap coming in from common yet. common bitmaps ${wxWidgets_LIBRARIES} - ) +) if( MAKE_LINK_MAPS ) set_target_properties( pcb_calculator PROPERTIES @@ -80,26 +87,30 @@ add_library( pcb_calculator_kiface MODULE pcb_calculator.cpp ${PCB_CALCULATOR_SRCS} - ) +) + set_target_properties( pcb_calculator_kiface PROPERTIES OUTPUT_NAME pcb_calculator PREFIX ${KIFACE_PREFIX} SUFFIX ${KIFACE_SUFFIX} - ) +) + target_link_libraries( pcb_calculator_kiface common bitmaps polygon ${wxWidgets_LIBRARIES} - ) +) + set_source_files_properties( pcb_calculator.cpp PROPERTIES # The KIFACE is in pcb_calculator.cpp, export it: COMPILE_DEFINITIONS "BUILD_KIWAY_DLL;COMPILING_DLL" - ) +) if( MAKE_LINK_MAPS ) set_target_properties( pcb_calculator_kiface PROPERTIES - LINK_FLAGS "${TO_LINKER},-cref ${TO_LINKER},-Map=_pcb_calculator.kiface.map" ) + LINK_FLAGS "${TO_LINKER},-cref ${TO_LINKER},-Map=_pcb_calculator.kiface.map" + ) endif() # if building pcb_calculator, then also build pcb_calculator_kiface if out of date. @@ -109,40 +120,39 @@ if( APPLE ) set_target_properties( pcb_calculator PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist - ) + ) # puts binaries into the *.app bundle while linking set_target_properties( pcb_calculator_kiface PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${OSX_BUNDLE_BUILD_KIFACE_DIR} - ) + ) # put individual bundle outside of main bundle as a first step # will be pulled into the main bundle when creating main bundle install( TARGETS pcb_calculator DESTINATION ${KICAD_BIN} COMPONENT binary - ) + ) install( CODE " # override default embedded path settings ${OSX_BUNDLE_OVERRIDE_PATHS} # do all the work - include( BundleUtilities ) fixup_bundle( ${KICAD_BIN}/pcb_calculator.app/Contents/MacOS/pcb_calculator \"\" \"\" - ) + ) " COMPONENT Runtime - ) + ) else() install( TARGETS pcb_calculator DESTINATION ${KICAD_BIN} COMPONENT binary - ) + ) install( TARGETS pcb_calculator_kiface DESTINATION ${KICAD_BIN} COMPONENT binary - ) + ) endif() # auto-generate pcb_calculator_datafile.h and pcb_calculator_datafile_keywords.cpp @@ -157,11 +167,9 @@ datafile_read_write.h ) -add_custom_target( - pcb_calculator_lexer_source_files ALL - DEPENDS - ${CMAKE_CURRENT_SOURCE_DIR}/pcb_calculator_datafile_lexer.h - ${CMAKE_CURRENT_SOURCE_DIR}/pcb_calculator_datafile_keywords.cpp +add_custom_target( pcb_calculator_lexer_source_files ALL DEPENDS + ${CMAKE_CURRENT_SOURCE_DIR}/pcb_calculator_datafile_lexer.h + ${CMAKE_CURRENT_SOURCE_DIR}/pcb_calculator_datafile_keywords.cpp ) # @@ -171,28 +179,27 @@ function( html_doc2h inputFile ) add_custom_command( OUTPUT ${inputFile}.h - COMMAND ${CMAKE_COMMAND} -DinputFile=${inputFile}.html -DoutputFile=${inputFile}.h -P ${CMAKE_MODULE_PATH}/Html2C.cmake DEPENDS ${inputFile}.html ${CMAKE_MODULE_PATH}/Html2C.cmake COMMENT "creating ${inputFile}.h from ${inputFile}.html" - ) + ) endfunction() - html_doc2h( ${CMAKE_CURRENT_SOURCE_DIR}/attenuators/bridget_tee_formula ) - html_doc2h( ${CMAKE_CURRENT_SOURCE_DIR}/attenuators/splitter_formula ) - html_doc2h( ${CMAKE_CURRENT_SOURCE_DIR}/attenuators/pi_formula ) - html_doc2h( ${CMAKE_CURRENT_SOURCE_DIR}/attenuators/tee_formula ) +html_doc2h( ${CMAKE_CURRENT_SOURCE_DIR}/attenuators/bridget_tee_formula ) +html_doc2h( ${CMAKE_CURRENT_SOURCE_DIR}/attenuators/splitter_formula ) +html_doc2h( ${CMAKE_CURRENT_SOURCE_DIR}/attenuators/pi_formula ) +html_doc2h( ${CMAKE_CURRENT_SOURCE_DIR}/attenuators/tee_formula ) set( DOCS_LIST - ${CMAKE_CURRENT_SOURCE_DIR}/attenuators/pi_formula.h - ${CMAKE_CURRENT_SOURCE_DIR}/attenuators/tee_formula.h - ${CMAKE_CURRENT_SOURCE_DIR}/attenuators/bridget_tee_formula.h - ${CMAKE_CURRENT_SOURCE_DIR}/attenuators/splitter_formula.h - ) + ${CMAKE_CURRENT_SOURCE_DIR}/attenuators/pi_formula.h + ${CMAKE_CURRENT_SOURCE_DIR}/attenuators/tee_formula.h + ${CMAKE_CURRENT_SOURCE_DIR}/attenuators/bridget_tee_formula.h + ${CMAKE_CURRENT_SOURCE_DIR}/attenuators/splitter_formula.h +) set_source_files_properties( attenuators/attenuator_classes.cpp PROPERTIES OBJECT_DEPENDS "${DOCS_LIST}" - ) +) add_dependencies( pcb_calculator_kiface pcb_calculator_lexer_source_files ) === modified file 'pcbnew/CMakeLists.txt' --- pcbnew/CMakeLists.txt 2016-02-29 19:08:03 +0000 +++ pcbnew/CMakeLists.txt 2016-03-04 16:05:16 +0000 @@ -1,31 +1,7 @@ add_definitions( -DPCBNEW ) -add_subdirectory(router) - -# psnrouter depends on make_lexer outputs in common (bug # 1285878 ) -add_dependencies( pnsrouter pcbcommon ) - - -if( KICAD_SCRIPTING OR KICAD_SCRIPTING_MODULES ) - file( MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/scripting ) - find_package( SWIG REQUIRED ) - include( ${SWIG_USE_FILE} ) - - # Infrequently needed headers go at end of search paths, append to INC_AFTER - set( INC_AFTER ${INC_AFTER} ${CMAKE_CURRENT_SOURCE_DIR}/scripting ) - - #message( STATUS "pcbnew INC_AFTER:${INC_AFTER}" ) -endif() - - -if( BUILD_GITHUB_PLUGIN ) - set( GITHUB_3DLIBRARIES_WIZARD - dialogs/wizard_3DShape_Libs_downloader_base.cpp - dialogs/wizard_3DShape_Libs_downloader.cpp ) -endif() - -include_directories( BEFORE ${INC_BEFORE} ) -include_directories( +include_directories( BEFORE . ) # HACK +include_directories( BEFORE ./dialogs ./autorouter ../3d-viewer @@ -36,9 +12,34 @@ ../lib_dxf ./import_dxf ../utils/idftools +) + +include_directories( SYSTEM ${GLM_INCLUDE_DIR} - ${INC_AFTER} +) + +add_subdirectory(router) + +# psnrouter depends on make_lexer outputs in common (bug # 1285878 ) +add_dependencies( pnsrouter pcbcommon ) + + +if( KICAD_SCRIPTING OR KICAD_SCRIPTING_MODULES ) + include_directories ( SYSTEM ${PYTHON_INCLUDE_DIRS} ) + include_directories ( ${CMAKE_CURRENT_SOURCE_DIR}/scripting ) + + file( MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/scripting ) + find_package( SWIG REQUIRED ) + include( ${SWIG_USE_FILE} ) +endif() + + +if( BUILD_GITHUB_PLUGIN ) + set( GITHUB_3DLIBRARIES_WIZARD + dialogs/wizard_3DShape_Libs_downloader_base.cpp + dialogs/wizard_3DShape_Libs_downloader.cpp ) +endif() set( PCBNEW_DIALOGS dialogs/dialog_block_options_base.cpp @@ -147,13 +148,13 @@ dialogs/wizard_add_fplib_base.cpp dialogs/wizard_add_fplib.cpp ${GITHUB_3DLIBRARIES_WIZARD} - ) +) set( PCBNEW_IMPORT_DXF import_dxf/dialog_dxf_import_base.cpp import_dxf/dialog_dxf_import.cpp import_dxf/dxf2brd_items.cpp - ) +) set( PCBNEW_EXPORTERS exporters/export_d356.cpp @@ -163,7 +164,7 @@ exporters/gen_drill_report_files.cpp exporters/gen_modules_placefile.cpp exporters/gendrill_Excellon_writer.cpp - ) +) set( PCBNEW_AUTOROUTER_SRCS autorouter/rect_placement/rect_placement.cpp @@ -177,44 +178,38 @@ autorouter/solve.cpp autorouter/graphpcb.cpp autorouter/work.cpp - ) +) set( PCBNEW_CLASS_SRCS - tool_modview.cpp - modview_frame.cpp - pcbframe.cpp - pcb_base_edit_frame.cpp append_board_to_current.cpp attribut.cpp + block.cpp + block_module_editor.cpp board_items_to_polygon_shape_transform.cpp + board_netlist_updater.cpp board_undo_redo.cpp - board_netlist_updater.cpp - block.cpp - block_module_editor.cpp build_BOM_from_board.cpp + class_footprint_wizard.cpp + class_pcb_layer_box_selector.cpp class_pcb_layer_widget.cpp - class_pcb_layer_box_selector.cpp clean.cpp connect.cpp controle.cpp - dimension.cpp cross-probing.cpp deltrack.cpp - ${PCBNEW_DIALOGS} - ${PCBNEW_IMPORT_DXF} - ${PCBNEW_EXPORTERS} + dimension.cpp dragsegm.cpp drc.cpp drc_clearance_test_functions.cpp drc_marker_functions.cpp edgemod.cpp edit.cpp + edit_pcb_text.cpp + edit_track_width.cpp editedge.cpp editmod.cpp editrack.cpp editrack-part2.cpp - edit_pcb_text.cpp - edit_track_width.cpp edtxtmod.cpp event_handlers_tracks_vias_sizes.cpp files.cpp @@ -233,10 +228,11 @@ minimun_spanning_tree.cpp modedit.cpp modedit_onclick.cpp + modedit_undo_redo.cpp modeditoptions.cpp - modedit_undo_redo.cpp moduleframe.cpp modules.cpp + modview_frame.cpp move-drag_pads.cpp move_or_drag_track.cpp muonde.cpp @@ -245,9 +241,11 @@ onleftclick.cpp onrightclick.cpp pad_edition_functions.cpp + pcb_base_edit_frame.cpp + pcb_draw_panel_gal.cpp + pcbframe.cpp pcbnew_config.cpp pcbplot.cpp - pcb_draw_panel_gal.cpp plot_board_layers.cpp plot_brditems_plotter.cpp print_board_functions.cpp @@ -258,50 +256,52 @@ swap_layers.cpp target_edit.cpp tool_modedit.cpp + tool_modview.cpp tool_onrightclick.cpp tool_pcb.cpp toolbars_update_user_interface.cpp tracepcb.cpp tr_modif.cpp xchgmod.cpp + zone_filling_algorithm.cpp zones_convert_brd_items_to_polygons_with_Boost.cpp zones_convert_to_polygons_aux_functions.cpp zones_by_polygon.cpp zones_by_polygon_fill_functions.cpp - zone_filling_algorithm.cpp zones_functions_for_undo_redo.cpp zones_polygons_insulated_copper_islands.cpp zones_polygons_test_connections.cpp zones_test_and_combine_areas.cpp - class_footprint_wizard.cpp - tools/selection_tool.cpp - tools/selection_area.cpp - tools/selection_conditions.cpp + # tools + tools/bright_box.cpp + tools/common_actions.cpp tools/conditional_menu.cpp - tools/bright_box.cpp + tools/drawing_tool.cpp + tools/edit_constraints.cpp tools/edit_points.cpp - tools/edit_constraints.cpp - tools/point_editor.cpp - tools/drawing_tool.cpp tools/edit_tool.cpp + tools/grid_helper.cpp + tools/grid_menu.cpp + tools/module_tools.cpp + tools/pcb_editor_control.cpp tools/pcbnew_control.cpp - tools/pcb_editor_control.cpp - tools/module_tools.cpp + tools/picker_tool.cpp tools/placement_tool.cpp - tools/common_actions.cpp - tools/grid_helper.cpp - tools/picker_tool.cpp + tools/point_editor.cpp + tools/selection_area.cpp + tools/selection_conditions.cpp + tools/selection_tool.cpp + tools/size_menu.cpp tools/tools_common.cpp - - tools/grid_menu.cpp tools/zoom_menu.cpp - tools/size_menu.cpp - ) + + ${PCBNEW_IMPORT_DXF} + ${PCBNEW_EXPORTERS} +) set( PCBNEW_SRCS ${PCBNEW_AUTOROUTER_SRCS} ${PCBNEW_CLASS_SRCS} ${PCBNEW_DIALOGS} ) - # extra sources from common set( PCBNEW_COMMON_SRCS ../common/dialogs/dialog_page_settings.cpp @@ -321,39 +321,28 @@ ) if( KICAD_SCRIPTING ) + set( PCBNEW_SCRIPTING_SRCS + pcbnew_wrap.cxx ${PCBNEW_SCRIPTING_DIALOGS} - pcbnew_wrap.cxx ${PCBNEW_SCRIPTING_PYTHON_HELPERS} - ) -endif() - - -if( KICAD_SCRIPTING OR KICAD_SCRIPTING_MODULES ) + ) set( SWIG_FLAGS - -I${CMAKE_CURRENT_SOURCE_DIR}/../.. - -I${CMAKE_CURRENT_SOURCE_DIR} - -I${CMAKE_CURRENT_SOURCE_DIR}/../include - -I${CMAKE_CURRENT_SOURCE_DIR}/../scripting - ) + -I${CMAKE_SOURCE_DIR}/include + -I${CMAKE_SOURCE_DIR}/scripting + ) if( DEBUG ) set( SWIG_FLAGS ${SWIG_FLAGS} -DDEBUG ) endif() # collect CFLAGS , and pass them to swig later - get_directory_property( DirDefs DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} COMPILE_DEFINITIONS ) foreach( d ${DirDefs} ) set( SWIG_FLAGS ${SWIG_FLAGS} -D${d} ) endforeach() -endif() - - -if( KICAD_SCRIPTING ) - set( SWIG_OPTS -python -c++ -outdir ${CMAKE_CURRENT_BINARY_DIR} ${SWIG_FLAGS} ) if( EXISTS ${CMAKE_CURRENT_BINARY_DIR}/doxygen-xml ) @@ -361,8 +350,9 @@ set( SWIG_OPTS ${SWIG_OPTS} -I${CMAKE_CURRENT_BINARY_DIR}/docstrings ) endif() - add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/pcbnew_wrap.cxx - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/pcbnew.py + add_custom_command( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/pcbnew_wrap.cxx + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/pcbnew.py DEPENDS pcbcommon DEPENDS plotcontroller.h @@ -384,7 +374,7 @@ COMMAND ${SWIG_EXECUTABLE} ${SWIG_OPTS} -o ${CMAKE_CURRENT_BINARY_DIR}/pcbnew_wrap.cxx scripting/pcbnew.i COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/scripting/build_tools/fix_swig_imports.py ${CMAKE_CURRENT_BINARY_DIR}/pcbnew.py WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - ) + ) endif() @@ -399,9 +389,6 @@ if( KICAD_SCRIPTING_MODULES ) - - #message( "building pcbnew scripting" ) - set( CMAKE_SWIG_FLAGS ${SWIG_FLAGS} ) set_source_files_properties( scripting/pcbnew.i PROPERTIES CPLUSPLUS ON ) @@ -461,7 +448,7 @@ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} DEPENDS Doxyfile_xml COMMENT "building doxygen docs into directory doxygen-python/html" - ) + ) # create .i files from XML doxygen parsing, docstrings.i will include all of them add_custom_target( xml-to-docstrings @@ -473,7 +460,7 @@ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} DEPENDS pcbnew.py DEPENDS doxygen-python-xml - ) + ) # create doxygen-python html add_custom_target( doxygen-python @@ -484,7 +471,7 @@ DEPENDS xml-to-docstrings DEPENDS pcbnew.py COMMENT "building doxygen docs into directory doxygen-python/html" - ) + ) endif() endif() @@ -522,11 +509,11 @@ DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/dialogs/dialog_freeroute_exchange_help.html COMMENT "creating ${CMAKE_CURRENT_SOURCE_DIR}/dialogs/dialog_freeroute_exchange_help_html.h from ${CMAKE_CURRENT_SOURCE_DIR}/dialogs/dialog_freeroute_exchange_help.html" - ) +) set_source_files_properties( dialogs/dialog_freeroute_exchange.cpp PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/dialogs/dialog_freeroute_exchange_help_html.h - ) +) add_subdirectory( pcad2kicadpcb_plugin ) @@ -540,21 +527,22 @@ add_executable( pcbnew WIN32 MACOSX_BUNDLE ../common/single_top.cpp ${PCBNEW_RESOURCES} - ) +) set_source_files_properties( ../common/single_top.cpp pcbnew.cpp PROPERTIES COMPILE_DEFINITIONS "TOP_FRAME=FRAME_PCB;PGM_DATA_FILE_EXT=\"kicad_pcb\";BUILD_KIWAY_DLL" - ) +) target_link_libraries( pcbnew #singletop # replaces common, giving us restrictive control and link warnings. # There's way too much crap coming in from common yet. common bitmaps ${wxWidgets_LIBRARIES} - ) +) if( MAKE_LINK_MAPS ) set_target_properties( pcbnew PROPERTIES - LINK_FLAGS "${TO_LINKER},-cref ${TO_LINKER},-Map=pcbnew.map" ) + LINK_FLAGS "${TO_LINKER},-cref ${TO_LINKER},-Map=pcbnew.map" + ) endif() # the main pcbnew program, in DSO form. @@ -563,19 +551,19 @@ ${PCBNEW_SRCS} ${PCBNEW_COMMON_SRCS} ${PCBNEW_SCRIPTING_SRCS} - ) +) set_target_properties( pcbnew_kiface PROPERTIES # Decorate OUTPUT_NAME with PREFIX and SUFFIX, creating something like # _pcbnew.so, _pcbnew.dll, or _pcbnew.kiface OUTPUT_NAME pcbnew PREFIX ${KIFACE_PREFIX} SUFFIX ${KIFACE_SUFFIX} - ) +) if( ${OPENMP_FOUND} ) set_target_properties( pcbnew_kiface PROPERTIES COMPILE_FLAGS ${OpenMP_CXX_FLAGS} - ) + ) endif() target_link_libraries( pcbnew_kiface @@ -596,19 +584,16 @@ ${Boost_LIBRARIES} # must follow GITHUB ${PCBNEW_EXTRA_LIBS} # -lrt must follow Boost ${OPENMP_LIBRARIES} - ) +) set_source_files_properties( pcbnew.cpp PROPERTIES # The KIFACE is in pcbnew.cpp, export it: COMPILE_DEFINITIONS "BUILD_KIWAY_DLL;COMPILING_DLL" - ) +) if( MAKE_LINK_MAPS ) set_target_properties( pcbnew_kiface PROPERTIES LINK_FLAGS "${TO_LINKER},-cref ${TO_LINKER},-Map=_pcbnew.kiface.map" - ) - set_target_properties( pcbnew PROPERTIES - LINK_FLAGS "${TO_LINKER},-cref ${TO_LINKER},-Map=pcbnew.map" - ) + ) endif() # if building pcbnew, then also build pcbnew_kiface if out of date. @@ -618,44 +603,42 @@ if( APPLE ) set_target_properties( pcbnew PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist - ) + ) # puts binaries into the *.app bundle while linking set_target_properties( pcbnew_kiface PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${OSX_BUNDLE_BUILD_KIFACE_DIR} - ) + ) # put individual bundle outside of main bundle as a first step # will be pulled into the main bundle when creating main bundle install( TARGETS pcbnew DESTINATION ${KICAD_BIN} COMPONENT binary - ) + ) install( CODE " # override default embedded path settings ${OSX_BUNDLE_OVERRIDE_PATHS} # do all the work - include( BundleUtilities ) fixup_bundle( ${KICAD_BIN}/pcbnew.app/Contents/MacOS/pcbnew \"\" \"\" - ) + ) " COMPONENT Runtime - ) + ) else() install( TARGETS pcbnew DESTINATION ${KICAD_BIN} COMPONENT binary - ) + ) install( TARGETS pcbnew_kiface DESTINATION ${KICAD_BIN} COMPONENT binary - ) + ) endif() add_dependencies( pcbnew lib-dependencies ) - if( KICAD_SCRIPTING ) if( NOT APPLE ) install( FILES ${CMAKE_BINARY_DIR}/pcbnew/pcbnew.py DESTINATION ${PYTHON_DEST} ) @@ -687,7 +670,7 @@ COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/scripting/build_tools/fix_swig_imports.py ${CMAKE_CURRENT_BINARY_DIR}/pcbnew.py DEPENDS _pcbnew COMMENT "Fixing swig_import_helper in Kicad scripting modules" - ) + ) if( MINGW ) install( FILES ${CMAKE_BINARY_DIR}/pcbnew/_pcbnew.pyd DESTINATION ${PYTHON_DEST} ) @@ -697,39 +680,26 @@ COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_BINARY_DIR}/pcbnew/_pcbnew.so" "${PYTHON_DEST}/" DEPENDS _pcbnew COMMENT "Copying _pcbnew.so into ${PYTHON_DEST}" - ) + ) add_dependencies( ScriptingModulesPcbnewSoCopy ScriptingWxpythonCopy ) else() install( FILES ${CMAKE_BINARY_DIR}/pcbnew/_pcbnew.so DESTINATION ${PYTHON_DEST} ) endif() endif() -if( APPLE ) - if( KICAD_SCRIPTING OR KICAD_SCRIPTING_MODULES ) +if( KICAD_SCRIPTING_WXPYTHON ) + if ( APPLE ) # find wx-X.Y-osx_cocoa path below PYTHON_SITE_PACKAGE_PATH file( GLOB WXPYTHON_DIR RELATIVE ${PYTHON_SITE_PACKAGE_PATH} ${PYTHON_SITE_PACKAGE_PATH}/wx-?.?-osx_cocoa ) if( NOT WXPYTHON_DIR ) message( FATAL_ERROR "Could not find 'wx-?.?-osx_cocoa' in '${PYTHON_SITE_PACKAGE_PATH}'" ) endif() + # TODO this should be in install # copy contents add_custom_target( ScriptingWxpythonCopy ALL COMMAND ${CMAKE_COMMAND} -E copy_directory "${PYTHON_SITE_PACKAGE_PATH}/${WXPYTHON_DIR}" "${PYTHON_DEST}/${WXPYTHON_DIR}" COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_SITE_PACKAGE_PATH}/wxversion.py" "${PYTHON_DEST}" COMMENT "Copying wxPython into ${PYTHON_DEST}" - ) + ) endif() endif() - - -if( false ) # haven't been used in years. - # This one gets made only when testing. - add_executable( specctra_test EXCLUDE_FROM_ALL specctra_test.cpp specctra.cpp ) - target_link_libraries( specctra_test common ${wxWidgets_LIBRARIES} ) - - - # This one gets made only when testing. - add_executable( layer_widget_test WIN32 EXCLUDE_FROM_ALL - layer_widget.cpp - ) - target_link_libraries( layer_widget_test common ${wxWidgets_LIBRARIES} ) -endif() === modified file 'pcbnew/dialogs/dialog_display_options.cpp' --- pcbnew/dialogs/dialog_display_options.cpp 2015-03-03 10:50:50 +0000 +++ pcbnew/dialogs/dialog_display_options.cpp 2016-03-04 11:07:49 +0000 @@ -1,7 +1,3 @@ -/** - * @file pcbnew/dialogs/dialog_general_options.cpp - */ - /* * This program source code file is part of KiCad, a free EDA CAD application. * @@ -26,6 +22,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ +/** + * @file pcbnew/dialogs/dialog_general_options.cpp + */ + /* functions relatives to the dialog opened from the main menu : Preferences/display */ @@ -39,13 +39,12 @@ #include -#include -#include - #include #include #include +#include "dialog_display_options.h" + void PCB_EDIT_FRAME::InstallDisplayOptionsDialog( wxCommandEvent& aEvent ) { === modified file 'pcbnew/dialogs/dialog_display_options.h' --- pcbnew/dialogs/dialog_display_options.h 2014-10-27 14:14:39 +0000 +++ pcbnew/dialogs/dialog_display_options.h 2016-03-04 11:03:48 +0000 @@ -27,6 +27,8 @@ */ #include +class PCB_EDIT_FRAME; + class DIALOG_DISPLAY_OPTIONS : public DIALOG_DISPLAY_OPTIONS_BASE { private: @@ -40,4 +42,3 @@ void OnOkClick( wxCommandEvent& event ); void OnCancelClick( wxCommandEvent& event ); }; - === modified file 'polygon/CMakeLists.txt' --- polygon/CMakeLists.txt 2015-07-27 19:45:57 +0000 +++ polygon/CMakeLists.txt 2016-03-04 10:50:53 +0000 @@ -1,8 +1,4 @@ - -include_directories(BEFORE ${INC_BEFORE}) -include_directories( - ${INC_AFTER} - ) +include_directories( BEFORE . ) # HACK set(POLYGON_SRCS math_for_graphics.cpp @@ -14,4 +10,3 @@ add_library(polygon STATIC ${POLYGON_SRCS}) add_dependencies( polygon lib-dependencies ) - === modified file 'polygon/clipper.cpp' --- polygon/clipper.cpp 2015-11-11 18:47:51 +0000 +++ polygon/clipper.cpp 2016-03-04 10:04:51 +0000 @@ -38,7 +38,6 @@ * * *******************************************************************************/ -#include "clipper.hpp" #include #include #include @@ -48,6 +47,8 @@ #include #include +#include "clipper.hpp" + namespace ClipperLib { static double const pi = 3.141592653589793238; @@ -4342,10 +4343,10 @@ const IntPoint& pt, const IntPoint& ln1, const IntPoint& ln2) { //The equation of a line in general form (Ax + By + C = 0) - //given 2 points (x¹,y¹) & (x²,y²) is ... - //(y¹ - y²)x + (x² - x¹)y + (y² - y¹)x¹ - (x² - x¹)y¹ = 0 - //A = (y¹ - y²); B = (x² - x¹); C = (y² - y¹)x¹ - (x² - x¹)y¹ - //perpendicular distance of point (x³,y³) = (Ax³ + By³ + C)/Sqrt(A² + B²) + //given 2 points (x�,y�) & (x�,y�) is ... + //(y� - y�)x + (x� - x�)y + (y� - y�)x� - (x� - x�)y� = 0 + //A = (y� - y�); B = (x� - x�); C = (y� - y�)x� - (x� - x�)y� + //perpendicular distance of point (x�,y�) = (Ax� + By� + C)/Sqrt(A� + B�) //see http://en.wikipedia.org/wiki/Perpendicular_distance double A = double(ln1.Y - ln2.Y); double B = double(ln2.X - ln1.X); === modified file 'polygon/math_for_graphics.cpp' --- polygon/math_for_graphics.cpp 2015-12-07 13:51:46 +0000 +++ polygon/math_for_graphics.cpp 2016-03-04 10:05:38 +0000 @@ -1,13 +1,16 @@ // math for graphics utility routines and RC, from FreePCB + +#include +#include // abs(int) #include -#include +#include #include #include -#include -#include // for abs function on ints -#include + +#include "math_for_graphics.h" + static bool InRange( double x, double xi, double xf ); === modified file 'polygon/polygon_test_point_inside.cpp' --- polygon/polygon_test_point_inside.cpp 2014-10-28 19:43:12 +0000 +++ polygon/polygon_test_point_inside.cpp 2016-03-04 10:06:30 +0000 @@ -26,9 +26,12 @@ * @file polygon_test_point_inside.cpp */ + #include #include -#include + +#include "PolyLine.h" + /* this algo uses the the Jordan curve theorem to find if a point is inside or outside a polygon: * It run a semi-infinite line horizontally (increasing x, fixed y) === modified file 'potrace/CMakeLists.txt' --- potrace/CMakeLists.txt 2013-05-26 04:36:44 +0000 +++ potrace/CMakeLists.txt 2016-03-03 10:20:10 +0000 @@ -1,8 +1,3 @@ -include_directories(BEFORE ${INC_BEFORE}) -include_directories( - ${INC_AFTER} - ) - set(POTRACE_SRCS bitmap_io.cpp curve.cpp === modified file 'potrace/potracelib.cpp' --- potrace/potracelib.cpp 2016-02-28 17:04:51 +0000 +++ potrace/potracelib.cpp 2016-03-03 10:16:57 +0000 @@ -9,12 +9,13 @@ #include #include -#include "potracelib.h" #include "curve.h" #include "decompose.h" +#include "potrace_version.h" +#include "potracelib.h" +#include "progress.h" #include "trace.h" -#include "progress.h" -#include + /* default parameters */ static const potrace_param_t param_default =