Commit 262ec892 authored by jean-pierre charras's avatar jean-pierre charras
Browse files

Minor fixes for Windows: move resources from dso to .exe, to have the... 

Minor fixes for Windows: move resources from dso to .exe, to have the application icon in executable, and therefore shown in shortcuts.
pcb_calculator: minor coding style fix.
parent 4a39fcdd

cvpcb/CMakeLists.txt

+2 −1
Original line number Diff line number Diff line
@@ -73,6 +73,7 @@ if( USE_KIWAY_DLLS ) 
    add_executable( cvpcb WIN32 MACOSX_BUNDLE

        ../common/single_top.cpp

        ../common/pgm_base.cpp

        ${CVPCB_RESOURCES}

        )

    set_source_files_properties( ../common/single_top.cpp PROPERTIES

        COMPILE_DEFINITIONS "TOP_FRAME=CVPCB_FRAME_TYPE;PGM_DATA_FILE_EXT=\"net\";BUILD_KIWAY_DLL"
@@ -94,7 +95,7 @@ if( USE_KIWAY_DLLS ) 
        cvpcb.cpp

        ${CVPCB_SRCS}

        ${CVPCB_DIALOGS}

        ${CVPCB_RESOURCES}

#        ${CVPCB_RESOURCES}

        )

    set_target_properties( cvpcb_kiface PROPERTIES

        OUTPUT_NAME     cvpcb

eeschema/CMakeLists.txt

+2 −1
Original line number Diff line number Diff line
@@ -242,6 +242,7 @@ if( USE_KIWAY_DLLS ) 
    add_executable( eeschema WIN32 MACOSX_BUNDLE

        ../common/single_top.cpp

        ../common/pgm_base.cpp

        ${EESCHEMA_RESOURCES}

        )

    set_source_files_properties( ../common/single_top.cpp PROPERTIES

        COMPILE_DEFINITIONS "TOP_FRAME=SCHEMATIC_FRAME_TYPE;PGM_DATA_FILE_EXT=\"sch\";BUILD_KIWAY_DLL"
@@ -258,7 +259,7 @@ if( USE_KIWAY_DLLS ) 
    add_library( eeschema_kiface MODULE

        ${EESCHEMA_SRCS}

        ${EESCHEMA_COMMON_SRCS}

        ${EESCHEMA_RESOURCES}

#        ${EESCHEMA_RESOURCES}

        )

    target_link_libraries( eeschema_kiface

        common

gerbview/CMakeLists.txt

+2 −1
Original line number Diff line number Diff line
@@ -91,6 +91,7 @@ if( USE_KIWAY_DLLS ) 
    add_executable( gerbview WIN32 MACOSX_BUNDLE

        ../common/single_top.cpp

        ../common/pgm_base.cpp

        ${GERBVIEW_RESOURCES}

        )

    set_source_files_properties( ../common/single_top.cpp PROPERTIES

        COMPILE_DEFINITIONS "TOP_FRAME=GERBER_FRAME_TYPE;BUILD_KIWAY_DLL"
@@ -113,7 +114,7 @@ if( USE_KIWAY_DLLS ) 
        ${GERBVIEW_SRCS}

        ${DIALOGS_SRCS}

        ${GERBVIEW_EXTRA_SRCS}

        ${GERBVIEW_RESOURCES}

#        ${GERBVIEW_RESOURCES}

        )

    set_target_properties( gerbview_kiface PROPERTIES

        OUTPUT_NAME     gerbview

pagelayout_editor/CMakeLists.txt

+5 −4
Original line number Diff line number Diff line
@@ -49,10 +49,11 @@ endif() 


if( USE_KIWAY_DLLS )



    # a very small program launcher for pcbnew_kiface

    # a very small program launcher for pl_editor_kiface

    add_executable( pl_editor WIN32 MACOSX_BUNDLE

        ../common/single_top.cpp

        ../common/pgm_base.cpp

        ${PL_EDITOR_RESOURCES}

        )

    set_source_files_properties( ../common/single_top.cpp PROPERTIES

        COMPILE_DEFINITIONS "TOP_FRAME=PL_EDITOR_FRAME_TYPE;PGM_DATA_FILE_EXT=\"kicad_wks\";BUILD_KIWAY_DLL"
@@ -69,13 +70,13 @@ if( USE_KIWAY_DLLS ) 
            LINK_FLAGS "${TO_LINKER},-cref ${TO_LINKER},-Map=pl_editor.map" )

    endif()



    # the main pcbnew program, in DSO form.

    # the main pl_editor program, in DSO form.

    add_library( pl_editor_kiface MODULE

        pl_editor.cpp

        ${PL_EDITOR_SRCS}

        ${DIALOGS_SRCS}

        ${PL_EDITOR_EXTRA_SRCS}

        ${PL_EDITOR_RESOURCES}

#        ${PL_EDITOR_RESOURCES}

        )

    target_link_libraries( pl_editor_kiface

        common
@@ -99,7 +100,7 @@ if( USE_KIWAY_DLLS ) 
            LINK_FLAGS "${TO_LINKER},-cref ${TO_LINKER},-Map=_pl_editor.kiface.map" )

    endif()



    # if building pcbnew, then also build pcbnew_kiface if out of date.

    # if building pl_editor, then also build pl_editor_kiface if out of date.

    add_dependencies( pl_editor pl_editor_kiface )



    # these 2 binaries are a matched set, keep them together:

pcb_calculator/CMakeLists.txt

+2 −1
Original line number Diff line number Diff line
@@ -72,6 +72,7 @@ if( USE_KIWAY_DLLS ) 
    add_executable( pcb_calculator WIN32 MACOSX_BUNDLE

        ../common/single_top.cpp

        ../common/pgm_base.cpp

        ${PCB_CALCULATOR_RESOURCES}

        )

    set_source_files_properties( ../common/single_top.cpp PROPERTIES

        COMPILE_DEFINITIONS "TOP_FRAME=0;BUILD_KIWAY_DLL"
@@ -92,7 +93,7 @@ if( USE_KIWAY_DLLS ) 
    add_library( pcb_calculator_kiface MODULE

        pcb_calculator.cpp

        ${PCB_CALCULATOR_SRCS}

        ${PCB_CALCULATOR_RESOURCES}

#        ${PCB_CALCULATOR_RESOURCES}

        )

    set_target_properties( pcb_calculator_kiface PROPERTIES

        OUTPUT_NAME     pcb_calculator