From 8c714066154a9d5052386eed0f5ee890a857744d Mon Sep 17 00:00:00 2001 From: Dick Hollenbeck Date: Fri, 15 Nov 2013 09:12:07 -0600 Subject: [PATCH] fix link error with multiply used edaapl.cpp --- common/edaappl.cpp | 2 +- common/fp_lib_table.cpp | 2 +- include/fp_lib_table.h | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/common/edaappl.cpp b/common/edaappl.cpp index e8d138e58f..afc4d7644c 100644 --- a/common/edaappl.cpp +++ b/common/edaappl.cpp @@ -1162,7 +1162,7 @@ bool EDA_APP::LockFile( const wxString& fileName ) bool EDA_APP::SetFootprintLibTablePath() { wxString path; - wxString kisysmod = FP_LIB_TABLE::GlobalPathEnvVariableName(); + wxString kisysmod( wxT( KISYSMOD ) ); // Set the KISYSMOD environment variable for the current process if it is not already // defined in the user's environment. This is required to expand the global footprint diff --git a/common/fp_lib_table.cpp b/common/fp_lib_table.cpp index e1e704ff22..6f5fcd4d25 100644 --- a/common/fp_lib_table.cpp +++ b/common/fp_lib_table.cpp @@ -736,7 +736,7 @@ const wxString FP_LIB_TABLE::ProjectPathEnvVariableName() const wxString FP_LIB_TABLE::GlobalPathEnvVariableName() { - return wxT( "KISYSMOD" ); + return wxT( KISYSMOD ); } diff --git a/include/fp_lib_table.h b/include/fp_lib_table.h index e18a1cf5ae..9f0e97a8b8 100644 --- a/include/fp_lib_table.h +++ b/include/fp_lib_table.h @@ -34,6 +34,8 @@ #include +#define KISYSMOD "KISYSMOD" + class wxFileName; class OUTPUTFORMATTER; class MODULE;