Browse Source

Switch the kiface extension on windows to native dll

Fixes issue where Windows really wants to see the DLL extension to load the resource metadata
7.0
Marek Roszko 4 years ago
parent
commit
6b9fc02f59
  1. 7
      CMakeLists.txt
  2. 2
      resources/msw/cvpcb-dll.rc
  3. 2
      resources/msw/eeschema-dll.rc
  4. 2
      resources/msw/gerbview-dll.rc
  5. 2
      resources/msw/pcb_calculator-dll.rc
  6. 2
      resources/msw/pcbnew-dll.rc
  7. 2
      resources/msw/pl_editor-dll.rc

7
CMakeLists.txt

@ -503,9 +503,10 @@ endif()
# KIFACE_SUFFIX is the file extension used for top level program modules which
# implement the KIFACE interface. A valid suffix starts with a period '.'.
if( false )
# This is the eventual situation near milestone C) of modular-kicad blueprint.
# Until then we use .kiface extension so we don't collide with python DSO.
if( WIN32 )
# We use .kiface extension so we don't collide with python DSO. (Linux/mac issue?)
# Windows works fine with the native dll extension
# which also resolves metadata issues because windows wants to see the dll extension
set( KIFACE_SUFFIX ${CMAKE_SHARED_MODULE_SUFFIX} )
else()
# Temporary situation until we can dovetail the python DSO into the kiface DSO.

2
resources/msw/cvpcb-dll.rc

@ -1,5 +1,5 @@
#define RC_VER_FILE_DESCRIPTION "KiCad Dynamic Link Library " KICAD_WIN32_RC_PRODVER_STR
#define RC_VER_INTERNALNAME "_cvpcb"
#define RC_VER_ORIGINALFILENAME "_cvpcb.kiface"
#define RC_VER_ORIGINALFILENAME "_cvpcb.dll"
#include "kiwin32-dll.rc"

2
resources/msw/eeschema-dll.rc

@ -1,4 +1,4 @@
#define RC_VER_FILE_DESCRIPTION "KiCad Schematic Editor " KICAD_WIN32_RC_PRODVER_STR
#define RC_VER_INTERNALNAME "_eeschema"
#define RC_VER_ORIGINALFILENAME "_eeschema.kiface"
#define RC_VER_ORIGINALFILENAME "_eeschema.dll"
#include "kiwin32-dll.rc"

2
resources/msw/gerbview-dll.rc

@ -1,4 +1,4 @@
#define RC_VER_FILE_DESCRIPTION "KiCad Gerber Viewer " KICAD_WIN32_RC_PRODVER_STR
#define RC_VER_INTERNALNAME "_gerbview"
#define RC_VER_ORIGINALFILENAME "_gerbview.kiface"
#define RC_VER_ORIGINALFILENAME "_gerbview.dll"
#include "kiwin32-dll.rc"

2
resources/msw/pcb_calculator-dll.rc

@ -1,4 +1,4 @@
#define RC_VER_FILE_DESCRIPTION "KiCad PCB Calculator " KICAD_WIN32_RC_PRODVER_STR
#define RC_VER_INTERNALNAME "_pcb_calculator"
#define RC_VER_ORIGINALFILENAME "_pcb_calculator.kiface"
#define RC_VER_ORIGINALFILENAME "_pcb_calculator.dll"
#include "kiwin32-dll.rc"

2
resources/msw/pcbnew-dll.rc

@ -1,4 +1,4 @@
#define RC_VER_FILE_DESCRIPTION "KiCad PCB Editor " KICAD_WIN32_RC_PRODVER_STR
#define RC_VER_INTERNALNAME "_pcbnew"
#define RC_VER_ORIGINALFILENAME "_pcbnew.kiface"
#define RC_VER_ORIGINALFILENAME "_pcbnew.dll"
#include "kiwin32-dll.rc"

2
resources/msw/pl_editor-dll.rc

@ -1,4 +1,4 @@
#define RC_VER_FILE_DESCRIPTION "KiCad Drawing Sheet Editor " KICAD_WIN32_RC_PRODVER_STR
#define RC_VER_INTERNALNAME "_pl_editor"
#define RC_VER_ORIGINALFILENAME "_pl_editor.kiface"
#define RC_VER_ORIGINALFILENAME "_pl_editor.dll"
#include "kiwin32-dll.rc"
Loading…
Cancel
Save