diff --git a/lib/Makefile b/lib/Makefile index 9109ac3b..435c049a 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -19,6 +19,7 @@ PREFIX ?= mipsel-none-elf FORMAT ?= elf32-littlemips endif +#Take this to PSEXETarget.mk?? LDSCRIPT ?= $(PSCX_REDUX_DIR)/ps-exe.ld ifneq ($(strip $(OVERLAYSCRIPT)),) LDSCRIPT := $(addprefix $(OVERLAYSCRIPT) , -T$(LDSCRIPT)) diff --git a/lib/PSEXETarget.mk b/lib/PSEXETarget.mk index 97b49e8e..797fbfa8 100644 --- a/lib/PSEXETarget.mk +++ b/lib/PSEXETarget.mk @@ -1,6 +1,10 @@ +#We use the JabyEngine so we will include ourselves +JABY_ENGINE_LIB_DIR = $(JABY_ENGINE_DIR)/lib/PSX-$(BUILD_PROFILE) +JABY_ENGINE_LIB_NAME = JabyEngine + #Linking rule -$(TARGET).elf: $(OBJS) - $(LD) -o $(TARGET).elf $(LDFLAGS_all) $(LDFLAGS) $(OBJS) $(LIBS) +$(TARGET).elf: $(OBJS) $(JABY_ENGINE_LIB_DIR)/lib$(JABY_ENGINE_LIB_NAME).a + $(LD) -o $(TARGET).elf $(LDFLAGS_all) $(LDFLAGS) $(OBJS) -L$(JABY_ENGINE_LIB_DIR) -l$(JABY_ENGINE_LIB_NAME) $(LIBS) #Strips the psexe $(TARGET).psexe: $(TARGET).elf