From d3f2ac7513475d64dae8e027eab87119283a1b8d Mon Sep 17 00:00:00 2001
From: whitequark <whitequark@whitequark.org>
Date: Sat, 19 Nov 2016 01:00:11 +0000
Subject: [PATCH] Remove most dependencies on config.h.

The only thing we need it anymore is the package version and platform
configuration, so only include it for that. As a result, less files
are rebuilt when the git commit changes and config.h is regenerated.
---
 CMakeLists.txt            | 1 -
 exposed/CDemo.c           | 7 +------
 src/CMakeLists.txt        | 2 +-
 src/config.h.in           | 1 -
 src/graphicswin.cpp       | 5 ++---
 src/platform/cocoamain.mm | 1 -
 src/render/rendergl1.cpp  | 1 -
 7 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b802b2e..d22de6a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -192,7 +192,6 @@ else() # Linux and compatible systems
     pkg_check_modules(JSONC REQUIRED json-c)
     pkg_check_modules(FREETYPE REQUIRED freetype2)
 
-    set(HAVE_GTK TRUE)
     if(GUI STREQUAL "gtk3")
         set(HAVE_GTK3 TRUE)
         pkg_check_modules(GTKMM REQUIRED gtkmm-3.0 pangomm-1.4 x11)
diff --git a/exposed/CDemo.c b/exposed/CDemo.c
index 85931f2..cf6107e 100644
--- a/exposed/CDemo.c
+++ b/exposed/CDemo.c
@@ -5,18 +5,13 @@
  *
  * Copyright 2008-2013 Jonathan Westhues.
  *---------------------------------------------------------------------------*/
-#ifdef HAVE_CONFIG_H
-#   include <config.h>
-#endif
 #ifdef WIN32
 #   include <windows.h>
 #endif
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#ifdef HAVE_STDINT_H
-#   include <stdint.h>
-#endif
+#include <stdint.h>
 
 #include <slvs.h>
 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 0cef9f6..7880c3b 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -104,7 +104,7 @@ elseif(APPLE)
 
     set(platform_LIBRARIES
         ${APPKIT_LIBRARY})
-elseif(HAVE_GTK)
+elseif(HAVE_GTK2 OR HAVE_GTK3)
     set(platform_SOURCES
         platform/gtkmain.cpp
         render/rendergl.cpp
diff --git a/src/config.h.in b/src/config.h.in
index f8ebe0f..69eaedb 100644
--- a/src/config.h.in
+++ b/src/config.h.in
@@ -9,7 +9,6 @@
 /* Do we have the si library on win32, or libspnav on *nix? */
 #cmakedefine HAVE_SPACEWARE
 
-#cmakedefine HAVE_GTK
 #cmakedefine HAVE_GTK2
 #cmakedefine HAVE_GTK3
 
diff --git a/src/graphicswin.cpp b/src/graphicswin.cpp
index 33cb806..2dc1a2f 100644
--- a/src/graphicswin.cpp
+++ b/src/graphicswin.cpp
@@ -5,7 +5,6 @@
 // Copyright 2008-2013 Jonathan Westhues.
 //-----------------------------------------------------------------------------
 #include "solvespace.h"
-#include "config.h"
 
 #define mView (&GraphicsWindow::MenuView)
 #define mEdit (&GraphicsWindow::MenuEdit)
@@ -85,7 +84,7 @@ const GraphicsWindow::MenuEntry GraphicsWindow::menu[] = {
 { 1,  NULL,                         Command::NONE,             0,       TN, NULL  },
 { 1, "Dimensions in &Inches",       Command::UNITS_INCHES,     0,       TR, mView },
 { 1, "Dimensions in &Millimeters",  Command::UNITS_MM,         0,       TR, mView },
-#if defined(HAVE_GTK) || defined(__APPLE__)
+#if defined(__unix__) || defined(__APPLE__)
 { 1,  NULL,                         Command::NONE,             0,       TN, NULL  },
 { 1, "&Full Screen",                Command::FULL_SCREEN,      C|F(11), TC, mView },
 #endif
@@ -697,7 +696,7 @@ void GraphicsWindow::EnsureValidActives() {
     CheckMenuByCmd(Command::SHOW_TOOLBAR, /*checked=*/SS.showToolbar);
     CheckMenuByCmd(Command::PERSPECTIVE_PROJ, /*checked=*/SS.usePerspectiveProj);
     CheckMenuByCmd(Command::SHOW_GRID,/*checked=*/SS.GW.showSnapGrid);
-#if defined(HAVE_GTK) || defined(__APPLE__)
+#if defined(__unix__) || defined(__APPLE__)
     CheckMenuByCmd(Command::FULL_SCREEN, /*checked=*/FullScreenIsActive());
 #endif
 
diff --git a/src/platform/cocoamain.mm b/src/platform/cocoamain.mm
index 1249699..9b87514 100644
--- a/src/platform/cocoamain.mm
+++ b/src/platform/cocoamain.mm
@@ -14,7 +14,6 @@
 #include <map>
 
 #include "solvespace.h"
-#include <config.h>
 
 using SolveSpace::dbp;
 
diff --git a/src/render/rendergl1.cpp b/src/render/rendergl1.cpp
index 832a172..f977daf 100644
--- a/src/render/rendergl1.cpp
+++ b/src/render/rendergl1.cpp
@@ -3,7 +3,6 @@
 //
 // Copyright 2016 whitequark
 //-----------------------------------------------------------------------------
-#include "config.h"
 #include "solvespace.h"
 
 #ifdef WIN32