cleanup
makefile doesn't care about emcc anymore
This commit is contained in:
parent
55fcb453b0
commit
1ec48bb761
23
makefile
23
makefile
@ -106,12 +106,6 @@ endif
|
|||||||
ifeq ($(origin OUTPUT),command line)
|
ifeq ($(origin OUTPUT),command line)
|
||||||
i_OUTPUT := $(OUTPUT)
|
i_OUTPUT := $(OUTPUT)
|
||||||
endif
|
endif
|
||||||
ifeq ($(i_emcc),1)
|
|
||||||
i_OUTPUT_FOLDER := $(i_OUTPUT)
|
|
||||||
i_OUTPUT_BIN := $(i_OUTPUT_FOLDER)/BQN.js
|
|
||||||
else
|
|
||||||
i_OUTPUT_BIN := $(i_OUTPUT)
|
|
||||||
endif
|
|
||||||
ifeq ($(origin CC),command line)
|
ifeq ($(origin CC),command line)
|
||||||
override i_CC := $(CC)
|
override i_CC := $(CC)
|
||||||
custom = 1
|
custom = 1
|
||||||
@ -231,13 +225,13 @@ endif
|
|||||||
|
|
||||||
# simple non-incremental builds
|
# simple non-incremental builds
|
||||||
single-o3:
|
single-o3:
|
||||||
$(i_CC) $(ALL_CC_FLAGS) -DSINGLE_BUILD -O3 -o ${i_OUTPUT_BIN} src/opt/single.c $(ALL_LD_FLAGS)
|
$(i_CC) $(ALL_CC_FLAGS) -DSINGLE_BUILD -O3 -o ${i_OUTPUT} src/opt/single.c $(ALL_LD_FLAGS)
|
||||||
single-o3g:
|
single-o3g:
|
||||||
$(i_CC) $(ALL_CC_FLAGS) -DSINGLE_BUILD -O3 -g -o ${i_OUTPUT_BIN} src/opt/single.c $(ALL_LD_FLAGS)
|
$(i_CC) $(ALL_CC_FLAGS) -DSINGLE_BUILD -O3 -g -o ${i_OUTPUT} src/opt/single.c $(ALL_LD_FLAGS)
|
||||||
single-debug:
|
single-debug:
|
||||||
$(i_CC) $(ALL_CC_FLAGS) -DSINGLE_BUILD -DDEBUG -g -o ${i_OUTPUT_BIN} src/opt/single.c $(ALL_LD_FLAGS)
|
$(i_CC) $(ALL_CC_FLAGS) -DSINGLE_BUILD -DDEBUG -g -o ${i_OUTPUT} src/opt/single.c $(ALL_LD_FLAGS)
|
||||||
single-c:
|
single-c:
|
||||||
$(i_CC) $(ALL_CC_FLAGS) -DSINGLE_BUILD -o ${i_OUTPUT_BIN} src/opt/single.c $(ALL_LD_FLAGS)
|
$(i_CC) $(ALL_CC_FLAGS) -DSINGLE_BUILD -o ${i_OUTPUT} src/opt/single.c $(ALL_LD_FLAGS)
|
||||||
|
|
||||||
# actual build
|
# actual build
|
||||||
run_incremental_0:
|
run_incremental_0:
|
||||||
@ -278,14 +272,11 @@ endif
|
|||||||
endif # run build
|
endif # run build
|
||||||
|
|
||||||
run_incremental_1: ${bd}/BQN
|
run_incremental_1: ${bd}/BQN
|
||||||
ifneq (${bd}/BQN,${i_OUTPUT_BIN})
|
ifneq (${bd}/BQN,${i_OUTPUT})
|
||||||
ifeq ($(i_emcc),1)
|
|
||||||
@cp -f ${bd}/BQN.wasm "${i_OUTPUT_FOLDER}/BQN.wasm"
|
|
||||||
endif
|
|
||||||
ifeq ($(WINDOWS),1)
|
ifeq ($(WINDOWS),1)
|
||||||
@cp -f ${bd}/BQN.exe "${i_OUTPUT_BIN}"
|
@cp -f ${bd}/BQN.exe "${i_OUTPUT}"
|
||||||
else
|
else
|
||||||
@cp -f ${bd}/BQN "${i_OUTPUT_BIN}"
|
@cp -f ${bd}/BQN "${i_OUTPUT}"
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
@echo ${postmsg}
|
@echo ${postmsg}
|
||||||
|
|||||||
10
src/load.c
10
src/load.c
@ -34,7 +34,7 @@ u64 mm_heapAlloc;
|
|||||||
// bytecodeOffset,
|
// bytecodeOffset,
|
||||||
// variableCount, // number of variable slots needed
|
// variableCount, // number of variable slots needed
|
||||||
// ( // optional extra info for namespace stuff
|
// ( // optional extra info for namespace stuff
|
||||||
// [...variableIDs] // a number for each variable slot; indexes into nameList
|
// [...variableIDs], // a number for each variable slot; indexes into nameList
|
||||||
// [...exportMask] // a unique number for each variable
|
// [...exportMask] // a unique number for each variable
|
||||||
// )?
|
// )?
|
||||||
// ]*
|
// ]*
|
||||||
@ -73,14 +73,14 @@ char* pfn_repr(u8 u) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
char* pm1_repr(u8 u) {
|
char* pm1_repr(u8 u) {
|
||||||
switch(u) { default: return"(unknown 1-modifier)";
|
switch(u) { default: return "(unknown 1-modifier)";
|
||||||
#define F(N,X) case pm1_##N: return X;
|
#define F(N,X) case pm1_##N: return X;
|
||||||
FOR_PM1(F,F,F)
|
FOR_PM1(F,F,F)
|
||||||
#undef F
|
#undef F
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
char* pm2_repr(u8 u) {
|
char* pm2_repr(u8 u) {
|
||||||
switch(u) { default: return"(unknown 2-modifier)";
|
switch(u) { default: return "(unknown 2-modifier)";
|
||||||
#define F(N,X) case pm2_##N: return X;
|
#define F(N,X) case pm2_##N: return X;
|
||||||
FOR_PM2(F,F,F)
|
FOR_PM2(F,F,F)
|
||||||
#undef F
|
#undef F
|
||||||
@ -447,13 +447,13 @@ void load_init() { // very last init function
|
|||||||
SGet(rtObjRaw)
|
SGet(rtObjRaw)
|
||||||
|
|
||||||
rt_undo = Get(rtObjRaw, n_undo );
|
rt_undo = Get(rtObjRaw, n_undo );
|
||||||
rt_select = Get(rtObjRaw, n_select );
|
rt_select = Get(rtObjRaw, n_select);
|
||||||
rt_slash = Get(rtObjRaw, n_slash );
|
rt_slash = Get(rtObjRaw, n_slash );
|
||||||
rt_group = Get(rtObjRaw, n_group );
|
rt_group = Get(rtObjRaw, n_group );
|
||||||
rt_under = Get(rtObjRaw, n_under );
|
rt_under = Get(rtObjRaw, n_under );
|
||||||
rt_find = Get(rtObjRaw, n_find );
|
rt_find = Get(rtObjRaw, n_find );
|
||||||
rt_depth = Get(rtObjRaw, n_depth );
|
rt_depth = Get(rtObjRaw, n_depth );
|
||||||
rt_insert = Get(rtObjRaw, n_insert );
|
rt_insert = Get(rtObjRaw, n_insert);
|
||||||
|
|
||||||
for (usz i = 0; i < RT_LEN; i++) {
|
for (usz i = 0; i < RT_LEN; i++) {
|
||||||
#ifdef RT_WRAP
|
#ifdef RT_WRAP
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user