Skip to content

Commit e4fd95d

Browse files
committed
WIP
1 parent 70ded06 commit e4fd95d

3 files changed

Lines changed: 7 additions & 5 deletions

File tree

.github/workflows/build.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,8 @@ jobs:
6868
MacOS:
6969

7070
runs-on: macos-latest
71+
env:
72+
CXX: g++-10
7173
strategy:
7274
matrix:
7375
python-version: [ 3.14 ]

scripts/gen_build.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232

3333
# project wide settings
3434
pl.set_output_directory("../out")
35-
pl.add_link_directories("../out", "../../pilotlight/out")
35+
pl.add_link_directories("../out")
3636
pl.add_definitions("_USE_MATH_DEFINES")
3737
pl.add_include_directories("../src", "../extensions")
3838

@@ -140,7 +140,7 @@
140140
# macos
141141
with pl.platform("Darwin"):
142142
with pl.compiler("clang"):
143-
pl.add_compiler_flags("-fPIC", "-std=c++14", "--debug -g")
143+
pl.add_compiler_flags("-fPIC", "-std=c++14", "--debug -g", "-Warc-bridge-casts-disallowed-in-nonarc")
144144
pl.add_linker_flags("-ldl -lm", "-lstdc++")
145145

146146
# default config
@@ -163,7 +163,7 @@
163163
# macos
164164
with pl.platform("Darwin"):
165165
with pl.compiler("clang"):
166-
pl.add_compiler_flags("-fPIC", "-std=c++14")
166+
pl.add_compiler_flags("-fPIC", "-std=c++14", "-Warc-bridge-casts-disallowed-in-nonarc")
167167
pl.add_linker_flags("-ldl -lm", "-lstdc++")
168168

169169
#-----------------------------------------------------------------------------
@@ -474,7 +474,7 @@
474474
pl.add_definitions("PL_METAL_BACKEND")
475475
pl.set_output_binary("imgui")
476476
pl.set_output_binary_extension(".so")
477-
pl.add_compiler_flags("-fPIC", "--debug -g", "-std=c99", "-fmodules", "-ObjC++", "-arch arm64")
477+
pl.add_compiler_flags("-fPIC", "--debug -g", "-fmodules", "-ObjC++", "-arch arm64")
478478
pl.add_linker_flags("-ldl -lm")
479479
pl.add_link_frameworks("Metal", "MetalKit", "Cocoa", "IOKit", "CoreVideo", "QuartzCore")
480480
pl.add_dynamic_link_libraries("shaderc_shared", "spirv-cross-c-shared")

src/pl_core_m.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Index of this file:
1919
// [SECTION] binding apis
2020
//-----------------------------------------------------------------------------
2121

22-
extern const plWindowI* ptWindows2;
22+
const plWindowI* ptWindows2;
2323
static PyObject* ptpyIO = NULL;
2424

2525
//-----------------------------------------------------------------------------

0 commit comments

Comments
 (0)