jaby
/
jabyengine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Integrate library into project

This commit is contained in:
jaby 2023-11-23 22:07:08 -05:00
parent 9197652d9b
commit 48a656ae2c
5 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
Support/include/FontWriter/FontWriter.hpp → Support/include/FontWriter/font_writer.hpp
View File

3
examples/PoolBox/PoolBox.code-workspace
View File

@ -72,7 +72,8 @@
}, },
"settings": { "settings": {
"C_Cpp.default.includePath": [ "C_Cpp.default.includePath": [
"${env:JABY_ENGINE_PATH}/include" "${env:JABY_ENGINE_PATH}/include",
"${env:JABY_ENGINE_PATH}/Support/include"
], ],
"C_Cpp.default.compilerPath": "", "C_Cpp.default.compilerPath": "",
"C_Cpp.default.cStandard": "c17", "C_Cpp.default.cStandard": "c17",

4
examples/PoolBox/application/Makefile
View File

@ -5,8 +5,10 @@ OVERLAY_CONFIG = Overlays.json
include $(JABY_ENGINE_DIR)/mkfile/Wildcard.mk include $(JABY_ENGINE_DIR)/mkfile/Wildcard.mk
SRCS = $(call rwildcard, src, c cpp) SRCS = $(call rwildcard, src, c cpp)
INCLUDES += -I$(JABY_ENGINE_DIR)/include INCLUDES += -I$(JABY_ENGINE_DIR)/Support/include -I$(JABY_ENGINE_DIR)/include
CCFLAGS += -save-temps=obj CCFLAGS += -save-temps=obj
LIBS += -lFontWriter
include $(JABY_ENGINE_DIR)/mkfile/Makefile include $(JABY_ENGINE_DIR)/mkfile/Makefile
include $(JABY_ENGINE_DIR)/mkfile/PSEXETarget.mk include $(JABY_ENGINE_DIR)/mkfile/PSEXETarget.mk

2
examples/PoolBox/application/src/main.cpp
View File

@ -5,6 +5,7 @@
#include <PSX/GPU/gpu.hpp> #include <PSX/GPU/gpu.hpp>
#include <PSX/GPU/gpu_primitives.hpp> #include <PSX/GPU/gpu_primitives.hpp>
#include <PSX/Timer/frame_timer.hpp> #include <PSX/Timer/frame_timer.hpp>
#include <FontWriter/FontWriter.hpp>
#include <stdio.h> #include <stdio.h>
using namespace JabyEngine; using namespace JabyEngine;
@ -34,6 +35,7 @@ static void render() {
} }
void main() { void main() {
test();
setup(); setup();
Overlay::TimerTest::mesaure_busy_loop(); Overlay::TimerTest::mesaure_busy_loop();

7
mkfile/PSEXETarget.mk
View File

@ -4,14 +4,15 @@ AUTO_OVERLAY_DIR = $(OUTPUT_DIR)/auto_overlay
include $(AUTO_OVERLAY_DIR)/Overlays.mk include $(AUTO_OVERLAY_DIR)/Overlays.mk
#We use the JabyEngine so we will include ourselves #We use the JabyEngine so we will include ourselves
JABY_ENGINE_LIB_DIR = $(JABY_ENGINE_DIR)/lib/PSX-$(BUILD_PROFILE) JABY_ENGINE_LIB_DIR = $(JABY_ENGINE_DIR)/lib/PSX-$(BUILD_PROFILE)
JABY_ENGINE_LIB_NAME = JabyEngine_$(TV_FORMAT) JABY_ENGINE_SUPPORT_LIB_DIR = $(JABY_ENGINE_DIR)/Support/lib/PSX-$(BUILD_PROFILE)
JABY_ENGINE_LIB_NAME = JabyEngine_$(TV_FORMAT)
OVERLAY_TARGET = $(foreach ovl, $(OVERLAYSECTION), $(OUTPUT_DIR)/Overlay$(ovl)) OVERLAY_TARGET = $(foreach ovl, $(OVERLAYSECTION), $(OUTPUT_DIR)/Overlay$(ovl))
#Linking rule #Linking rule
$(TARGET).elf: $(OBJS) $(JABY_ENGINE_LIB_DIR)/lib$(JABY_ENGINE_LIB_NAME).a $(AUTO_OVERLAY_DIR)/Overlays.ld $(TARGET).elf: $(OBJS) $(JABY_ENGINE_LIB_DIR)/lib$(JABY_ENGINE_LIB_NAME).a $(AUTO_OVERLAY_DIR)/Overlays.ld
$(LD) -o $(TARGET).elf $(LDFLAGS_all) $(LDFLAGS) $(OBJS) -L$(JABY_ENGINE_LIB_DIR) -L$(AUTO_OVERLAY_DIR) -l$(JABY_ENGINE_LIB_NAME) $(LIBS) $(LD) -o $(TARGET).elf $(LDFLAGS_all) $(LDFLAGS) $(OBJS) -L$(JABY_ENGINE_LIB_DIR) -L$(JABY_ENGINE_SUPPORT_LIB_DIR) -L$(AUTO_OVERLAY_DIR) -l$(JABY_ENGINE_LIB_NAME) $(LIBS)
#Strips the psexe #Strips the psexe
$(TARGET).psexe: $(TARGET).elf $(TARGET).psexe: $(TARGET).elf