Commit 14a0817e authored by dickelbeck's avatar dickelbeck
Browse files

CC= becomes CXX=

parent 00779b23
Loading
Loading
Loading
Loading
+20 −20
Original line number Diff line number Diff line
@@ -52,10 +52,10 @@ displayframe.o: displayframe.cpp $(DEPEND)
listboxes.o: listboxes.cpp $(DEPEND)

drawpanel.o: ../share/drawpanel.cpp $(DEPEND)
	$(CC) -c $(EDACPPFLAGS) -o $@ ../share/$*.cpp
	$(CXX) -c $(EDACPPFLAGS) -o $@ ../share/$*.cpp

drawframe.o: ../share/drawframe.cpp $(DEPEND)
	$(CC) -c $(EDACPPFLAGS) -o $@ ../share/$*.cpp
	$(CXX) -c $(EDACPPFLAGS) -o $@ ../share/$*.cpp

init.o: init.cpp $(DEPEND)

@@ -64,43 +64,43 @@ memoire.o: memoire.cpp $(DEPEND)
rdpcad.o: rdpcad.cpp $(DEPEND)

classpcb.o: ../pcbnew/classpcb.cpp $(DEPEND)
	$(CC) -c $(EDACPPFLAGS) -o $@ ../pcbnew/$*.cpp
	$(CXX) -c $(EDACPPFLAGS) -o $@ ../pcbnew/$*.cpp

class_mire.o: ../pcbnew/class_mire.cpp ../pcbnew/class_mire.h $(COMMON)
	$(CC) -c $(EDACPPFLAGS) -o $@ ../pcbnew/$*.cpp
	$(CXX) -c $(EDACPPFLAGS) -o $@ ../pcbnew/$*.cpp

class_cotation.o: ../pcbnew/class_cotation.cpp ../pcbnew/class_cotation.h $(COMMON)
	$(CC) -c $(EDACPPFLAGS) -o $@ ../pcbnew/$*.cpp
	$(CXX) -c $(EDACPPFLAGS) -o $@ ../pcbnew/$*.cpp

class_pcb_text.o: ../pcbnew/class_pcb_text.cpp ../pcbnew/class_pcb_text.h $(COMMON)
	$(CC) -c $(EDACPPFLAGS) -o $@ ../pcbnew/$*.cpp
	$(CXX) -c $(EDACPPFLAGS) -o $@ ../pcbnew/$*.cpp

class_board.o: ../pcbnew/class_board.cpp $(DEPEND)
	$(CC) -c $(EDACPPFLAGS) -o $@ ../pcbnew/$*.cpp
	$(CXX) -c $(EDACPPFLAGS) -o $@ ../pcbnew/$*.cpp

class_track.o: ../pcbnew/class_track.cpp $(DEPEND)
	$(CC) -c $(EDACPPFLAGS) -o $@ ../pcbnew/$*.cpp
	$(CXX) -c $(EDACPPFLAGS) -o $@ ../pcbnew/$*.cpp

class_pad.o: ../pcbnew/class_pad.cpp $(DEPEND)
	$(CC) -c $(EDACPPFLAGS) -o $@ ../pcbnew/$*.cpp
	$(CXX) -c $(EDACPPFLAGS) -o $@ ../pcbnew/$*.cpp

class_module.o: ../pcbnew/class_module.cpp $(DEPEND)
	$(CC) -c $(EDACPPFLAGS) -o $@ ../pcbnew/$*.cpp
	$(CXX) -c $(EDACPPFLAGS) -o $@ ../pcbnew/$*.cpp

class_text_mod.o: ../pcbnew/class_text_mod.cpp $(DEPEND)
	$(CC) -c $(EDACPPFLAGS) -o $@ ../pcbnew/$*.cpp
	$(CXX) -c $(EDACPPFLAGS) -o $@ ../pcbnew/$*.cpp

class_edge_mod.o: ../pcbnew/class_edge_mod.cpp $(DEPEND)
	$(CC) -c $(EDACPPFLAGS) -o $@ ../pcbnew/$*.cpp
	$(CXX) -c $(EDACPPFLAGS) -o $@ ../pcbnew/$*.cpp

class_equipot.o: ../pcbnew/class_equipot.cpp $(DEPEND)
	$(CC) -c $(EDACPPFLAGS) -o $@ ../pcbnew/$*.cpp
	$(CXX) -c $(EDACPPFLAGS) -o $@ ../pcbnew/$*.cpp

