Browse Source

library building and more name collision renaming

Kajetan Johannes Hammerle 3 years ago
parent
commit
12b19d5fab
5 changed files with 15 additions and 9 deletions
  1. 10 4
      meson.build
  2. 1 1
      tokenizer/File.c
  3. 1 1
      tokenizer/Tokenizer.c
  4. 1 1
      utils/SnuviUtils.c
  5. 2 2
      utils/SnuviUtils.h

+ 10 - 4
meson.build

@@ -1,11 +1,10 @@
 project('lonely tiger', 'c')
 
 src = [
-    'Main.c', 
     'tokenizer/Tokenizer.c', 
     'tokenizer/Token.c', 
     'tokenizer/File.c', 
-    'utils/Utils.c', 
+    'utils/SnuviUtils.c', 
     'utils/Variables.c',
     'utils/Functions.c',
     'utils/ByteCodePrinter.c',
@@ -22,7 +21,14 @@ src = [
 cc = meson.get_compiler('c')
 mathDep = cc.find_library('m', required : true)
 
-executable('lonely_tiger', 
+args = ['-Wall', '-Wextra', '-pedantic', '-Werror', '-O3']
+
+library('lonely_tiger', 
     sources: src,
     dependencies : mathDep,
-    c_args: ['-Wall', '-Wextra', '-pedantic', '-Werror', '-O3'])
+    c_args: args)
+
+executable('lonely_tiger', 
+    sources: src + ['Main.c'],
+    dependencies : mathDep,
+    c_args: args)

+ 1 - 1
tokenizer/File.c

@@ -3,7 +3,7 @@
 #include <string.h>
 
 #include "tokenizer/File.h"
-#include "utils/Utils.h"
+#include "utils/SnuviUtils.h"
 
 #define MAX_INDEX 50
 

+ 1 - 1
tokenizer/Tokenizer.c

@@ -7,7 +7,7 @@
 
 #include "tokenizer/File.h"
 #include "tokenizer/Tokenizer.h"
-#include "utils/Utils.h"
+#include "utils/SnuviUtils.h"
 
 #define TOKEN_BUFFER_LENGTH (1024 * 1024)
 #define ERROR_LENGTH 256

+ 1 - 1
utils/Utils.c → utils/SnuviUtils.c

@@ -1,4 +1,4 @@
-#include "utils/Utils.h"
+#include "utils/SnuviUtils.h"
 
 bool isLetter(int c) {
     return (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z');

+ 2 - 2
utils/Utils.h → utils/SnuviUtils.h

@@ -1,5 +1,5 @@
-#ifndef UTILS_H
-#define UTILS_H
+#ifndef SNUVI_UTILS_H
+#define SNUVI_UTILS_H
 
 #include <stdbool.h>