From: wittend99 Date: Thu, 25 Oct 2012 19:27:38 +0000 (+0000) Subject: git-svn-id: https://svn.code.sf.net/p/freetel/code@815 01035d8c-6547-0410-b346-abe4f9... X-Git-Url: http://git.whiteaudio.com/gitweb/?a=commitdiff_plain;h=9238e85b34b76caaf9914c7f1b439bff8c8155a2;p=freetel-svn-tracking.git git-svn-id: https://svn.code.sf.net/p/freetel/code@815 01035d8c-6547-0410-b346-abe4f91aad63 --- diff --git a/fdmdv2/tests/pa_enum/Makefile.linux.dmw b/fdmdv2/tests/pa_enum/Makefile.linux.dmw index 95843eb2..14224cb2 100644 --- a/fdmdv2/tests/pa_enum/Makefile.linux.dmw +++ b/fdmdv2/tests/pa_enum/Makefile.linux.dmw @@ -3,14 +3,14 @@ # # $ make -f Makefile.linux.dmw -WX_GTK_PATH=/home/david/Desktop/wxWidgets-2.9.4/build_gtk -#CODEC2_PATH=/home/david/codec2-dev +WX_GTK_PATH=/home/wittend/Projects/wxWidgets-2.9.4/build_gtk +#CODEC2_PATH=/home/wittend/codec2-dev WX_CONFIG=$(WX_GTK_PATH)/wx-config WX_CPPFLAGS = $(shell $(WX_CONFIG) --cxxflags) WX_LIBS = $(shell $(WX_CONFIG) --libs core, base, aui, adv) -CPP_FLAGS = $(WX_CPPFLAGS) -I../extern/include -g -Wall +CPP_FLAGS = $(WX_CPPFLAGS) -I../../extern/include -g -Wall LIBS = $(WX_LIBS) -lm -lportaudiocpp -lpthread OBJS = main.o \ diff --git a/fdmdv2/tests/pa_enum/pa_enum.mk b/fdmdv2/tests/pa_enum/pa_enum.mk index c40f6ef8..8acfd0bc 100644 --- a/fdmdv2/tests/pa_enum/pa_enum.mk +++ b/fdmdv2/tests/pa_enum/pa_enum.mk @@ -50,8 +50,8 @@ LibPath := $(LibraryPathSwitch). $(LibraryPathSwitch)/bin/MinGW-4 AR := ar rcus CXX := g++ CC := gcc -CXXFLAGS := -g -O0 -Wall $(shell wx-config --cxxflags --unicode=yes --debug=yes) -DSVN_REVISION=\"810\" $(Preprocessors) -CFLAGS := -g -O0 -Wall $(shell wx-config --cxxflags --unicode=yes --debug=yes) -DSVN_REVISION=\"810\" $(Preprocessors) +CXXFLAGS := -g -O0 -Wall $(shell wx-config --cxxflags --unicode=yes --debug=yes) -DSVN_REVISION=\"812\" $(Preprocessors) +CFLAGS := -g -O0 -Wall $(shell wx-config --cxxflags --unicode=yes --debug=yes) -DSVN_REVISION=\"812\" $(Preprocessors) ##