Browse Source

Relocate win32 resource files to the central folder for further consolidation

6.0.7
Marek Roszko 5 years ago
parent
commit
3d4ac9af03
  1. 2
      .gitignore
  2. 2
      CMakeModules/MinGWResourceCompiler.cmake
  3. 2
      bitmap2component/CMakeLists.txt
  4. 2
      cvpcb/CMakeLists.txt
  5. 2
      eeschema/CMakeLists.txt
  6. 2
      gerbview/CMakeLists.txt
  7. 2
      kicad/CMakeLists.txt
  8. 2
      pagelayout_editor/CMakeLists.txt
  9. 2
      pcb_calculator/CMakeLists.txt
  10. 2
      pcbnew/CMakeLists.txt
  11. 0
      resources/msw/bitmap2component.rc
  12. 0
      resources/msw/cvpcb.rc
  13. 0
      resources/msw/eeschema.rc
  14. 0
      resources/msw/gerbview.rc
  15. 0
      resources/msw/kicad.rc
  16. 0
      resources/msw/pcb_calculator.rc
  17. 0
      resources/msw/pcbnew.rc
  18. 0
      resources/msw/pl_editor.rc

2
.gitignore

@ -124,3 +124,5 @@ i18n_status.csv
# Don't actually ignore any of these files, since we need them in the tree
!resources/linux/icons/hicolor/**/**/*
!CMakeModules/**/*
# Junk temp files generated by MSVC for resource files
/resources/msw/RC*

2
CMakeModules/MinGWResourceCompiler.cmake

@ -12,7 +12,7 @@ macro(mingw_resource_compiler _NAME)
dbg_msg("CMAKE_RC_COMPILER: ${CMAKE_RC_COMPILER}")
# Input file.
set(_IN "${CMAKE_CURRENT_SOURCE_DIR}/${_NAME}.rc")
set(_IN "${CMAKE_SOURCE_DIR}/resources/msw/${_NAME}.rc")
dbg_msg("_IN: ${_IN}")
# Output file.

2
bitmap2component/CMakeLists.txt

@ -30,7 +30,7 @@ if( MINGW )
# BITMAP2COMPONENT_RESOURCES variable is set by the macro.
mingw_resource_compiler( bitmap2component )
else()
set( BITMAP2COMPONENT_RESOURCES bitmap2component.rc )
set( BITMAP2COMPONENT_RESOURCES ${CMAKE_SOURCE_DIR}/resources/msw/bitmap2component.rc )
endif()
if( APPLE )

2
cvpcb/CMakeLists.txt

@ -49,7 +49,7 @@ if( MINGW )
# CVPCB_RESOURCES variable is set by the macro.
mingw_resource_compiler( cvpcb )
else()
set( CVPCB_RESOURCES cvpcb.rc )
set( CVPCB_RESOURCES ${CMAKE_SOURCE_DIR}/resources/msw/cvpcb.rc )
endif()

2
eeschema/CMakeLists.txt

@ -309,7 +309,7 @@ if( MINGW )
# EESCHEMA_RESOURCES variable is set by the macro.
mingw_resource_compiler( eeschema )
else()
set( EESCHEMA_RESOURCES eeschema.rc )
set( EESCHEMA_RESOURCES ${CMAKE_SOURCE_DIR}/resources/msw/eeschema.rc )
endif()
# Create a C++ compilable string initializer containing markdown text into a *.h file:

2
gerbview/CMakeLists.txt

@ -83,7 +83,7 @@ if( MINGW )
# GERBVIEW_RESOURCES variable is set by the macro.
mingw_resource_compiler( gerbview )
else()
set( GERBVIEW_RESOURCES gerbview.rc )
set( GERBVIEW_RESOURCES ${CMAKE_SOURCE_DIR}/resources/msw/gerbview.rc )
endif()
if( APPLE )

2
kicad/CMakeLists.txt

@ -37,7 +37,7 @@ if( MINGW )
# KICAD_RESOURCES variable is set by the macro.
mingw_resource_compiler( kicad )
else()
set( KICAD_RESOURCES kicad.rc )
set( KICAD_RESOURCES ${CMAKE_SOURCE_DIR}/resources/msw/kicad.rc )
endif()
if( APPLE )

2
pagelayout_editor/CMakeLists.txt

@ -56,7 +56,7 @@ if( MINGW )
# PL_EDITOR_RESOURCES variable is set by the macro.
mingw_resource_compiler( pl_editor )
else()
set( PL_EDITOR_RESOURCES pl_editor.rc )
set( PL_EDITOR_RESOURCES ${CMAKE_SOURCE_DIR}/resources/msw/pl_editor.rc )
endif()

2
pcb_calculator/CMakeLists.txt

@ -41,7 +41,7 @@ if( MINGW )
# PCB_CALCULATOR_RESOURCES variable is set by the macro.
mingw_resource_compiler( pcb_calculator )
else()
set( PCB_CALCULATOR_RESOURCES pcb_calculator.rc )
set( PCB_CALCULATOR_RESOURCES ${CMAKE_SOURCE_DIR}/resources/msw/pcb_calculator.rc )
endif()
if( APPLE )

2
pcbnew/CMakeLists.txt

@ -570,7 +570,7 @@ if( MINGW )
# PCBNEW_RESOURCES variable is set by the macro.
mingw_resource_compiler( pcbnew )
else()
set( PCBNEW_RESOURCES pcbnew.rc )
set( PCBNEW_RESOURCES ${CMAKE_SOURCE_DIR}/resources/msw/pcbnew.rc )
endif()

0
bitmap2component/bitmap2component.rc → resources/msw/bitmap2component.rc

0
cvpcb/cvpcb.rc → resources/msw/cvpcb.rc

0
eeschema/eeschema.rc → resources/msw/eeschema.rc

0
gerbview/gerbview.rc → resources/msw/gerbview.rc

0
kicad/kicad.rc → resources/msw/kicad.rc

0
pcb_calculator/pcb_calculator.rc → resources/msw/pcb_calculator.rc

0
pcbnew/pcbnew.rc → resources/msw/pcbnew.rc

0
pagelayout_editor/pl_editor.rc → resources/msw/pl_editor.rc

Loading…
Cancel
Save