Fix a few more compile warnings.

This commit is contained in:
Wayne Stambaugh 2022-08-15 14:55:25 -04:00
parent 759e1a64ef
commit 7155d1af29
2 changed files with 6 additions and 3 deletions

View File

@ -18,7 +18,7 @@
*/
#include <macros.h>
#include <base_units.h>
#include <charconv>>
#include <charconv>
#include <string_utils.h>
#include <eda_rect.h>
#include <render_settings.h>

View File

@ -2,7 +2,7 @@
* This program source code file is part of KiCad, a free EDA CAD application.
*
* Copyright (C) 2012 NBEE Embedded Systems, Miguel Angel Ajo <miguelangel@nbee.es>
* Copyright (C) 1992-2021 KiCad Developers, see AUTHORS.txt for contributors.
* Copyright (C) 1992-2022 KiCad Developers, see AUTHORS.txt for contributors.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@ -44,6 +44,7 @@
#include <kiface_ids.h>
#include <paths.h>
#include <pgm_base.h>
#include <wx_filename.h>
#include <settings/settings_manager.h>
#include <kiplatform/environment.h>
@ -120,7 +121,9 @@ bool SCRIPTING::scriptingSetup()
pyHome.Assign( Pgm().GetExecutablePath() );
pyHome.Normalize();
// @warning Do we want to use our own ExpandEnvVarSubstitutions() here rather than depend
// on wxFileName::Normalize() to expand environment variables.
pyHome.Normalize( FN_NORMALIZE_FLAGS | wxPATH_NORM_ENV_VARS );
// MUST be called before Py_Initialize so it will to create valid default lib paths
if( !wxGetEnv( wxT( "KICAD_USE_EXTERNAL_PYTHONHOME" ), nullptr ) )