Merge updates

Replace corrupt win32 icon

Fix typo in fldigirc.rc (fldig-config.h -> fldigi-config.h)

Add -I switch for windres target in src/Makefile.am, needed
for windres to find fldigi-config.h

Remove OPT_FAST_TEXT, which somehow found its way back to the
argument handling function

The preprocessor conditional in qrunner.cxx should be
#ifdef __CYGWIN__, not #if __CYGWIN__.

The dummy variable in rigMEM.cxx now needs to be defined
with __CYGWIN__

src/Makefile.am

@@ -57,7 +57,7 @@ CLEANFILES = $(BUILT_SOURCES)
 if WIN32
 if HAVE_WINDRES
 .rc.o:
-	$(WINDRES) -I$(srcdir)/../data/win32 $< $@
+	$(WINDRES) -I$(srcdir)/include -I$(srcdir)/../data/win32 $< $@
 fldigi_SOURCES += $(WIN32_RES_SRC)
 endif
 endif

src/dialogs/fl_digi.cxx

@@ -1441,7 +1441,11 @@ void create_fl_digi_main() {
 	fl_digi_main->end();
 	fl_digi_main->callback(cb_wMain);
 
-#if !defined(__APPLE__) && !defined(__CYGWIN__)
+#if defined(__APPLE__)
+        // FIXME: how do we set the window icon on OS X?
+#elif defined (__CYGWIN__)
+	fl_digi_main->icon((char*)LoadIcon(fl_display, MAKEINTRESOURCE(IDI_ICON)));
+#else
 	make_pixmap(&fldigi_icon_pixmap, fldigi_icon_48_xpm);
 	fl_digi_main->icon((char *)fldigi_icon_pixmap);
 #endif

src/fldigirc.rc

@@ -1,5 +1,5 @@
 #include <windows.h> // include for version info constants
 
-#include "fldig-config.h"
+#include "fldigi-config.h"
 
 IDI_ICON ICON DISCARDABLE "fldigi.ico"

src/main.cxx

@@ -213,10 +213,6 @@ int main(int argc, char ** argv)
 
 	progdefaults.initInterface();
 	
-#ifdef __CYGWIN__
-	fl_digi_main->icon((char*)LoadIcon(fl_display, MAKEINTRESOURCE(IDI_ICON)));
-#endif
-	
 	fl_digi_main->show(argc, argv);
 	progStatus.initLastState();
 	
@@ -358,7 +354,7 @@ int parse_args(int argc, char **argv, int& idx)
 	       OPT_RX_IPC_KEY, OPT_TX_IPC_KEY,
 #endif
 	       OPT_CONFIG_DIR,
-               OPT_FAST_TEXT, OPT_FONT, OPT_WFALL_WIDTH, OPT_WFALL_HEIGHT,
+               OPT_FONT, OPT_WFALL_WIDTH, OPT_WFALL_HEIGHT,
                OPT_WINDOW_WIDTH, OPT_WINDOW_HEIGHT, OPT_PROFILE, OPT_USE_CHECK,
 	       OPT_RESAMPLE,
 #if USE_PORTAUDIO

src/qrunner/qrunner.cxx

@@ -24,7 +24,7 @@
 
 #include <unistd.h>
 #include <errno.h>
-#if __CYGWIN__
+#ifdef __CYGWIN__
 #  include <sys/types.h>
 #  include <sys/socket.h>
 #endif

src/rigcontrol/rigMEM.cxx

@@ -28,9 +28,7 @@
 #define PTT_OFF false
 #define PTT_ON  true
 
-#ifndef __CYGWIN__
 static int dummy;
-#endif
 
 static Fl_Thread rigMEM_thread;
 static bool rigMEM_exit = false;