Update DGE function names
parent
d1f04810bd
commit
1b78de537e
14
Makefile
14
Makefile
|
@ -9,16 +9,22 @@ INC=inc
|
||||||
IR=bin
|
IR=bin
|
||||||
|
|
||||||
TARGET=--bc-target=Doominati
|
TARGET=--bc-target=Doominati
|
||||||
LFLAGS=$(TARGET)
|
LFLAGS += $(TARGET)
|
||||||
CFLAGS=$(TARGET) --alloc-Aut=4194304 -c
|
CFLAGS += $(TARGET) --alloc-Aut=4194304 -c
|
||||||
|
|
||||||
MAIN_SOURCES=$(wildcard $(SRC)/*.c)
|
MAIN_SOURCES=$(wildcard $(SRC)/*.c)
|
||||||
MAIN_HEADERS=$(wildcard $(SRC)/*.h)
|
MAIN_HEADERS=$(wildcard $(SRC)/*.h)
|
||||||
MAIN_OUTPUT=$(MAIN_SOURCES:$(SRC)/%.c=$(IR)/%.ir)
|
MAIN_OUTPUT=$(MAIN_SOURCES:$(SRC)/%.c=$(IR)/%.ir)
|
||||||
MAIN_BINARY=$(BIN)/影響の目.bin
|
MAIN_BINARY=$(BIN)/影響の目.bin
|
||||||
|
|
||||||
|
.PHONY: clean
|
||||||
|
|
||||||
all: $(BIN)/stdlib.bin $(MAIN_BINARY)
|
all: $(BIN)/stdlib.bin $(MAIN_BINARY)
|
||||||
|
|
||||||
|
clean:
|
||||||
|
rm -f bin/*.ir
|
||||||
|
rm -f codedefs/*.bin
|
||||||
|
|
||||||
$(BIN)/stdlib.bin: $(IR)/libc.ir $(IR)/libGDCC.ir
|
$(BIN)/stdlib.bin: $(IR)/libc.ir $(IR)/libGDCC.ir
|
||||||
$(LD) $(LFLAGS) -o $@ $^
|
$(LD) $(LFLAGS) -o $@ $^
|
||||||
|
|
||||||
|
@ -29,9 +35,9 @@ $(IR)/%.ir: $(SRC)/%.c $(MAIN_HEADERS)
|
||||||
$(CC) $(CFLAGS) -o $@ $<
|
$(CC) $(CFLAGS) -o $@ $<
|
||||||
|
|
||||||
$(IR)/libc.ir:
|
$(IR)/libc.ir:
|
||||||
$(MAKELIB) $(TARGET) -c -o $@ libc
|
$(MAKELIB) $(TARGET) $(CFLAGS) -o $@ libc
|
||||||
|
|
||||||
$(IR)/libGDCC.ir:
|
$(IR)/libGDCC.ir:
|
||||||
$(MAKELIB) $(TARGET) -c -o $@ libGDCC
|
$(MAKELIB) $(TARGET) $(CFLAGS) -o $@ libGDCC
|
||||||
|
|
||||||
## EOF
|
## EOF
|
||||||
|
|
|
@ -350,7 +350,7 @@ static void G_ObjDef_getEntProp(G_dodst *st, G_entty *type, char const *id)
|
||||||
}
|
}
|
||||||
else if(strcmp(id, "sprite") == 0)
|
else if(strcmp(id, "sprite") == 0)
|
||||||
{
|
{
|
||||||
type->sprite = DGE_GetTexture(
|
type->sprite = DGE_Texture_Get(
|
||||||
M_StrCreate(st->expect(tok_string, "sprite name")->text));
|
M_StrCreate(st->expect(tok_string, "sprite name")->text));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -392,7 +392,7 @@ static M_texid G_ObjDef_getFrameSprite(char const *fmt, char frame, int i)
|
||||||
|
|
||||||
if(!bufV) return 0;
|
if(!bufV) return 0;
|
||||||
|
|
||||||
M_texid id = DGE_GetTexture(DGE_String_Create(bufV, bufC));
|
M_texid id = DGE_Texture_Get(DGE_String_Create(bufV, bufC));
|
||||||
free(bufV);
|
free(bufV);
|
||||||
return id;
|
return id;
|
||||||
}
|
}
|
||||||
|
|
|
@ -57,7 +57,7 @@ void main(void)
|
||||||
u8"オミ:影響の目 1.0\n"
|
u8"オミ:影響の目 1.0\n"
|
||||||
u8"Copyright © 2017 Project Golan, all rights reserved.\n\n");
|
u8"Copyright © 2017 Project Golan, all rights reserved.\n\n");
|
||||||
|
|
||||||
DGE_SetVirtualResolution(640, 480);
|
DGE_Renderer_SetVirtualRes(640, 480);
|
||||||
|
|
||||||
printf("Loading object function table...\n");
|
printf("Loading object function table...\n");
|
||||||
G_ObjDef_Init();
|
G_ObjDef_Init();
|
||||||
|
|
Loading…
Reference in New Issue