basepcbframe.o: ../pcbnew/basepcbframe.cpp $(DEPEND)
	$(CC) -c $(EDACPPFLAGS) -o $@ ../pcbnew/$*.cpp
	$(CXX) -c $(EDACPPFLAGS) -o $@ ../pcbnew/$*.cpp

collectors.o: ../pcbnew/collectors.cpp $(COMMON)
	$(CC) -c $(EDACPPFLAGS) -o $@ ../pcbnew/$*.cpp
	$(CXX) -c $(EDACPPFLAGS) -o $@ ../pcbnew/$*.cpp

readschematicnetlist.o: readschematicnetlist.cpp $(DEPEND)

@@ -117,7 +117,7 @@ writenetlistpcbnew.o: writenetlistpcbnew.cpp $(DEPEND)
genequiv.o: genequiv.cpp $(DEPEND)

ioascii.o: ../pcbnew/ioascii.cpp $(DEPEND)
	$(CC) -c $(EDACPPFLAGS) -o $@ ../pcbnew/$*.cpp
	$(CXX) -c $(EDACPPFLAGS) -o $@ ../pcbnew/$*.cpp

listlib.o: listlib.cpp $(DEPEND)

@@ -126,17 +126,17 @@ cfg.o: cfg.cpp cfg.h $(DEPEND)
menucfg.o: menucfg.cpp dialog_cvpcb_config.cpp dialog_cvpcb_config.h $(DEPEND)

infospgm.o: ../share/infospgm.cpp $(DEPEND)
	$(CC) -c $(EDACPPFLAGS) -o $@ ../share/$*.cpp
	$(CXX) -c $(EDACPPFLAGS) -o $@ ../share/$*.cpp

autosel.o: autosel.cpp $(DEPEND)

setvisu.o: setvisu.cpp $(DEPEND)

zoom.o: ../share/zoom.cpp $(DEPEND)
	$(CC) -c $(EDACPPFLAGS) -o $@ ../share/$*.cpp
	$(CXX) -c $(EDACPPFLAGS) -o $@ ../share/$*.cpp

tracemod.o: ../pcbnew/tracemod.cpp ../include/gr_basic.h $(DEPEND)
	$(CC) -c $(EDACPPFLAGS) -o $@ ../pcbnew/$*.cpp
	$(CXX) -c $(EDACPPFLAGS) -o $@ ../pcbnew/$*.cpp

dialog_display_options.o: dialog_display_options.cpp dialog_display_options.h $(DEPEND)
+10 −10
Original line number Diff line number Diff line
@@ -124,25 +124,25 @@ erc.o: erc.cpp dialog_erc.h $(DEPEND) netlist.h
dialog_erc.o: dialog_erc.cpp dialog_erc.h $(DEPEND)

setpage.o: ../share/setpage.cpp $(DEPEND)
	$(CC) -c $(EDACPPFLAGS) -o $@ ../share/$*.cpp
	$(CXX) -c $(EDACPPFLAGS) -o $@ ../share/$*.cpp

svg_print.o: ../share/svg_print.cpp ../share/svg_print.h $(DEPEND)
	$(CC) -c $(EDACPPFLAGS) -o $@ ../share/$*.cpp
	$(CXX) -c $(EDACPPFLAGS) -o $@ ../share/$*.cpp

zoom.o: ../share/zoom.cpp $(DEPEND)
	$(CC) -c $(EDACPPFLAGS) -o $@ ../share/$*.cpp
	$(CXX) -c $(EDACPPFLAGS) -o $@ ../share/$*.cpp

treeprj.o: ../share/treeprj.cpp $(DEPEND)
	$(CC) -c $(EDACPPFLAGS) -o $@ ../share/$*.cpp
	$(CXX) -c $(EDACPPFLAGS) -o $@ ../share/$*.cpp

drawpanel.o: ../share/drawpanel.cpp  $(DEPEND)
	$(CC) -c $(EDACPPFLAGS) -o $@ ../share/$*.cpp
	$(CXX) -c $(EDACPPFLAGS) -o $@ ../share/$*.cpp

mdiframe.o: ../share/mdiframe.cpp $(DEPEND)
	$(CC) -c $(EDACPPFLAGS) -o $@ ../share/$*.cpp
	$(CXX) -c $(EDACPPFLAGS) -o $@ ../share/$*.cpp

