Davids R's first version building on Win32

git-svn-id: https://svn.code.sf.net/p/freetel/code@829 01035d8c-6547-0410-b346-abe4f91aad63

diff --git a/fdmdv2/README.Win32 b/fdmdv2/README.Win32
new file mode 100644 (file)
index 0000000..d0c9955
--- /dev/null
+++ b/fdmdv2/README.Win32
@@ -0,0 +1,33 @@
+README.Win32\r
+David Rowe 27 Oct 2012\r
+\r
+Notes on building fdmdv2 for Windows.  This is how David R did it,\r
+Dave Witten used a different approach.  Many variations are possible.\r
+\r
+1. Install MinGW & the mysys shell\r
+   + pwd -W prints true Win32 directory\r
+   + I also installed emacs and a svn binary\r
+\r
+2. "make install" for various packages below put DLLs in /usr/local/lib\r
+   "cd /usr/local/lib; pwd -W" to find the Win32 directory\r
+   add this to the Windows PATH (Control Panel - System - Advanced)\r
+\r
+3. WxWidgets:\r
+   download 2.9.4 tar ball\r
+   mkdir build-debug; cd build-debug\r
+   ./configure --with-msw\r
+   make && make install\r
+\r
+4. PortAudio:\r
+   download latest V19\r
+   ./configure --enable-cxx\r
+   make && make install\r
+\r
+5. libndfile:\r
+   download lastest source tar all (not Win32 binaries)\r
+   ./configure && make && make install\r
+\r
+6. svn co fdmdv2\r
+   cd fdmdv2/src\r
+   Make -f Makefile.Win32\r
+\r

diff --git a/fdmdv2/src/Makefile.win32 b/fdmdv2/src/Makefile.win32
new file mode 100644 (file)
index 0000000..6f90c54
--- /dev/null
+++ b/fdmdv2/src/Makefile.win32
@@ -0,0 +1,45 @@
+# src/Makefile.win32
+# David Rowe 26 Oct 2012
+#
+# Makefile for Win32 on msys/Mingw to help David R get up to speed
+#
+# $ make -f Makefile.linux
+
+CODEC2_PATH=$(HOME)/codec2-dev
+INCLUDE_PATH=/usr/local/include
+
+WX_CONFIG=wx-config
+WX_CPPFLAGS = $(shell $(WX_CONFIG) --cxxflags)
+WX_LIBS = $(shell $(WX_CONFIG) --libs core, base, aui, adv)
+CODEC2_INC=$(CODEC2_PATH)/src 
+CODEC2_LIB=$(CODEC2_PATH)/src/.libs/libcodec2.a
+
+CPP_FLAGS = -I$(INCLUDE_PATH) $(WX_CPPFLAGS) -I$(CODEC2_INC) -I../extern/include -g -Wall
+LIBS = $(WX_LIBS) $(CODEC2_LIB) -lm -lportaudiocpp -lportaudio -lpthread -lsndfile
+
+OBJS = topFrame.o \
+fdmdv2_main.o \
+fdmdv2_plot.o \
+fdmdv2_plot_scalar.o \
+fdmdv2_plot_scatter.o \
+fdmdv2_plot_spectrum.o \
+fdmdv2_plot_waterfall_linux.o \
+fdmdv2_pa_wrapper.o \
+dlg_about.o \
+dlg_audio.o \
+dlg_comports.o \
+dlg_options.o
+
+HDRS = fdmdv2_main.h fdmdv2_defines.h fdmdv2_plot.h fdmdv2_plot_scalar.h fdmdv2_plot_waterfall_linux.h fdmdv2_plot_scatter.h fdmdv2_plot_spectrum.h fdmdv2_pa_wrapper.h
+
+all: fdmdv2
+
+fdmdv2: $(OBJS) 
+       g++ -o fdmdv2 $(OBJS) $(CPP_FLAGS) $(LIBS)
+
+%.o: %.cpp $(HDRS) Makefile
+       g++ $(CPP_FLAGS) -c $< -o $@
+
+clean:
+       rm -f *.o fdmdv2
+

diff --git a/fdmdv2/src/dlg_audio.h b/fdmdv2/src/dlg_audio.h
index 8f47129547c9740472d9c9c9fc42acc60bc65172..4e4f0cef35085639947753459666a2b54b9113ac 100644 (file)
--- a/fdmdv2/src/dlg_audio.h
+++ b/fdmdv2/src/dlg_audio.h
@@ -16,7 +16,7 @@
 
 #include "portaudio.h"
 #include "portaudiocpp/PortAudioCpp.hxx"
-#ifdef WIN32
+#ifdef WIN32_ASIO
 #include "portaudiocpp/AsioDeviceAdapter.hxx"
 #endif