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

Fix msys2 build

This commit is contained in:
Marek Roszko 2024-03-21 19:46:12 -04:00
parent de85b2217b
commit f0912b6128
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common/settings/parameters.cpp
View File

@ -55,7 +55,6 @@ bool PARAM_PATH_LIST::MatchesFile( JSON_SETTINGS* aSettings ) const
} }
void PARAM_WXSTRING_MAP::Load( JSON_SETTINGS* aSettings, bool aResetIfMissing ) const void PARAM_WXSTRING_MAP::Load( JSON_SETTINGS* aSettings, bool aResetIfMissing ) const
{ {
if( m_readOnly ) if( m_readOnly )
@ -116,7 +115,7 @@ bool PARAM_WXSTRING_MAP::MatchesFile( JSON_SETTINGS* aSettings ) const
return false; return false;
} }
#if !defined( __MINGW32__ )
// Instantiate all required templates here and export // Instantiate all required templates here and export
template class KICOMMON_API PARAM_LAMBDA<bool>; template class KICOMMON_API PARAM_LAMBDA<bool>;
template class KICOMMON_API PARAM_LAMBDA<int>; template class KICOMMON_API PARAM_LAMBDA<int>;
@ -137,4 +136,5 @@ template class KICOMMON_API PARAM_SET<wxString>;
template class KICOMMON_API PARAM_MAP<int>; template class KICOMMON_API PARAM_MAP<int>;
template class KICOMMON_API PARAM_MAP<double>; template class KICOMMON_API PARAM_MAP<double>;
template class KICOMMON_API PARAM_MAP<bool>; template class KICOMMON_API PARAM_MAP<bool>;
#endif

8
include/settings/parameters.h
View File

@ -368,7 +368,7 @@ private:
std::function<void( ValueType )> m_setter; std::function<void( ValueType )> m_setter;
}; };
#ifdef _MSC_VER #ifdef __WINDOWS__
template class KICOMMON_API PARAM_LAMBDA<bool>; template class KICOMMON_API PARAM_LAMBDA<bool>;
template class KICOMMON_API PARAM_LAMBDA<int>; template class KICOMMON_API PARAM_LAMBDA<int>;
template class KICOMMON_API PARAM_LAMBDA<nlohmann::json>; template class KICOMMON_API PARAM_LAMBDA<nlohmann::json>;
@ -557,7 +557,7 @@ protected:
}; };
#ifdef _MSC_VER #ifdef __WINDOWS__
template class KICOMMON_API PARAM_LIST<bool>; template class KICOMMON_API PARAM_LIST<bool>;
template class KICOMMON_API PARAM_LIST<int>; template class KICOMMON_API PARAM_LIST<int>;
template class KICOMMON_API PARAM_LIST<double>; template class KICOMMON_API PARAM_LIST<double>;
@ -656,7 +656,7 @@ protected:
std::set<Type> m_default; std::set<Type> m_default;
}; };
#ifdef _MSC_VER #ifdef __WINDOWS__
template class KICOMMON_API PARAM_SET<wxString>; template class KICOMMON_API PARAM_SET<wxString>;
#else #else
extern template class APIVISIBLE PARAM_SET<wxString>; extern template class APIVISIBLE PARAM_SET<wxString>;
@ -797,7 +797,7 @@ private:
}; };
#ifdef _MSC_VER #ifdef __WINDOWS__
template class KICOMMON_API PARAM_MAP<int>; template class KICOMMON_API PARAM_MAP<int>;
template class KICOMMON_API PARAM_MAP<double>; template class KICOMMON_API PARAM_MAP<double>;
template class KICOMMON_API PARAM_MAP<bool>; template class KICOMMON_API PARAM_MAP<bool>;