From 332bea90f8f7467fe5bc629dff818bd7be6e507a Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Fri, 16 Nov 2012 15:57:42 +0000 Subject: [PATCH] Put in some (temporary?) "#ifdef WIN32" statements, so that it will compile under Linux. git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@2741 ab8295b8-cf94-4d9e-aec4-7959e3be5d79 --- devsetup.cpp | 8 +++++++- getfile.cpp | 5 +++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/devsetup.cpp b/devsetup.cpp index 3b55a7a9b..f035134b3 100644 --- a/devsetup.cpp +++ b/devsetup.cpp @@ -31,6 +31,8 @@ void DevSetup::initDlg() char pa_device_hostapi[128]; k=0; +#ifdef WIN32 +// Needs work to compile for Linux for(id=0; idmaxInputChannels; @@ -58,6 +60,7 @@ void DevSetup::initDlg() ui.comboBoxSndIn->addItem(t); } } +#endif k=0; for(id=0; idhostApi)->name); +#ifdef WIN32 +// Needs work to compile for Linux p1=(char*)""; p=strstr(pa_device_hostapi,"MME"); + if(p!=NULL) p1=(char*)"MME"; p=strstr(pa_device_hostapi,"Direct"); if(p!=NULL) p1=(char*)"DirectX"; @@ -81,10 +87,10 @@ void DevSetup::initDlg() if(p!=NULL) p1=(char*)"ASIO"; p=strstr(pa_device_hostapi,"WDM-KS"); if(p!=NULL) p1=(char*)"WDM-KS"; - sprintf(p2,"%2d %d %-8s %-39s",id,nchout,p1,pa_device_name); QString t(p2); ui.comboBoxSndOut->addItem(t); +#endif } } diff --git a/getfile.cpp b/getfile.cpp index ea4dd5ada..6688c7285 100644 --- a/getfile.cpp +++ b/getfile.cpp @@ -3,7 +3,10 @@ #include #include #include + +#ifdef WIN32 #include +#endif void getfile(QString fname, int ntrperiod) { @@ -119,6 +122,7 @@ float gran() int ptt(int nport, int ntx, int *iptt) { +#ifdef WIN32 static HANDLE hFile; static int open=0; char s[10]; @@ -161,4 +165,5 @@ int ptt(int nport, int ntx, int *iptt) if(i9==0) return -(CLRBREAK); if(i00==0) return -10; return 0; +#endif }