Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Changed the file structure #140

Closed
wants to merge 3 commits into from
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Made cpu_features into a submodule
  • Loading branch information
snake-4 committed Jul 27, 2021
commit e287f2213a9b64994b670939c6694d8fcb05a4ea
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "external/cpu_features"]
path = external/cpu_features
url = https://github.com/google/cpu_features.git
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ CPUFEATURES ?= no

ifeq ($(CPUFEATURES),yes)
include Makefile.cpufeatures
CPPFLAGS += -DENABLE_CPUFEATURES -Icpu_features/include
CPPFLAGS += -DENABLE_CPUFEATURES -Iexternal/cpu_features/include
endif

RTLSDR ?= yes
Expand Down Expand Up @@ -202,7 +202,7 @@ starch-benchmark: cpu.o dsp/helpers/tables.o $(CPUFEATURES_OBJS) $(STARCH_OBJS)
$(CC) -g -o $@ $^ $(LDFLAGS) $(LIBS)

clean:
rm -f *.o oneoff/*.o compat/clock_gettime/*.o compat/clock_nanosleep/*.o cpu_features/src/*.o dsp/generated/*.o dsp/helpers/*.o $(CPUFEATURES_OBJS) dump1090 view1090 faup1090 cprtests crctests oneoff/convert_benchmark oneoff/decode_comm_b oneoff/dsp_error_measurement oneoff/uc8_capture_stats starch-benchmark
rm -f *.o oneoff/*.o compat/clock_gettime/*.o compat/clock_nanosleep/*.o external/cpu_features/src/*.o dsp/generated/*.o dsp/helpers/*.o $(CPUFEATURES_OBJS) dump1090 view1090 faup1090 cprtests crctests oneoff/convert_benchmark oneoff/decode_comm_b oneoff/dsp_error_measurement oneoff/uc8_capture_stats starch-benchmark

test: cprtests
./cprtests
Expand Down
14 changes: 7 additions & 7 deletions Makefile.cpufeatures
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
CPUFEATURES_UNAME := $(shell uname)
CPUFEATURES_ARCH := $(shell uname -m)

CPUFEATURES_OBJS := cpu_features/src/filesystem.o cpu_features/src/stack_line_reader.o cpu_features/src/string_view.o
CPUFEATURES_OBJS := external/cpu_features/src/filesystem.o external/cpu_features/src/stack_line_reader.o external/cpu_features/src/string_view.o
CPUFEATURES_CFLAGS := -std=c99 -O -g -DSTACK_LINE_READER_BUFFER_SIZE=1024 -DNDEBUG

ifeq ($(CPUFEATURES_UNAME),Linux)
CPUFEATURES_OBJS += cpu_features/src/hwcaps.o
CPUFEATURES_OBJS += external/cpu_features/src/hwcaps.o
CPUFEATURES_CFLAGS += -DHAVE_STRONG_GETAUXVAL
endif

Expand All @@ -18,20 +18,20 @@ ifeq ($(CPUFEATURES_UNAME),Darwin)
endif

ifeq ($(CPUFEATURES_ARCH),x86_64)
CPUFEATURES_OBJS += cpu_features/src/cpuinfo_x86.o
CPUFEATURES_OBJS += external/cpu_features/src/cpuinfo_x86.o
endif

ifneq (,$(filter i%86,$(CPUFEATURES_ARCH)))
CPUFEATURES_OBJS += cpu_features/src/cpuinfo_x86.o
CPUFEATURES_OBJS += external/cpu_features/src/cpuinfo_x86.o
endif

ifneq (,$(findstring arm,$(CPUFEATURES_ARCH)))
CPUFEATURES_OBJS += cpu_features/src/cpuinfo_arm.o
CPUFEATURES_OBJS += external/cpu_features/src/cpuinfo_arm.o
endif

ifneq (,$(findstring aarch64,$(CPUFEATURES_ARCH)))
CPUFEATURES_OBJS += cpu_features/src/cpuinfo_aarch64.o
CPUFEATURES_OBJS += external/cpu_features/src/cpuinfo_aarch64.o
endif

$(CPUFEATURES_OBJS): override CFLAGS := $(CPUFEATURES_CFLAGS)
$(CPUFEATURES_OBJS): override CPPFLAGS := -Icpu_features/include
$(CPUFEATURES_OBJS): override CPPFLAGS := -Iexternal/cpu_features/include
4 changes: 0 additions & 4 deletions cpu_features/.clang-format

This file was deleted.

4 changes: 0 additions & 4 deletions cpu_features/.gitignore

This file was deleted.

121 changes: 0 additions & 121 deletions cpu_features/.travis.yml

This file was deleted.

Loading