Commit 6ab5ad27 authored by dickelbeck's avatar dickelbeck
Browse files

Wayne Stambaugh's patch which allows infospgm.cpp to be compiled once rather than for each program

parent eaa147c1

CMakeLists.txt

+5 −1
Original line number Diff line number Diff line
@@ -25,8 +25,12 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.4.6 FATAL_ERROR) 
# Path to local CMake modules

SET(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/CMakeModules)



# Command line option to enable or disable building minizip.  Minizip

# is building is enabled by defaut.  Use -DKICAD_MINZIP=OFF to disable

# building minizip.

OPTION(KICAD_MINIZIP "enable/disable building minizip (default ON)" ON)

# Comment this out if you don't want to build minizip.

SET(KICAD_MINIZIP ON CACHE BOOL "Build minizip?")

#SET(KICAD_MINIZIP ON CACHE BOOL "Build minizip?")



# Comment this out if you don't want to build with Python support.

# SET(KICAD_PYTHON ON CACHE BOOL "Build with Python support?")

common/CMakeLists.txt

+2 −1
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ SET(COMMON_SRCS 
	toolbars.cpp

	trigo.cpp

	worksheet.cpp

	wxwineda.cpp)

	wxwineda.cpp

	../share/infospgm.cpp)



ADD_LIBRARY(common ${COMMON_SRCS})

common/basicframe.cpp

+1 −1
Original line number Diff line number Diff line
@@ -222,7 +222,7 @@ void WinEDA_BasicFrame::GetKicadHelp(wxCommandEvent& event) 
void WinEDA_BasicFrame::GetKicadAbout(wxCommandEvent& event)

/**********************************************************/

{

	Print_Kicad_Infos(this);

	Print_Kicad_Infos(this, m_AboutTitle);

}



/********************************************************************/

common/pyhandler.cpp

+7 −7
Original line number Diff line number Diff line
@@ -140,7 +140,7 @@ void PyHandler::DoInitModules() 


    for ( unsigned int i = 0; i < m_ModuleRegistry.size(); i ++ )

    {

        detail::init_module( m_ModuleRegistry[i].name.fn_str(), &InitPyModules );

        detail::init_module( m_ModuleRegistry[i].name.mb_str(), &InitPyModules );

    }

}
@@ -244,14 +244,14 @@ bool PyHandler::RunScript( const wxString & name ) 
    object ns = module.attr( "__dict__" );

    bool ret = true;



    FILE * file = fopen( name.fn_str(), "r" );

    FILE * file = fopen( name.mb_str(), "r" );



    wxPyBlock_t blocked = wxPyBeginBlockThreads();



    if ( !file )

    {

    	// do something

    	std::cout << "Unable to Load " << name.fn_str()  << "\n";

    	std::cout << "Unable to Load " << name.mb_str()  << "\n";

    	ret = false;

    }

    else
@@ -265,7 +265,7 @@ bool PyHandler::RunScript( const wxString & name ) 
        try

        {

            ns["currentScript"] = Convert( name );

            handle<> ignored( PyRun_File( file, name.fn_str(), Py_file_input,  ns.ptr(), ns.ptr() ) );

            handle<> ignored( PyRun_File( file, name.mb_str(), Py_file_input,  ns.ptr(), ns.ptr() ) );

        }

        catch ( error_already_set )

        {
@@ -286,7 +286,7 @@ bool PyHandler::RunSimpleString( const wxString & code ) 
    wxPyBlock_t blocked = wxPyBeginBlockThreads();

	try

	{

    	PyRun_SimpleString( code.fn_str() );

    	PyRun_SimpleString( code.mb_str() );

	}

	catch ( error_already_set )

	{
@@ -346,7 +346,7 @@ void PyHandler::TriggerEvent( const wxString & key, const object & param ) 
        }

        catch (error_already_set)

        {

            std::cout << "Error in event " << key.fn_str() << " callback" << std::endl;

            std::cout << "Error in event " << key.mb_str() << " callback" << std::endl;

            PyErr_Print();

        }

    }
@@ -378,6 +378,6 @@ void PyHandler::UnRegisterCallback( const wxString & key, const object & callbac 


wxString PyHandler::MakeStr( const object & objStr ) { return wxString( extract<const char *>( objStr ), wxConvLocal ); }



object PyHandler::Convert( const wxString & wxStr ) { return str( std::string( wxStr.fn_str() ).c_str() ); }

object PyHandler::Convert( const wxString & wxStr ) { return str( std::string( wxStr.mb_str() ).c_str() ); }



// vim: set tabstop=4 :

cvpcb/CMakeLists.txt

+0 −1
Original line number Diff line number Diff line
@@ -54,7 +54,6 @@ SET(CVPCB_EXTRA_SRCS 


	../share/drawframe.cpp

	../share/drawpanel.cpp

	../share/infospgm.cpp

	../share/zoom.cpp)



IF(WIN32)