use CXX for g++

This commit is contained in:
badaix 2015-09-30 14:11:10 +02:00
parent 5a9c4b15e6
commit da58cb51a8
2 changed files with 8 additions and 8 deletions

View file

@ -1,8 +1,8 @@
VERSION = 0.3.1 VERSION = 0.3.2
TARGET = snapclient TARGET = snapclient
SHELL = /bin/bash SHELL = /bin/bash
CC = /usr/bin/g++ CXX = /usr/bin/g++
CFLAGS = -std=c++0x -Wall -Wno-unused-function -O3 -pthread -DVERSION=\"$(VERSION)\" -I.. # -static-libgcc -static-libstdc++ CFLAGS = -std=c++0x -Wall -Wno-unused-function -O3 -pthread -DVERSION=\"$(VERSION)\" -I.. # -static-libgcc -static-libstdc++
LDFLAGS = -lrt -lboost_system -lboost_program_options -lasound -logg -lvorbis -lvorbisenc -lFLAC -lavahi-client -lavahi-common LDFLAGS = -lrt -lboost_system -lboost_program_options -lasound -logg -lvorbis -lvorbisenc -lFLAC -lavahi-client -lavahi-common
@ -12,11 +12,11 @@ BIN = snapclient
all: $(TARGET) all: $(TARGET)
$(TARGET): $(OBJ) $(TARGET): $(OBJ)
$(CC) $(CFLAGS) -o $(BIN) $(OBJ) $(LDFLAGS) $(CXX) $(CFLAGS) -o $(BIN) $(OBJ) $(LDFLAGS)
strip $(BIN) strip $(BIN)
%.o: %.cpp %.o: %.cpp
$(CC) $(CFLAGS) -c $< -o $@ $(CXX) $(CFLAGS) -c $< -o $@
clean: clean:
rm -rf $(BIN) $(OBJ) *~ rm -rf $(BIN) $(OBJ) *~

View file

@ -1,8 +1,8 @@
VERSION = 0.3.1 VERSION = 0.3.2
TARGET = snapserver TARGET = snapserver
SHELL = /bin/bash SHELL = /bin/bash
CC = /usr/bin/g++ CXX = /usr/bin/g++
CFLAGS = -std=c++0x -Wall -Wno-unused-function -O3 -pthread -DVERSION=\"$(VERSION)\" -I.. CFLAGS = -std=c++0x -Wall -Wno-unused-function -O3 -pthread -DVERSION=\"$(VERSION)\" -I..
LDFLAGS = -lrt -lboost_system -lboost_program_options -lvorbis -lvorbisenc -logg -lFLAC -lavahi-client -lavahi-common LDFLAGS = -lrt -lboost_system -lboost_program_options -lvorbis -lvorbisenc -logg -lFLAC -lavahi-client -lavahi-common
@ -12,11 +12,11 @@ BIN = snapserver
all: $(TARGET) all: $(TARGET)
$(TARGET): $(OBJ) $(TARGET): $(OBJ)
$(CC) $(CFLAGS) -o $(BIN) $(OBJ) $(LDFLAGS) $(CXX) $(CFLAGS) -o $(BIN) $(OBJ) $(LDFLAGS)
strip $(BIN) strip $(BIN)
%.o: %.cpp %.o: %.cpp
$(CC) $(CFLAGS) -c $< -o $@ $(CXX) $(CFLAGS) -c $< -o $@
clean: clean:
rm -rf $(BIN) $(OBJ) *~ rm -rf $(BIN) $(OBJ) *~