From 3bf14fa7ec34bff062724fa008a7a55684650509 Mon Sep 17 00:00:00 2001
From: gingerBill <bill@gingerbill.org>
Date: Sat, 10 Jul 2021 16:30:54 +0100
Subject: Update CI and Makefile and build.bat

---
 .github/workflows/ci.yml |  6 +++---
 Makefile                 | 14 +++++++-------
 build.bat                |  3 ++-
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index faf5ecd29..85880c4fe 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -7,7 +7,7 @@ jobs:
     steps:
       - uses: actions/checkout@v1
       - name: Download LLVM
-        run: sudo apt-get install llvm-11 clang-11 llvm
+        run: sudo apt-get install llvm-12.0.1 clang-12.0.1 llvm
       - name: build odin
         run: make release
       - name: Odin run
@@ -22,8 +22,8 @@ jobs:
       - uses: actions/checkout@v1
       - name: Download LLVM and setup PATH
         run: |
-          brew install llvm@11
-          echo "/usr/local/opt/llvm@11/bin" >> $GITHUB_PATH
+          brew install llvm@12.0.1
+          echo "/usr/local/opt/llvm@12.0.1/bin" >> $GITHUB_PATH
           TMP_PATH=$(xcrun --show-sdk-path)/user/include
           echo "CPATH=$TMP_PATH" >> $GITHUB_ENV
       - name: build odin
diff --git a/Makefile b/Makefile
index 86460cced..132282771 100644
--- a/Makefile
+++ b/Makefile
@@ -9,10 +9,10 @@ OS=$(shell uname)
 
 ifeq ($(OS), Darwin)
     LLVM_CONFIG=llvm-config
-    ifneq ($(shell llvm-config --version | grep '^11\.'),)
+    ifneq ($(shell llvm-config --version | grep '^12\.'),)
         LLVM_CONFIG=llvm-config
     else
-        $(error "Requirement: llvm-config must be version 11")
+        $(error "Requirement: llvm-config must be version 12.0.1")
     endif
 
     LDFLAGS:=$(LDFLAGS) -liconv
@@ -20,14 +20,14 @@ ifeq ($(OS), Darwin)
     LDFLAGS:=$(LDFLAGS) -lLLVM-C
 endif
 ifeq ($(OS), Linux)
-    LLVM_CONFIG=llvm-config-11
-    ifneq ($(shell which llvm-config-11 2>/dev/null),)
-        LLVM_CONFIG=llvm-config-11
+    LLVM_CONFIG=llvm-config-12
+    ifneq ($(shell which llvm-config-12 2>/dev/null),)
+        LLVM_CONFIG=llvm-config-12
     else
-        ifneq ($(shell llvm-config --version | grep '^11\.'),)
+        ifneq ($(shell llvm-config --version | grep '^12\.'),)
             LLVM_CONFIG=llvm-config
         else
-            $(error "Requirement: llvm-config must be version 11")
+            $(error "Requirement: llvm-config must be version 12.0.1")
         endif
     endif
 
diff --git a/build.bat b/build.bat
index 038f02866..c9ff3f4ad 100644
--- a/build.bat
+++ b/build.bat
@@ -51,7 +51,8 @@ set compiler_warnings= ^
 	-wd4456 -wd4457 -wd4480 ^
 	-wd4512
 
-set compiler_includes=
+set compiler_includes= ^
+	/Isrc\
 set libs= ^
 	kernel32.lib ^
 	bin\llvm\windows\LLVM-C.lib
-- 
cgit v1.2.3