buildmnu.o: ../share/buildmnu.cpp $(DEPEND)
	$(CC) -c $(EDACPPFLAGS) -o $@ ../share/$*.cpp
	$(CXX) -c $(EDACPPFLAGS) -o $@ ../share/$*.cpp

pinedit.o: pinedit.cpp pinedit-dialog.cpp pinedit-dialog.h $(DEPEND)

@@ -151,12 +151,12 @@ tool_lib.o: tool_lib.cpp $(DEPEND)
controle.o: controle.cpp $(DEPEND) ../include/eda_dde.h

wxprint.o: ../share/wxprint.cpp  ../share/dialog_print.cpp ../share/dialog_print.h $(DEPEND)
	$(CC) -c $(EDACPPFLAGS) -o $@ ../share/$*.cpp
	$(CXX) -c $(EDACPPFLAGS) -o $@ ../share/$*.cpp

bus-wire-junction.o: bus-wire-junction.cpp $(DEPEND)

drawframe.o: ../share/drawframe.cpp
	$(CC) -c $(EDACPPFLAGS) -o $@ ../share/$*.cpp
	$(CXX) -c $(EDACPPFLAGS) -o $@ ../share/$*.cpp

eelibs_read_libraryfiles.o: eelibs_read_libraryfiles.cpp $(DEPEND)

