mirror of https://github.com/AxioDL/metaforce.git
Merge branch 'master' of ssh://git.axiodl.com:6431/AxioDL/urde
This commit is contained in:
commit
dc23ee564d
|
@ -121,7 +121,7 @@ build:linux:avx2:
|
||||||
tags:
|
tags:
|
||||||
- win32
|
- win32
|
||||||
script:
|
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
|
- mkdir build
|
||||||
- cd build
|
- cd build
|
||||||
- >
|
- >
|
||||||
|
|
2
hecl
2
hecl
|
@ -1 +1 @@
|
||||||
Subproject commit 223e613f56343c95be5d0f1f1641268a5545db22
|
Subproject commit c26869ebff6210dc23afca6518a41f5c2cf93183
|
|
@ -13,7 +13,7 @@ else()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(APPLE)
|
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)
|
set_source_files_properties(MainMac.mm PROPERTIES COMPILE_FLAGS -fobjc-arc)
|
||||||
elseif(WIN32)
|
elseif(WIN32)
|
||||||
set(PLAT_SRCS MainWin.cpp)
|
set(PLAT_SRCS MainWin.cpp)
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue