Kajetan Johannes Hammerle преди 4 години
родител
ревизия
23bd8a2766
променени са 4 файла, в които са добавени 3 реда и са изтрити 6 реда
  1. 0 2
      .gitignore
  2. 2 1
      meson.build
  3. 1 1
      subprojects/gaming-core
  4. 0 2
      subprojects/libpng.wrap

+ 0 - 2
.gitignore

@@ -1,2 +0,0 @@
-subprojects/libpng-1.6.37
-subprojects/packagecache

+ 2 - 1
meson.build

@@ -46,7 +46,8 @@ src_client = ['client/Main.cpp',
 
 sources_test = ['tests/Main.cpp']
 
-args = ['-Wall', '-Wextra', '-pedantic', '-Werror', '-DLOG_LEVEL=4']
+compiler = meson.get_compiler('cpp')
+args = compiler.get_supported_arguments(['-Wall', '-Wextra', '-pedantic', '-Werror', '-DLOG_LEVEL=4'])
 
 libgamingcore_proj = subproject('gaming-core')
 libgamingcore_dep = libgamingcore_proj.get_variable('libgamingcore_dep')

+ 1 - 1
subprojects/gaming-core

@@ -1 +1 @@
-Subproject commit 1f1ae5ba08a2306ad7fe53239fc9d4f7f8bbca59
+Subproject commit 85050a591b1fd1a577f6a249b3660500c4d7d0d0

+ 0 - 2
subprojects/libpng.wrap

@@ -1,2 +0,0 @@
-[wrap-redirect]
-filename = gaming-core/subprojects/libpng.wrap