Merge branch 'master' of ssh://git.axiodl.com:6431/AxioDL/urde

2019-06-30 20:15:14 -10:00 · 2019-06-30 20:15:14 -10:00 · dc23ee564d
parent fd0bfc3acf 2ff9077560
commit dc23ee564d
5 changed files with 43834 additions and 3 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -121,7 +121,7 @@ build:linux:avx2:
  tags:
    - win32
  script:
-    - 'call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" amd64'
+    - 'call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat" amd64'
    - mkdir build
    - cd build
    - >
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 223e613f56343c95be5d0f1f1641268a5545db22
+Subproject commit c26869ebff6210dc23afca6518a41f5c2cf93183
--- a/visigen/CMakeLists.txt
+++ b/visigen/CMakeLists.txt
@ -13,7 +13,7 @@ else()
 endif()

 if(APPLE)
-  set(PLAT_SRCS MainMac.mm)
+  set(PLAT_SRCS MainMac.mm glew.c)
  set_source_files_properties(MainMac.mm PROPERTIES COMPILE_FLAGS -fobjc-arc)
 elseif(WIN32)
  set(PLAT_SRCS MainWin.cpp)
--- a/visigen/glew.c
+++ b/visigen/glew.c
--- a/visigen/glew.h
+++ b/visigen/glew.h