make it buildable FIXUP

libticalcs/trunk/tests/CMakeLists.txt

@@ -16,6 +16,10 @@ else()
     set(TICABLES_LIBUSB_REQUIRES_PRIVATE "libusb-1.0")
 endif()
 
+if(WIN32 AND NOT MINGW)
+    find_library(GETOPT_LIB getopt REQUIRED)
+endif()
+
 if(USE_ICONV)
     find_package(Iconv REQUIRED)
     # flags/link for external deps
@@ -28,6 +32,10 @@ foreach(tar torture_ticalcs test_ticalcs_2)
         target_link_libraries(${tar} ${Iconv_LIBRARIES})
     endif()
 
+    if(GETOPT_LIB)
+        target_link_libraries(${tar} ${GETOPT_LIB})
+    endif()
+
     target_compile_options(${tar} PRIVATE ${DEPS_CFLAGS})
 
     target_include_directories(${tar} PRIVATE

libticalcs/trunk/tests/test_ticalcs_2.cc

@@ -33,106 +33,8 @@
 #include <cstdlib>
 #include <cstring>
 
-#ifdef __WIN32__
-/* simple getopt implementation - https://gist.github.com/superwills/5815344 */
-/*
-* Copyright (c) 1987, 1993, 1994
-*      The Regents of the University of California.  All rights reserved.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions
-* are met:
-* 1. Redistributions of source code must retain the above copyright
-*    notice, this list of conditions and the following disclaimer.
-* 2. Redistributions in binary form must reproduce the above copyright
-*    notice, this list of conditions and the following disclaimer in the
-*    documentation and/or other materials provided with the distribution.
-* 3. All advertising materials mentioning features or use of this software
-*    must display the following acknowledgement:
-*      This product includes software developed by the University of
-*      California, Berkeley and its contributors.
-* 4. Neither the name of the University nor the names of its contributors
-*    may be used to endorse or promote products derived from this software
-*    without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-* ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-* SUCH DAMAGE.
-*/
-
-static int  opterr = 1,             /* if error message should be printed */
-            optind = 1,             /* index into parent argv vector */
-            optopt,                 /* character checked for validity */
-            optreset;               /* reset getopt */
-static char *optarg;                /* argument associated with option */
-
-#define BADCH   (int)'?'
-#define BADARG  (int)':'
-#define EMSG    ""
-
-int getopt(int nargc, char * const nargv[], const char *ostr)
-{
-    static char* place = (char*)EMSG;       /* option letter processing */
-    const char *oli;                        /* option letter list index */
-
-    if (optreset || !*place) {              /* update scanning pointer */
-        optreset = 0;
-        if (optind >= nargc || *(place = nargv[optind]) != '-') {
-            place = (char*)EMSG;
-            return (-1);
-        }
-        if (place[1] && *++place == '-') {   /* found "--" */
-            ++optind;
-            place = (char*)EMSG;
-            return (-1);
-        }
-    }
-    /* option letter okay? */
-    if ((optopt = (int)*place++) == (int)':' ||
-        !(oli = strchr(ostr, optopt))) {
-        /*
-        * if the user didn't specify '-' as an option,
-        * assume it means -1.
-        */
-        if (optopt == (int)'-')
-            return (-1);
-        if (!*place)
-            ++optind;
-        if (opterr && *ostr != ':')
-            (void)printf("illegal option -- %c\n", optopt);
-        return (BADCH);
-    }
-    if (*++oli != ':') {                /* don't need argument */
-        optarg = NULL;
-        if (!*place)
-            ++optind;
-    }
-    else {                              /* need an argument */
-        if (*place)                     /* no white space */
-            optarg = place;
-        else if (nargc <= ++optind) {   /* no arg */
-            place = (char*)EMSG;
-            if (*ostr == ':')
-                return (BADARG);
-            if (opterr)
-                (void)printf("option requires an argument -- %c\n", optopt);
-            return (BADCH);
-        }
-        else                            /* white space */
-            optarg = nargv[optind];
-        place = (char*)EMSG;
-        ++optind;
-    }
-    return (optopt);                    /* dump back option letter */
-}
+#ifdef _MSC_VER
+#include <getopt.h>
 #else
 #include <unistd.h>
 #endif

libticalcs/trunk/tests/torture_ticalcs.c

@@ -538,7 +538,7 @@ static void torture_dbus(void)
 
 static void torture_cmdz80(void)
 {
-#ifndef __WIN32__
+#ifndef _MSC_VER
 // cmdz80.c
     PRINTF(ti73_send_VAR, INT, NULL, 0, 0, (void *)0x12345678, 0, 0);
     PRINTF(ti73_send_VAR, INT, (void *)0x12345678, 0, 0, NULL, 0, 0);