Various changes to improve building on Windows

10 files changed, 27 insertions, 27 deletions

diff --git a/include/enginelibrary.hpp b/include/djinterop/enginelibrary.hpp
index b5123ba..5d9560d 100644
--- a/include/enginelibrary.hpp
+++ b/include/djinterop/enginelibrary.hpp
@@ -15,8 +15,8 @@
     along with libdjinterop.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#if __cplusplus <= 199711L
-  #error This library needs at least a C++11 compliant compiler
+#if __cplusplus < 201402L && _MSVC_LANG < 201402L
+  #error This library needs at least a C++14 compliant compiler
 #endif
 
 #ifndef DJINTEROP_ENGINELIBRARY_HPP
diff --git a/include/enginelibrary/album_art.hpp b/include/djinterop/enginelibrary/album_art.hpp
index 9aa646f..62768ff 100644
--- a/include/enginelibrary/album_art.hpp
+++ b/include/djinterop/enginelibrary/album_art.hpp
@@ -15,8 +15,8 @@
     along with libdjinterop.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#if __cplusplus <= 199711L
-  #error This library needs at least a C++11 compliant compiler
+#if __cplusplus < 201402L && _MSVC_LANG < 201402L
+  #error This library needs at least a C++14 compliant compiler
 #endif
 
 #ifndef DJINTEROP_ENGINELIBRARY_ALBUM_ART_HPP
diff --git a/include/enginelibrary/crate.hpp b/include/djinterop/enginelibrary/crate.hpp
index a2a7489..504ad4f 100644
--- a/include/enginelibrary/crate.hpp
+++ b/include/djinterop/enginelibrary/crate.hpp
@@ -15,8 +15,8 @@
     along with libdjinterop.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#if __cplusplus <= 199711L
-  #error This library needs at least a C++11 compliant compiler
+#if __cplusplus < 201402L && _MSVC_LANG < 201402L
+  #error This library needs at least a C++14 compliant compiler
 #endif
 
 #ifndef DJINTEROP_ENGINELIBRARY_CRATE_HPP
diff --git a/include/enginelibrary/database.hpp b/include/djinterop/enginelibrary/database.hpp
index 2704b03..f4b2f67 100644
--- a/include/enginelibrary/database.hpp
+++ b/include/djinterop/enginelibrary/database.hpp
@@ -15,8 +15,8 @@
     along with libdjinterop.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#if __cplusplus <= 199711L
-  #error This library needs at least a C++11 compliant compiler
+#if __cplusplus < 201402L && _MSVC_LANG < 201402L
+  #error This library needs at least a C++14 compliant compiler
 #endif
 
 #ifndef DJINTEROP_ENGINELIBRARY_DATABASE_HPP
diff --git a/include/enginelibrary/musical_key.hpp b/include/djinterop/enginelibrary/musical_key.hpp
index 23f51ab..61db8da 100644
--- a/include/enginelibrary/musical_key.hpp
+++ b/include/djinterop/enginelibrary/musical_key.hpp
@@ -15,8 +15,8 @@
     along with libdjinterop.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#if __cplusplus <= 199711L
-  #error This library needs at least a C++11 compliant compiler
+#if __cplusplus < 201402L && _MSVC_LANG < 201402L
+  #error This library needs at least a C++14 compliant compiler
 #endif
 
 #ifndef DJINTEROP_ENGINELIBRARY_MUSICAL_KEY_HPP
diff --git a/include/enginelibrary/pad_colour.hpp b/include/djinterop/enginelibrary/pad_colour.hpp
index 138564c..93d4639 100644
--- a/include/enginelibrary/pad_colour.hpp
+++ b/include/djinterop/enginelibrary/pad_colour.hpp
@@ -15,8 +15,8 @@
     along with libdjinterop.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#if __cplusplus <= 199711L
-  #error This library needs at least a C++11 compliant compiler
+#if __cplusplus < 201402L && _MSVC_LANG < 201402L
+  #error This library needs at least a C++14 compliant compiler
 #endif
 
 #ifndef DJINTEROP_ENGINELIBRARY_PAD_COLOUR_HPP
diff --git a/include/enginelibrary/performance_data.hpp b/include/djinterop/enginelibrary/performance_data.hpp
index 383da2f..47e8b7d 100644
--- a/include/enginelibrary/performance_data.hpp
+++ b/include/djinterop/enginelibrary/performance_data.hpp
@@ -15,8 +15,8 @@
     along with libdjinterop.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#if __cplusplus <= 199711L
-  #error This library needs at least a C++11 compliant compiler
+#if __cplusplus < 201402L && _MSVC_LANG < 201402L
+  #error This library needs at least a C++14 compliant compiler
 #endif
 
 #ifndef DJINTEROP_ENGINELIBRARY_PERFORMANCE_DATA_HPP
diff --git a/include/enginelibrary/schema_version.hpp b/include/djinterop/enginelibrary/schema_version.hpp
index adccc5e..ed0c343 100644
--- a/include/enginelibrary/schema_version.hpp
+++ b/include/djinterop/enginelibrary/schema_version.hpp
@@ -15,8 +15,8 @@
     along with libdjinterop.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#if __cplusplus <= 199711L
-  #error This library needs at least a C++11 compliant compiler
+#if __cplusplus < 201402L && _MSVC_LANG < 201402L
+  #error This library needs at least a C++14 compliant compiler
 #endif
 
 #ifndef DJINTEROP_ENGINELIBRARY_SCHEMA_VERSION_HPP
diff --git a/include/enginelibrary/track.hpp b/include/djinterop/enginelibrary/track.hpp
index 63dc3f9..1990899 100644
--- a/include/enginelibrary/track.hpp
+++ b/include/djinterop/enginelibrary/track.hpp
@@ -15,8 +15,8 @@
     along with libdjinterop.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#if __cplusplus <= 199711L
-  #error This library needs at least a C++11 compliant compiler
+#if __cplusplus < 201402L && _MSVC_LANG < 201402L
+  #error This library needs at least a C++14 compliant compiler
 #endif
 
 #ifndef DJINTEROP_ENGINELIBRARY_TRACK_HPP
diff --git a/include/meson.build b/include/meson.build
index dcb389e..cc0b91e 100644
--- a/include/meson.build
+++ b/include/meson.build
@@ -1,15 +1,15 @@
 public_header_files = [
-    'enginelibrary.hpp',
+    'djinterop/enginelibrary.hpp',
 ]
 el_public_header_files = [
-    'enginelibrary/album_art.hpp',
-    'enginelibrary/crate.hpp',
-    'enginelibrary/database.hpp',
-    'enginelibrary/musical_key.hpp',
-    'enginelibrary/pad_colour.hpp',
-    'enginelibrary/performance_data.hpp',
-    'enginelibrary/schema_version.hpp',
-    'enginelibrary/track.hpp'
+    'djinterop/enginelibrary/album_art.hpp',
+    'djinterop/enginelibrary/crate.hpp',
+    'djinterop/enginelibrary/database.hpp',
+    'djinterop/enginelibrary/musical_key.hpp',
+    'djinterop/enginelibrary/pad_colour.hpp',
+    'djinterop/enginelibrary/performance_data.hpp',
+    'djinterop/enginelibrary/schema_version.hpp',
+    'djinterop/enginelibrary/track.hpp'
 ]
 
 # Meson appears to flatten header files into the subdir when installing, so we