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

Generated hpp file instead of cpp

This commit is contained in:
Jaby 2022-10-02 11:01:22 +02:00
parent 04358ed368
commit 400236ac2a
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Library/.gitignore vendored
View File

@ -1 +1 @@
src/BootLoader/splash_image_boot.cpp src/BootLoader/splash_image_boot.hpp

5
src/Library/Makefile
View File

@ -3,7 +3,7 @@ JABY_ENGINE_DIR = ../../
ARTIFACT = libJabyEngine ARTIFACT = libJabyEngine
BUILD_DIR = bin BUILD_DIR = bin
SPLASH_IMAGE = src/BootLoader/splash_image_boot.cpp SPLASH_IMAGE = src/BootLoader/splash_image_boot.hpp
CCFLAGS += -Iinclude -I../../include CCFLAGS += -Iinclude -I../../include
CCFLAGS += -save-temps=obj CCFLAGS += -save-temps=obj
@ -11,7 +11,6 @@ CCFLAGS += -save-temps=obj
include ../../lib/Wildcard.mk include ../../lib/Wildcard.mk
SRCS = $(call rwildcard, src, c cpp) SRCS = $(call rwildcard, src, c cpp)
SRCS += src/syscall_printf.asm SRCS += src/syscall_printf.asm
SRCS += $(SPLASH_IMAGE)
include ../../lib/Makefile include ../../lib/Makefile
LIB_DIR = ../../lib/$(CONFIG_NAME) LIB_DIR = ../../lib/$(CONFIG_NAME)
@ -29,7 +28,7 @@ $(SPLASH_IMAGE): ressources/Splash.png
jaby_engine_fconv $< simple-tim full16 | cpp_out --name SplashScreen -o $@ jaby_engine_fconv $< simple-tim full16 | cpp_out --name SplashScreen -o $@
#Rules section for default compilation and linking #Rules section for default compilation and linking
all: $(LIB_DIR)/$(ARTIFACT).a all: $(SPLASH_IMAGE) $(LIB_DIR)/$(ARTIFACT).a
clean: clean:
rm -fr $(SPLASH_IMAGE) rm -fr $(SPLASH_IMAGE)