summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Jamroot.jam9
-rw-r--r--gfx/models/obj.ll5
-rw-r--r--gfx/models/stb_image.c4
-rw-r--r--gfx/models/stb_image.cpp9
-rw-r--r--lib/jsonParse.ll5
5 files changed, 12 insertions, 20 deletions
diff --git a/Jamroot.jam b/Jamroot.jam
index fdd08cd..62032d9 100644
--- a/Jamroot.jam
+++ b/Jamroot.jam
@@ -70,7 +70,14 @@ run application/main.cpp
;
lib ilt :
- [ glob-tree *.cpp *.c *.vs *.fs *.ll : bin test ]
+ [ glob-tree *.cpp *.vs *.fs : bin test ]
+ [ lib generated : [ glob-tree *.ll *.c ] :
+ <include>.
+ <include>lib
+ <variant>release
+ <link>static
+ <cflags>-fPIC
+ ]
:
<include>.
<include>lib
diff --git a/gfx/models/obj.ll b/gfx/models/obj.ll
index a9a857b..84884fe 100644
--- a/gfx/models/obj.ll
+++ b/gfx/models/obj.ll
@@ -7,11 +7,6 @@
%option prefix="objbase"
%{
-#pragma GCC diagnostic ignored "-Wsign-compare"
-#pragma GCC diagnostic ignored "-Wimplicit-fallthrough"
-#if __clang__
-#pragma GCC diagnostic ignored "-Wnull-conversion"
-#endif
#include <gfx/models/obj.h>
#include <glm/glm.hpp>
#include <memory>
diff --git a/gfx/models/stb_image.c b/gfx/models/stb_image.c
new file mode 100644
index 0000000..c15369e
--- /dev/null
+++ b/gfx/models/stb_image.c
@@ -0,0 +1,4 @@
+#ifndef TIDY
+# define STB_IMAGE_IMPLEMENTATION
+# include "stb/stb_image.h"
+#endif
diff --git a/gfx/models/stb_image.cpp b/gfx/models/stb_image.cpp
deleted file mode 100644
index c6b605e..0000000
--- a/gfx/models/stb_image.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef TIDY
-# define STB_IMAGE_IMPLEMENTATION
-# pragma GCC diagnostic ignored "-Wsign-compare"
-# pragma GCC diagnostic ignored "-Wimplicit-fallthrough"
-# ifndef __clang__
-# pragma GCC diagnostic ignored "-Wunused-but-set-variable"
-# endif
-# include "stb/stb_image.h"
-#endif
diff --git a/lib/jsonParse.ll b/lib/jsonParse.ll
index ab09e80..c646044 100644
--- a/lib/jsonParse.ll
+++ b/lib/jsonParse.ll
@@ -12,11 +12,6 @@
#include <utility>
class jsonBaseFlexLexer;
#include "jsonParse.h"
-#pragma GCC diagnostic ignored "-Wsign-compare"
-#pragma GCC diagnostic ignored "-Wimplicit-fallthrough"
-#ifdef __clang__
-#pragma clang diagnostic ignored "-Wnull-conversion"
-#endif
%}
beginobj "{"