haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
This commit is contained in:
Marek Roszko 2022-03-11 21:10:41 -05:00
parent ae1cc29dc6
commit 674fbfa889
7 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CMakeLists.txt
View File

@ -499,9 +499,10 @@ endif()
# KIFACE_SUFFIX is the file extension used for top level program modules which # KIFACE_SUFFIX is the file extension used for top level program modules which
# implement the KIFACE interface. A valid suffix starts with a period '.'. # implement the KIFACE interface. A valid suffix starts with a period '.'.
if( false ) if( WIN32 )
# This is the eventual situation near milestone C) of modular-kicad blueprint. # We use .kiface extension so we don't collide with python DSO. (Linux/mac issue?)
# Until then we use .kiface extension so we don't collide with python DSO. # 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} ) set( KIFACE_SUFFIX ${CMAKE_SHARED_MODULE_SUFFIX} )
else() else()
# Temporary situation until we can dovetail the python DSO into the kiface DSO. # Temporary situation until we can dovetail the python DSO into the kiface DSO.

2
resources/msw/cvpcb-dll.rc
View File

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

2
resources/msw/eeschema-dll.rc
View File

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

2
resources/msw/gerbview-dll.rc
View File

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

2
resources/msw/pcb_calculator-dll.rc
View File

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

2
resources/msw/pcbnew-dll.rc
View File

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

2
resources/msw/pl_editor-dll.rc
View File

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