Commit b9259f85 authored by dickelbeck's avatar dickelbeck
Browse files

fixed g++ 4.1.2 compiler warnings, added USE_MATCH_LAYER build option

parent 9ae3184b

common/copy_to_clipboard.cpp

+2 −2
Original line number Original line Diff line number Diff line
@@ -25,8 +25,8 @@ 




extern BASE_SCREEN * ActiveScreen;

extern BASE_SCREEN * ActiveScreen;





static bool s_PlotBlackAndWhite = FALSE;

static const bool s_PlotBlackAndWhite = FALSE;

static bool Print_Sheet_Ref = TRUE;

static const bool Print_Sheet_Ref = TRUE;





static bool DrawPage(WinEDA_DrawPanel * panel);

static bool DrawPage(WinEDA_DrawPanel * panel);

eeschema/plothpgl.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -501,7 +501,7 @@ int margin; 
	/* Build the screen list */

	/* Build the screen list */

	EDA_ScreenList ScreenList(NULL);

	EDA_ScreenList ScreenList(NULL);





	if ( Select_PlotAll == TRUE ) screen = screen = ScreenList.GetFirst();

	if ( Select_PlotAll == TRUE ) screen = ScreenList.GetFirst();

	else screen = ActiveScreen;

	else screen = ActiveScreen;

	for ( ; screen != NULL; screen = ScreenList.GetNext() )

	for ( ; screen != NULL; screen = ScreenList.GetNext() )

	{

	{

eeschema/plotps.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -329,7 +329,7 @@ wxPoint plot_offset; 
	/* Build the screen list */

	/* Build the screen list */

	EDA_ScreenList ScreenList(NULL);

	EDA_ScreenList ScreenList(NULL);





	if ( AllPages == TRUE ) screen = screen = ScreenList.GetFirst();

	if ( AllPages == TRUE ) screen = ScreenList.GetFirst();

	else screen = ActiveScreen;

	else screen = ActiveScreen;

	for ( ; screen != NULL; screen = ScreenList.GetNext() )

	for ( ; screen != NULL; screen = ScreenList.GetNext() )

	{

	{

libs.linux

+6 −0
Original line number Original line Diff line number Diff line
@@ -62,6 +62,12 @@ LDFLAGS = -s #-v 
endif

endif









# a command line define which affects pcbnew only, causing it to match current layer 

ifdef USE_MATCH_LAYER

CPPFLAGS += -DUSE_MATCH_LAYER

endif





# You must comment or uncomment this line to disable/enable python support

# You must comment or uncomment this line to disable/enable python support

#KICAD_PYTHON = 1

#KICAD_PYTHON = 1

pcbnew/class_module.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -60,7 +60,7 @@ public: 
    wxSize m_Ext;           // marges de "garde": utilise en placement auto.

    wxSize m_Ext;           // marges de "garde": utilise en placement auto.

    float m_Surface;        // surface du rectangle d'encadrement

    float m_Surface;        // surface du rectangle d'encadrement





    long m_Link;            // variable temporaire ( pour editions, ...)

    unsigned long m_Link;   // variable temporaire ( pour editions, ...)

    long m_LastEdit_Time;   // Date de la derniere modification du module (gestion de librairies)

    long m_LastEdit_Time;   // Date de la derniere modification du module (gestion de librairies)





    wxString m_Doc;         // Texte de description du module

    wxString m_Doc;         // Texte de description du module