Use CMake instead of other stuff

Add stuff to develop in Visual Studio (i.e. to gitignore)
Add correct_curses.h
Add MSVC fixes to foreach.h macros
Add Windows getopt.c and getopt.h (for now).

5 files changed, 195 insertions, 8 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
new file mode 100644
index 0000000..3b216bf
--- /dev/null
+++ b/src/CMakeLists.txt
@@ -0,0 +1,6 @@
+# Makefile stuff
+include_directories(.)
+add_executable(life life.c life.h updatemap.c updatemap.h menus.c menus.h)
+target_compile_features(life PUBLIC c_function_prototypes c_variadic_macros)
+target_include_directories(life PRIVATE "${CURSES_INCLUDE_DIRS}")
+target_link_libraries(life "${CURSES_LIBRARIES}")
diff --git a/src/correct_curses.h b/src/correct_curses.h
new file mode 100644
index 0000000..60bc2ba
--- /dev/null
+++ b/src/correct_curses.h
@@ -0,0 +1,24 @@
+#ifndef GRAPH_CORRECT_CURSES_H
+#define GRAPH_CORRECT_CURSES_H
+#if defined(HAVE_CMAKECONFIG_H)
+#include <cmakeconfig.h>
+
+#if defined HAVE_NCURSESW_CURSES_H
+#  include <ncursesw/curses.h>
+#elif defined HAVE_NCURSESW_H
+#  include <ncursesw.h>
+#elif defined HAVE_NCURSES_CURSES_H
+#  include <ncurses/curses.h>
+#elif defined HAVE_NCURSES_H
+#  include <ncurses.h>
+#elif defined HAVE_CURSES_H
+#  include <curses.h>
+#else
+#  error "SysV or X/Open-compatible Curses header file required"
+#endif
+#else
+
+// Fingers-crossed
+#include <curses.h>
+#endif
+#endif // GRAPH_CORRECT_CURSES_H
\ No newline at end of file
diff --git a/src/foreach.h b/src/foreach.h
index e684b93..9b20953 100644
--- a/src/foreach.h
+++ b/src/foreach.h
@@ -1,11 +1,35 @@
 #ifndef NARG
-#define NARG(...) NARG_(__VA_ARGS__, RSEQ_N)
-#define NARG_(...) NARG_N(__VA_ARGS__)
-#define RSEQ_N 8, 7, 6, 5, 4, 3, 2, 1, 0
 #define NARG_N(_1, _2, _3, _4, _5, _6, _7, _8, N, ...) N
+#define RSEQ_N 8, 7, 6, 5, 4, 3, 2, 1, 0
+#if _MSC_VER && !__INTEL_COMPILER
+#define EXPAND(...) __VA_ARGS__
+#define NARG_(...) EXPAND(EXPAND(NARG_N) (__VA_ARGS__))
+#else
+#define NARG_(...) NARG_N(__VA_ARGS__)
+#endif
+#define NARG(...) NARG_(__VA_ARGS__, RSEQ_N)
 #endif
 
 #ifndef foreach
+
+#define CONCAT2(x, y) x##y
+#define CONCAT1(x, y) CONCAT2(x,y)
+#define CONCATENATE(x, y) CONCAT1(x, y)
+
+#if _MSC_VER && !__INTEL_COMPILER
+#undef EXPAND
+#define EXPAND(...) __VA_ARGS__
+#define FOREACH_0(func) } while (0)
+#define FOREACH_1(func, first) func(first); FOREACH_0(func)
+#define FOREACH_2(func, first,...) func(first); EXPAND(EXPAND(FOREACH_1)(func, __VA_ARGS__))
+#define FOREACH_3(func, first,...) func(first); EXPAND(EXPAND(FOREACH_2)(func, __VA_ARGS__))
+#define FOREACH_4(func, first,...) func(first); EXPAND(EXPAND(FOREACH_3)(func, __VA_ARGS__))
+#define FOREACH_5(func, first,...) func(first); EXPAND(EXPAND(FOREACH_4)(func, __VA_ARGS__))
+#define FOREACH_6(func, first,...) func(first); EXPAND(EXPAND(FOREACH_5)(func, __VA_ARGS__))
+#define FOREACH_7(func, first,...) func(first); EXPAND(EXPAND(FOREACH_6)(func, __VA_ARGS__))
+#define FOREACH_8(func, first,...) func(first); EXPAND(EXPAND(FOREACH_7)(func, __VA_ARGS__))
+#define foreach(func, ...) do { EXPAND(CONCATENATE(FOREACH_, NARG(__VA_ARGS__))(func, __VA_ARGS__))
+#else
 #define FOREACH_0(func) } while (0)
 #define FOREACH_1(func, first) func(first); FOREACH_0(func)
 #define FOREACH_2(func, first,...) func(first); FOREACH_1(func, __VA_ARGS__)
@@ -15,10 +39,7 @@
 #define FOREACH_6(func, first,...) func(first); FOREACH_5(func, __VA_ARGS__)
 #define FOREACH_7(func, first,...) func(first); FOREACH_6(func, __VA_ARGS__)
 #define FOREACH_8(func, first,...) func(first); FOREACH_7(func, __VA_ARGS__)
-
-#define CONCAT1(x, y) x##y
-#define CONCATENATE(x, y) CONCAT1(x, y)
-
-#define foreach(func, ...) do { CONCATENATE(FOREACH_,NARG(__VA_ARGS__))(func, __VA_ARGS__)
+#define foreach(func, ...) do { CONCATENATE(FOREACH_, NARG(__VA_ARGS__))(func, __VA_ARGS__)
+#endif
 #endif
 
diff --git a/src/getopt.c b/src/getopt.c
new file mode 100644
index 0000000..cb4f192
--- /dev/null
+++ b/src/getopt.c
@@ -0,0 +1,51 @@
+/* *****************************************************************
+*
+* Copyright 2016 Microsoft
+*
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*      http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*
+******************************************************************/
+
+#include "getopt.h"
+#include <string.h>
+
+char* optarg = NULL;
+int optind = 1;
+
+int getopt(int argc, char* const argv[], const char* optstring)
+{
+        if ((optind >= argc) || (argv[optind][0] != '-') || (argv[optind][0] == 0))
+        {
+                return -1;
+        }
+
+        int opt = argv[optind][1];
+        const char* p = strchr(optstring, opt);
+
+        if (p == NULL)
+        {
+                return '?';
+        }
+        if (p[1] == ':')
+        {
+                optind++;
+                if (optind >= argc)
+                {
+                        return '?';
+                }
+                optarg = argv[optind];
+                optind++;
+        }
+        return opt;
+}
diff --git a/src/getopt.h b/src/getopt.h
new file mode 100644
index 0000000..b9a1e72
--- /dev/null
+++ b/src/getopt.h
@@ -0,0 +1,85 @@
+/* *****************************************************************
+*
+* Copyright 2016 Microsoft
+*
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*      http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*
+******************************************************************/
+
+#include <string.h>
+
+#ifndef GETOPT_H__
+#define GETOPT_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+        int getopt(int argc, char* const argv[], const char* optstring);
+
+
+        /* *****************************************************************
+*
+* Copyright 2016 Microsoft
+*
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*      http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*
+******************************************************************/
+
+        char* optarg = NULL;
+        int optind = 1;
+
+        int getopt(int argc, char* const argv[], const char* optstring)
+        {
+                if ((optind >= argc) || (argv[optind][0] != '-') || (argv[optind][0] == 0))
+                {
+                        return -1;
+                }
+
+                int opt = argv[optind][1];
+                const char* p = strchr(optstring, opt);
+
+                if (p == NULL)
+                {
+                        return '?';
+                }
+                if (p[1] == ':')
+                {
+                        optind++;
+                        if (optind >= argc)
+                        {
+                                return '?';
+                        }
+                        optarg = argv[optind];
+                        optind++;
+                }
+                return opt;
+        }
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif