remove some comments
This commit is contained in:
19
cell.toml
19
cell.toml
@@ -1,20 +1,3 @@
|
||||
[system]
|
||||
ar_timer = 60
|
||||
actor_memory = 0
|
||||
net_service = 0.1
|
||||
reply_timeout = 60
|
||||
actor_max = "10_000"
|
||||
stack_max = 0
|
||||
[actors]
|
||||
[actors.prosperon/sdl_video]
|
||||
main = true
|
||||
[actors.prosperon/prosperon]
|
||||
main = true
|
||||
[actors.prosperon]
|
||||
main = true
|
||||
[actors.accio]
|
||||
main = true
|
||||
|
||||
[compilation]
|
||||
CFLAGS = "-Isource -Wno-incompatible-pointer-types -Wno-missing-braces -Wno-strict-prototypes -Wno-unused-function -Wno-int-conversion"
|
||||
LDFLAGS = "-lstdc++ -lm"
|
||||
@@ -27,4 +10,4 @@ LDFLAGS = "-framework CoreFoundation -framework CFNetwork"
|
||||
CFLAGS = "-DMINIZ_NO_TIME -DTARGET_EXTENSION -DTARGET_PLAYDATE -I$PLAYDATE_SDK_PATH/C_API"
|
||||
|
||||
[compilation.windows]
|
||||
LDFLAGS = "-lbcrypt -lwinhttp -static-libgcc -static-libstdc++"
|
||||
LDFLAGS = "-lbcrypt -lwinhttp -static-libgcc -static-libstdc++"
|
||||
|
||||
@@ -180,26 +180,13 @@ if (target == 'playdate') {
|
||||
var objects = []
|
||||
for (var i = 0; i < c_files.length; i++) {
|
||||
var src = c_files[i] // Relative to module_dir because we set it above?
|
||||
// No, c_files list was created with full paths (or relative to cell_dir?)
|
||||
// build.list_files returns relative paths if used with prefix.
|
||||
// We collected them as 'source/file.c'.
|
||||
// But compile_file expects src_path. If we use module_dir, src_path should be relative to it.
|
||||
|
||||
|
||||
// Adjusted:
|
||||
var src_rel = c_files[i]
|
||||
var obj_base = shop.get_global_build_dir() + '/cell' // Build cell into its own area?
|
||||
// Wait, existing logic was:
|
||||
// var build_dir = dynamic_mode ? shop.get_shop_path() + '/build/dynamic' : build.get_build_dir(target)
|
||||
|
||||
// Let's stick to existing obj path logic but ensure src is handled right.
|
||||
// construct object path
|
||||
|
||||
var obj = build_dir + (dynamic_mode ? '/' : '/static/') + src_rel + '.o' // Separate static build
|
||||
|
||||
// The 'src' var in loop was: var src = cell_dir + '/' + c_files[i]
|
||||
// But if we pass module_dir = cell_dir, we should pass src relative to it?
|
||||
// build.cm says: if (src_path.startsWith(module_dir + '/')) src_file = src_path.substring...
|
||||
|
||||
// So we can pass absolute path, it should handle it.
|
||||
var src_abs = cell_dir + '/' + src_rel
|
||||
|
||||
// Check if recompilation needed
|
||||
|
||||
@@ -17,6 +17,4 @@ for (var info of packages) {
|
||||
shop.build_package(pack)
|
||||
}
|
||||
|
||||
shop.build_package()
|
||||
|
||||
$_.stop()
|
||||
$_.stop()
|
||||
|
||||
Reference in New Issue
Block a user