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

Move source files into src directory #22

Open
wants to merge 5 commits into
base: master
Choose a base branch
from

Conversation

kerel-fs
Copy link
Contributor

contains the missing commits from #18.

@kerel-fs kerel-fs force-pushed the pr/improve_makefile branch 2 times, most recently from 879efd9 to 44357af Compare February 15, 2017 00:02
@kerel-fs kerel-fs changed the title Improve Makefile Move source files into src directory Feb 16, 2017
kerel-fs added a commit to kerel-fs/ogn-rf that referenced this pull request Feb 20, 2017
@kerel-fs kerel-fs force-pushed the pr/improve_makefile branch from 44357af to e53ef6f Compare March 14, 2017 22:30
kerel-fs added a commit to kerel-fs/ogn-rf that referenced this pull request Mar 14, 2017
@kerel-fs
Copy link
Contributor Author

kerel-fs commented Mar 15, 2017

Doesn't build on a RPi2 yet:

kerel@host:~/ogn-rf $ make
g++ -Wall -O3 -ffast-math -DVERSION=0.2.6 -mcpu=arm1176jzf-s -mtune=arm1176jzf-s -march=armv6zk -mfpu=vfp -DUSE_RPI_GPU_FFT -o gsm_scan src/gsm_scan.cc src/mailbox.c src/gpu_fft.c src/gpu_fft_twiddles.c src/gpu_fft_shaders.c -lpthread -lm -ljpeg -lconfig -lrt -lfftw3 -lfftw3f -lrtlsdr
/tmp/ccTTa2mh.o: In function `gpu_fft_prepare(int, int, int, int, GPU_FFT**)':
gpu_fft.c:(.text+0x98): undefined reference to `gpu_fft_alloc(int, unsigned int, GPU_FFT_PTR*)'
gpu_fft.c:(.text+0xbc): undefined reference to `gpu_fft_ptr_inc(GPU_FFT_PTR*, int)'
gpu_fft.c:(.text+0x104): undefined reference to `gpu_fft_ptr_inc(GPU_FFT_PTR*, int)'
gpu_fft.c:(.text+0x134): undefined reference to `gpu_fft_ptr_inc(GPU_FFT_PTR*, int)'
gpu_fft.c:(.text+0x158): undefined reference to `gpu_fft_ptr_inc(GPU_FFT_PTR*, int)'
gpu_fft.c:(.text+0x1fc): undefined reference to `gpu_fft_ptr_inc(GPU_FFT_PTR*, int)'
/tmp/ccTTa2mh.o: In function `gpu_fft_execute(GPU_FFT*)':
gpu_fft.c:(.text+0x2ec): undefined reference to `gpu_fft_base_exec(GPU_FFT_BASE*, int)'
/tmp/ccTTa2mh.o: In function `gpu_fft_release(GPU_FFT*)':
gpu_fft.c:(.text+0x2f0): undefined reference to `gpu_fft_base_release(GPU_FFT_BASE*)'
collect2: error: ld returned 1 exit status
Makefile:30: recipe for target 'gsm_scan' failed
make: *** [gsm_scan] Error 1

Edit:
Created #27 to track this issue, since it's unrelated to this pull request.
Edit2:
Fixed with the latest commits in this branch.

@kerel-fs kerel-fs force-pushed the pr/improve_makefile branch 2 times, most recently from 8238339 to a9ee514 Compare March 15, 2017 09:12
kerel-fs added a commit to kerel-fs/ogn-rf that referenced this pull request May 19, 2017
@kerel-fs kerel-fs force-pushed the pr/improve_makefile branch from a9ee514 to 9d6fdc8 Compare May 19, 2017 19:32
@kerel-fs
Copy link
Contributor Author

Rebased on v0.2.6 (release).

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant