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

Fix windows build 

core needs to be linked after wxWidgets + use wide string literals
This commit is contained in:
Roberto Fernandez Bautista 2023-07-24 22:59:41 +02:00
parent 9902250f5d
commit 6cb804228b
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libs/kiplatform/CMakeLists.txt
View File

@ -86,7 +86,7 @@ target_include_directories( kiplatform PUBLIC
) )
target_link_libraries( kiplatform target_link_libraries( kiplatform
core
${wxWidgets_LIBRARIES} ${wxWidgets_LIBRARIES}
${PLATFORM_LIBS} ${PLATFORM_LIBS}
core # include after wxWidgets to have correct macro definitions for windows headers
) )

2
libs/kiplatform/msw/drivers.cpp
View File

@ -32,7 +32,7 @@ bool KIPLATFORM::DRIVERS::Valid3DConnexionDriverVersion()
// Open the registry key for 3dConnexion // Open the registry key for 3dConnexion
if( RegOpenKeyEx( HKEY_LOCAL_MACHINE, if( RegOpenKeyEx( HKEY_LOCAL_MACHINE,
"Software\\3Dconnexion\\3DxWare Version", L"Software\\3Dconnexion\\3DxWare Version",
0, KEY_READ, &hKey ) == ERROR_SUCCESS ) 0, KEY_READ, &hKey ) == ERROR_SUCCESS )
{ {
char buffer[256]; char buffer[256];