From 2d12a0723b510fe7ce475ca1d7d951897250bca6 Mon Sep 17 00:00:00 2001 From: Harsh Sharma Date: Fri, 20 Dec 2019 14:58:46 -0600 Subject: Changed ccflags-y --- Makefile | 14 +++++++------- build/mts-io-sysfs | Bin 256608 -> 0 bytes src/Version.cpp | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) delete mode 100755 build/mts-io-sysfs diff --git a/Makefile b/Makefile index 0d9a9e7..f6df6d7 100644 --- a/Makefile +++ b/Makefile @@ -23,7 +23,7 @@ export STRIP = $(CROSS_COMPILE)strip export OBJCOPY = $(CROSS_COMPILE)objcopy export OBJDUMP = $(CROSS_COMPILE)objdump export RANLIB = $(CROSS_COMPILE)ranlib -export ccflags-y += -march=arm926ejste -mtune=arm926ej-s -mthumb-interwork -mno-thumb -fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2 -ggdb2 +export CFLAGS += -march=arm926ejste -mtune=arm926ej-s -mthumb-interwork -mno-thumb -fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2 -ggdb2 endif BUILDDIR=build @@ -31,7 +31,7 @@ SOURCEDIR=src # -g -pg | profiling options -ccflags-y += -Werror -Wno-unused-function +CFLAGS += -Werror -Wno-unused-function CXXFLAGS += -std=c++11 -Wno-unused-function @@ -80,19 +80,19 @@ mainbuild: prebuild mts-io-sysfs: $(OBJS) $(BUILDDIR)/MtsIoSysfs.o @echo 'Building target: $@' - $(CXX) $(ccflags-y) $(INC) $(LDFLAGS) -o $(BUILDDIR)/mts-io-sysfs $(OBJS) $(BUILDDIR)/MtsIoSysfs.o $(LIBS) + $(CXX) $(CFLAGS) $(INC) $(LDFLAGS) -o $(BUILDDIR)/mts-io-sysfs $(OBJS) $(BUILDDIR)/MtsIoSysfs.o $(LIBS) @echo 'Finished building target: $@' @echo ' ' $(BUILDDIR)/%.o: $(SOURCEDIR)/%.cpp @echo 'Building file: $<' - $(CXX) $(ccflags-y) $(INC) -Wall -std=c++11 -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o "$@" "$<" + $(CXX) $(CFLAGS) $(INC) -Wall -std=c++11 -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o "$@" "$<" @echo 'Finished building: $<' @echo ' ' $(BUILDDIR)/Version.o: $(SOURCEDIR)/Version.cpp @echo 'Building file: $<' - $(CXX) $(ccflags-y) $(INC) -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o "$@" "$<" + $(CXX) $(CFLAGS) $(INC) -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o "$@" "$<" @echo 'Finished building: $<' @echo ' ' @@ -104,7 +104,7 @@ $(SOURCEDIR)/Version.cpp: $(BUILDDIR)/MtsIo.o: $(SOURCEDIR)/MtsIo.cpp @echo 'Building file: $<' - $(CXX) $(ccflags-y) $(INC) -Wall -std=c++11 -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o "$@" "$<" -DENABLE_MTS_CHECK=${MTS_CHECK} + $(CXX) $(CFLAGS) $(INC) -Wall -std=c++11 -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o "$@" "$<" -DENABLE_MTS_CHECK=${MTS_CHECK} @echo 'Finished building: $<' @echo ' ' @@ -115,7 +115,7 @@ strip: $(STRIP) $(BUILDDIR)/mts-io-sysfs clean: - -$(RM) $(OBJS) $(CPP_DEPPS) $(BUILDDIR)/mts-io $(BUILDDIR)/MtsIoSysfs.o $(BUILDDIR)/AccessoryCards/*.o $(BUILDDIR)/Device/*.o + -$(RM) $(OBJS) $(CPP_DEPPS) $(BUILDDIR)/mts-io-sysfs $(BUILDDIR)/MtsIoSysfs.o $(BUILDDIR)/AccessoryCards/*.o $(BUILDDIR)/Device/*.o -@echo ' ' .PHONY: all clean dependents diff --git a/build/mts-io-sysfs b/build/mts-io-sysfs deleted file mode 100755 index fb90f8d..0000000 Binary files a/build/mts-io-sysfs and /dev/null differ diff --git a/src/Version.cpp b/src/Version.cpp index 0786260..54fe215 100644 --- a/src/Version.cpp +++ b/src/Version.cpp @@ -1,4 +1,4 @@ //Pre-Build Auto-Generated Source #include "Version.h" -const std::string Version::version("v1.0.0"); +const std::string Version::version("v1.0.0-1-g41f2282"); -- cgit v1.2.3