diff --git a/Makefile.am b/Makefile.am index 67accb6..1622f49 100644 --- a/Makefile.am +++ b/Makefile.am @@ -14,9 +14,6 @@ include_HEADERS = # -Wno-multichar - turns off multi-character constant warnings from cmAudioFile.c -WS_DIR = $(HOME)/sdk/libwebsockets/build/out - - AM_CPPFLAGS = -I.. -I$(srcdir)/src/libcw AM_CFLAGS = -Wno-multichar AM_CXXFLAGS = -Wno-multichar @@ -83,8 +80,6 @@ if cwWEB endif if cwWEBSOCK - # AM_CPPFLAGS += -I$(WS_DIR)/include - # AM_LDFLAGS += -L$(WS_DIR)/lib src_cwtest_cwtest_LDADD += -lwebsockets endif diff --git a/README.md b/README.md index c19eebf..3e86dd9 100644 --- a/README.md +++ b/README.md @@ -3,15 +3,15 @@ libcw Testing and Development App # GDB Setup: - set env LD_LIBRARY_PATH /home/kevin/sdk/libwebsockets/build/out/lib::~/src/libcm/build/linux/debug/lib + set env LD_LIBRARY_PATH ~/src/libcm/build/linux/debug/lib r ~/src/cwtest/src/cwtest/cfg/main.cfg mtx // if problems occur with gdb hanging while download debuginfo - dnf upgrade --enablerepo=*-debuginfo "*-debuginfo" # update all debuginfo files + sudo dnf upgrade --enablerepo=*-debuginfo "*-debuginfo" # update all debuginfo files # Valgrind setup - export LD_LIBRARY_PATH=~/sdk/libwebsockets/build/out/lib:~/src/libcm/build/linux/debug/lib + export LD_LIBRARY_PATH=~/src/libcm/build/linux/debug/lib valgrind --leak-check=yes --log-file=vg0.txt ./cwtest ~/src/cwtest/src/cwtest/cfg/main.cfg mtx #Design Questions: diff --git a/build/linux/debug/build.sh b/build/linux/debug/build.sh index 6f5160b..30e5644 100755 --- a/build/linux/debug/build.sh +++ b/build/linux/debug/build.sh @@ -19,8 +19,8 @@ cd ${curdir} --enable-alsa \ CFLAGS="-g -Wall" \ CXXFLAGS="-g -Wall" \ -CPPFLAGS="-I${HOME}/sdk/libwebsockets/build/out/include -I${HOME}/src/libcm/build/linux/debug/include" \ -LDFLAGS="-L${HOME}/sdk/libwebsockets/build/out/lib -L${HOME}/src/libcm/build/linux/debug/lib" \ +CPPFLAGS="-I${HOME}/src/libcm/build/linux/debug/include" \ +LDFLAGS="-L${HOME}/src/libcm/build/linux/debug/lib" \ LIBS= diff --git a/build/linux/release/build.sh b/build/linux/release/build.sh index c2533ed..4b69a02 100755 --- a/build/linux/release/build.sh +++ b/build/linux/release/build.sh @@ -10,8 +10,8 @@ cd ${curdir} ../../../configure --prefix=${curdir} --enable-websock --enable-alsa \ CFLAGS="-Wall" \ CXXFLAGS="-Wall" \ -CPPFLAGS="-I${HOME}/sdk/libwebsockets/build/out/include -I${HOME}/src/libcm/build/linux/debug/include" \ -LDFLAGS="-L${HOME}/sdk/libwebsockets/build/out/lib -L${HOME}/src/libcm/build/linux/debug/lib" \ +CPPFLAGS="-I${HOME}/src/libcm/build/linux/debug/include" \ +LDFLAGS="-L${HOME}/src/libcm/build/linux/debug/lib" \ LIBS=