@@ -185,5 +185,5 @@ dialog_eeschema_config.o: dialog_eeschema_config.cpp dialog_eeschema_config.h $(
libedit.o: libedit.cpp $(DEPEND)

infospgm.o: ../share/infospgm.cpp $(DEPEND)
	$(CC) -c $(EDACPPFLAGS) -o $@ ../share/$*.cpp
	$(CXX) -c $(EDACPPFLAGS) -o $@ ../share/$*.cpp
+15 −15
Original line number Diff line number Diff line
@@ -49,13 +49,13 @@ OBJECTS= \
        collectors.o

setpage.o: ../share/setpage.cpp
	$(CC) -c $(EDACPPFLAGS) -o $@ ../share/$*.cpp
	$(CXX) -c $(EDACPPFLAGS) -o $@ ../share/$*.cpp

drawpanel.o: ../share/drawpanel.cpp
	$(CC) -c $(EDACPPFLAGS) -o $@ ../share/$*.cpp
	$(CXX) -c $(EDACPPFLAGS) -o $@ ../share/$*.cpp

drawframe.o: ../share/drawframe.cpp
	$(CC) -c $(EDACPPFLAGS) -o $@ ../share/$*.cpp
	$(CXX) -c $(EDACPPFLAGS) -o $@ ../share/$*.cpp

controle.o: controle.cpp $(COMMON)

@@ -66,33 +66,33 @@ set_color.o: set_color.cpp set_color.h $(COMMON)
files.o: files.cpp $(COMMON)

class_marker.o: ../pcbnew/class_marker.cpp ../pcbnew/class_marker.h $(COMMON)
	$(CC) -c $(EDACPPFLAGS) -o $@ ../pcbnew/$*.cpp
	$(CXX) -c $(EDACPPFLAGS) -o $@ ../pcbnew/$*.cpp

sel_layer.o: ../pcbnew/sel_layer.cpp $(COMMON)
	$(CC) -c $(EDACPPFLAGS) -o $@ ../pcbnew/$*.cpp
	$(CXX) -c $(EDACPPFLAGS) -o $@ ../pcbnew/$*.cpp

wxprint.o: ../share/wxprint.cpp  ../share/dialog_print.cpp ../share/dialog_print.h $(COMMON)
	$(CC) -c $(EDACPPFLAGS) -o $@ ../share/$*.cpp
	$(CXX) -c $(EDACPPFLAGS) -o $@ ../share/$*.cpp

lay2plot.o: lay2plot.cpp $(COMMON)

classpcb.o: ../pcbnew/classpcb.cpp $(COMMON)
	$(CC) -c $(EDACPPFLAGS) -o $@ ../pcbnew/$*.cpp
	$(CXX) -c $(EDACPPFLAGS) -o $@ ../pcbnew/$*.cpp

class_pcb_text.o: ../pcbnew/class_pcb_text.cpp ../pcbnew/class_pcb_text.h $(COMMON)
	$(CC) -c $(EDACPPFLAGS) -o $@ ../pcbnew/$*.cpp
	$(CXX) -c $(EDACPPFLAGS) -o $@ ../pcbnew/$*.cpp

class_board.o: ../pcbnew/class_board.cpp $(DEPEND)
	$(CC) -c $(EDACPPFLAGS) -o $@ ../pcbnew/$*.cpp
	$(CXX) -c $(EDACPPFLAGS) -o $@ ../pcbnew/$*.cpp

basepcbframe.o: ../pcbnew/basepcbframe.cpp $(COMMON)
	$(CC) -c $(EDACPPFLAGS) -o $@ ../pcbnew/$*.cpp
	$(CXX) -c $(EDACPPFLAGS) -o $@ ../pcbnew/$*.cpp

collectors.o: ../pcbnew/collectors.cpp $(COMMON)
	$(CC) -c $(EDACPPFLAGS) -o $@ ../pcbnew/$*.cpp
	$(CXX) -c $(EDACPPFLAGS) -o $@ ../pcbnew/$*.cpp

class_track.o: ../pcbnew/class_track.cpp $(COMMON)
	$(CC) -c $(EDACPPFLAGS) -o $@ ../pcbnew/$*.cpp
	$(CXX) -c $(EDACPPFLAGS) -o $@ ../pcbnew/$*.cpp

$(TARGET).o: $(TARGET).cpp $(COMMON)

@@ -109,10 +109,10 @@ surbrill.o: surbrill.cpp $(COMMON)
pcbtexte.o: pcbtexte.cpp $(COMMON)

zoom.o: ../share/zoom.cpp $(COMMON)
	$(CC) -c $(EDACPPFLAGS) -o $@ ../share/$*.cpp
	$(CXX) -c $(EDACPPFLAGS) -o $@ ../share/$*.cpp

infospgm.o: ../share/infospgm.cpp $(COMMON)
	$(CC) -c $(EDACPPFLAGS) -o $@ ../share/$*.cpp
	$(CXX) -c $(EDACPPFLAGS) -o $@ ../share/$*.cpp

affiche.o: affiche.cpp $(COMMON)

+7 −7
Original line number Diff line number Diff line
@@ -108,13 +108,13 @@ OBJECTS= $(TARGET).o classpcb.o\
        collectors.o

setpage.o: ../share/setpage.cpp
	$(CC) -c $(EDACPPFLAGS) -o $@ ../share/$*.cpp
	$(CXX) -c $(EDACPPFLAGS) -o $@ ../share/$*.cpp

drawpanel.o: ../share/drawpanel.cpp
	$(CC) -c $(EDACPPFLAGS) -o $@ ../share/$*.cpp
	$(CXX) -c $(EDACPPFLAGS) -o $@ ../share/$*.cpp

drawframe.o: ../share/drawframe.cpp
	$(CC) -c $(EDACPPFLAGS) -o $@ ../share/$*.cpp
	$(CXX) -c $(EDACPPFLAGS) -o $@ ../share/$*.cpp

menubarpcb.o: menubarpcb.cpp $(COMMON)

@@ -134,7 +134,7 @@ files.o: files.cpp $(COMMON)
export_gencad.o: export_gencad.cpp $(COMMON)

wxprint.o: ../share/wxprint.cpp ../share/dialog_print.cpp ../share/dialog_print.h $(COMMON)
	$(CC) -c $(EDACPPFLAGS) -o $@ ../share/$*.cpp
	$(CXX) -c $(EDACPPFLAGS) -o $@ ../share/$*.cpp

lay2plot.o: lay2plot.cpp $(COMMON)

@@ -192,10 +192,10 @@ automove.o: automove.cpp autorout.h $(COMMON)
loadcmp.o: loadcmp.cpp $(COMMON)

zoom.o: ../share/zoom.cpp $(COMMON)
	$(CC) -c $(EDACPPFLAGS) -o $@ ../share/$*.cpp
	$(CXX) -c $(EDACPPFLAGS) -o $@ ../share/$*.cpp

infospgm.o: ../share/infospgm.cpp $(COMMON)
	$(CC) -c $(EDACPPFLAGS) -o $@ ../share/$*.cpp
	$(CXX) -c $(EDACPPFLAGS) -o $@ ../share/$*.cpp

affiche.o: affiche.cpp $(COMMON)