Relocate win32 resource files to the central folder for further consolidation
This commit is contained in:
parent
a82764f43a
commit
3d4ac9af03
|
@ -124,3 +124,5 @@ i18n_status.csv
|
||||||
# Don't actually ignore any of these files, since we need them in the tree
|
# Don't actually ignore any of these files, since we need them in the tree
|
||||||
!resources/linux/icons/hicolor/**/**/*
|
!resources/linux/icons/hicolor/**/**/*
|
||||||
!CMakeModules/**/*
|
!CMakeModules/**/*
|
||||||
|
# Junk temp files generated by MSVC for resource files
|
||||||
|
/resources/msw/RC*
|
||||||
|
|
|
@ -12,7 +12,7 @@ macro(mingw_resource_compiler _NAME)
|
||||||
dbg_msg("CMAKE_RC_COMPILER: ${CMAKE_RC_COMPILER}")
|
dbg_msg("CMAKE_RC_COMPILER: ${CMAKE_RC_COMPILER}")
|
||||||
|
|
||||||
# Input file.
|
# Input file.
|
||||||
set(_IN "${CMAKE_CURRENT_SOURCE_DIR}/${_NAME}.rc")
|
set(_IN "${CMAKE_SOURCE_DIR}/resources/msw/${_NAME}.rc")
|
||||||
dbg_msg("_IN: ${_IN}")
|
dbg_msg("_IN: ${_IN}")
|
||||||
|
|
||||||
# Output file.
|
# Output file.
|
||||||
|
|
|
@ -30,7 +30,7 @@ if( MINGW )
|
||||||
# BITMAP2COMPONENT_RESOURCES variable is set by the macro.
|
# BITMAP2COMPONENT_RESOURCES variable is set by the macro.
|
||||||
mingw_resource_compiler( bitmap2component )
|
mingw_resource_compiler( bitmap2component )
|
||||||
else()
|
else()
|
||||||
set( BITMAP2COMPONENT_RESOURCES bitmap2component.rc )
|
set( BITMAP2COMPONENT_RESOURCES ${CMAKE_SOURCE_DIR}/resources/msw/bitmap2component.rc )
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if( APPLE )
|
if( APPLE )
|
||||||
|
|
|
@ -49,7 +49,7 @@ if( MINGW )
|
||||||
# CVPCB_RESOURCES variable is set by the macro.
|
# CVPCB_RESOURCES variable is set by the macro.
|
||||||
mingw_resource_compiler( cvpcb )
|
mingw_resource_compiler( cvpcb )
|
||||||
else()
|
else()
|
||||||
set( CVPCB_RESOURCES cvpcb.rc )
|
set( CVPCB_RESOURCES ${CMAKE_SOURCE_DIR}/resources/msw/cvpcb.rc )
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -309,7 +309,7 @@ if( MINGW )
|
||||||
# EESCHEMA_RESOURCES variable is set by the macro.
|
# EESCHEMA_RESOURCES variable is set by the macro.
|
||||||
mingw_resource_compiler( eeschema )
|
mingw_resource_compiler( eeschema )
|
||||||
else()
|
else()
|
||||||
set( EESCHEMA_RESOURCES eeschema.rc )
|
set( EESCHEMA_RESOURCES ${CMAKE_SOURCE_DIR}/resources/msw/eeschema.rc )
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
# Create a C++ compilable string initializer containing markdown text into a *.h file:
|
# Create a C++ compilable string initializer containing markdown text into a *.h file:
|
||||||
|
|
|
@ -83,7 +83,7 @@ if( MINGW )
|
||||||
# GERBVIEW_RESOURCES variable is set by the macro.
|
# GERBVIEW_RESOURCES variable is set by the macro.
|
||||||
mingw_resource_compiler( gerbview )
|
mingw_resource_compiler( gerbview )
|
||||||
else()
|
else()
|
||||||
set( GERBVIEW_RESOURCES gerbview.rc )
|
set( GERBVIEW_RESOURCES ${CMAKE_SOURCE_DIR}/resources/msw/gerbview.rc )
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if( APPLE )
|
if( APPLE )
|
||||||
|
|
|
@ -37,7 +37,7 @@ if( MINGW )
|
||||||
# KICAD_RESOURCES variable is set by the macro.
|
# KICAD_RESOURCES variable is set by the macro.
|
||||||
mingw_resource_compiler( kicad )
|
mingw_resource_compiler( kicad )
|
||||||
else()
|
else()
|
||||||
set( KICAD_RESOURCES kicad.rc )
|
set( KICAD_RESOURCES ${CMAKE_SOURCE_DIR}/resources/msw/kicad.rc )
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if( APPLE )
|
if( APPLE )
|
||||||
|
|
|
@ -56,7 +56,7 @@ if( MINGW )
|
||||||
# PL_EDITOR_RESOURCES variable is set by the macro.
|
# PL_EDITOR_RESOURCES variable is set by the macro.
|
||||||
mingw_resource_compiler( pl_editor )
|
mingw_resource_compiler( pl_editor )
|
||||||
else()
|
else()
|
||||||
set( PL_EDITOR_RESOURCES pl_editor.rc )
|
set( PL_EDITOR_RESOURCES ${CMAKE_SOURCE_DIR}/resources/msw/pl_editor.rc )
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -41,7 +41,7 @@ if( MINGW )
|
||||||
# PCB_CALCULATOR_RESOURCES variable is set by the macro.
|
# PCB_CALCULATOR_RESOURCES variable is set by the macro.
|
||||||
mingw_resource_compiler( pcb_calculator )
|
mingw_resource_compiler( pcb_calculator )
|
||||||
else()
|
else()
|
||||||
set( PCB_CALCULATOR_RESOURCES pcb_calculator.rc )
|
set( PCB_CALCULATOR_RESOURCES ${CMAKE_SOURCE_DIR}/resources/msw/pcb_calculator.rc )
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if( APPLE )
|
if( APPLE )
|
||||||
|
|
|
@ -570,7 +570,7 @@ if( MINGW )
|
||||||
# PCBNEW_RESOURCES variable is set by the macro.
|
# PCBNEW_RESOURCES variable is set by the macro.
|
||||||
mingw_resource_compiler( pcbnew )
|
mingw_resource_compiler( pcbnew )
|
||||||
else()
|
else()
|
||||||
set( PCBNEW_RESOURCES pcbnew.rc )
|
set( PCBNEW_RESOURCES ${CMAKE_SOURCE_DIR}/resources/msw/pcbnew.rc )
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue