update min cmake, add wine to lib, make base empty

3 files changed, 9 insertions, 6 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e6ef9ec..ccefdc9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.12)
 
 if(CMAKE_POLICY_DEFAULT_CMP0017 OR CMAKE_POLICY_DEFAULT_CMP0020)
 	# touch these to remove warnings
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 2069d5a..8b36820 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -15,20 +15,23 @@ set(LIBSOURCES
     ${CMAKE_CURRENT_SOURCE_DIR}/lutris/keyword.h
     ${CMAKE_CURRENT_SOURCE_DIR}/lutris/runner.h
     ${CMAKE_CURRENT_SOURCE_DIR}/lutris/task.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/main.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/main.h
     ${CMAKE_CURRENT_SOURCE_DIR}/net.c
     ${CMAKE_CURRENT_SOURCE_DIR}/net.h
     ${CMAKE_CURRENT_SOURCE_DIR}/tar.c
     ${CMAKE_CURRENT_SOURCE_DIR}/tar.h
 )
 
+FILE(WRITE ${CMAKE_BINARY_DIR}/base.c "extern int empty;\n")
+
 set(MAINSOURCES
-    ${CMAKE_CURRENT_SOURCE_DIR}/main.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/main.h
+    ${CMAKE_BINARY_DIR}/base.c   
 )
 
 if (NOT WIN32)
-set(MAINSOURCES
-    ${MAINSOURCES}
+set(LIBSOURCES
+    ${LIBSOURCES}
     ${CMAKE_CURRENT_SOURCE_DIR}/wine.c
     ${CMAKE_CURRENT_SOURCE_DIR}/wine.h
 )
diff --git a/src/wine.c b/src/wine.c
index cf3bc7e..16c342f 100644
--- a/src/wine.c
+++ b/src/wine.c
@@ -25,7 +25,7 @@ static const struct Command winecmd_commands[] = {
 };
 
 static const struct Flag winecmd_flags[] = {
-    { .name = "help",       .variant = TWO, .returns = 1, .func = winecmd_help,    .description = "show this message"},
+    { .name = "help",       .variant = TWO, .returns = 1, .func = winecmd_help, .description = "show this message"},
     { .name = "no-net",     .variant = TWO, .returns = 0, .func = set_no_net,   .description = "run commands without commitment"}
 };