haloopdy/3dtoys
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases 2 Wiki Activity

Setting up changes for new unigi

Browse Source
This commit is contained in:
Carlos Sanchez 2024-09-11 01:15:19 -04:00
parent 8bfe2301a7
commit e1847d5d67
12 changed files with 20 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.clangd Normal file
View File

@ -0,0 +1,2 @@
CompileFlags: # Tweak the parse settings
Add: [-Iunigi/]

10
.gitmodules vendored
View File

@ -2,14 +2,8 @@
path = haloo3d path = haloo3d
url = https://github.com/randomouscrap98/haloo3d.git url = https://github.com/randomouscrap98/haloo3d.git
[submodule "unigi/unigi"] [submodule "unigi/unigi"]
path = unigi/unigi path = unigi
url = https://git.lumen.sh/Fierelier/unigi.git url = https://git.lumen.sh/Fierelier/unigi.git
[submodule "unigi/unigi.headers"]
path = unigi/unigi.headers
url = https://git.lumen.sh/Fierelier/unigi.headers.git
[submodule "unigi/unigi.ext"]
path = unigi/unigi.ext
url = https://git.lumen.sh/Fierelier/unigi.ext
[submodule "unigi/unigi.platform.sdl1"] [submodule "unigi/unigi.platform.sdl1"]
path = unigi/unigi.platform.sdl1 path = unigi.platform.sdl1
url = https://git.lumen.sh/Fierelier/unigi.platform.sdl1.git url = https://git.lumen.sh/Fierelier/unigi.platform.sdl1.git

15
Makefile
View File

@ -21,24 +21,33 @@ else
endif endif
HALOOLIB = haloo3d/build/haloo3d_full.a HALOOLIB = haloo3d/build/haloo3d_full.a
UNIGILIBDIR = unigi.platform.sdl1
UNIGILIB = unigi.platform.sdl1.o
.PHONY: clean .PHONY: clean
.PHONY: full .PHONY: full
.PHONY: unigi
full: full:
echo "Please specify a sample to build (ends with .exe)" @echo "Please specify a sample to build (ends with .exe)"
$(HALOOLIB): $(HALOOLIB):
cd haloo3d && $(MAKE) full cd haloo3d && $(MAKE) full
$(UNIGILIB): $(UNIGILIBDIR)/main.c
$(CC) $(CFLAGS) -c $< -o $@
unigi: $(UNIGILIB)
@echo "Built unigi!"
# Rule to build .o files in main folder # Rule to build .o files in main folder
$(BUILDD)/%.o: %.c %.h $(BUILDD)/%.o: %.c %.h
mkdir -p $(BUILDD) mkdir -p $(BUILDD)
$(CC) $(CFLAGS) -c $< -o $@ $(CC) $(CFLAGS) -c $< -o $@
# Rule to build any sample. We ALWAYS need math so... link it # Rule to build any sample. We ALWAYS need math so... link it
%.exe: %.o $(HALOOLIB) %.exe: %.o $(HALOOLIB) $(UNIGILIB)
$(CC) $(CFLAGS) $< $(HALOOLIB) -o $@ -lm -lSDL $(CC) $(CFLAGS) $^ -o $@ -lm -lSDL
# Rule to clean the build files # Rule to clean the build files
clean: clean:

2
haloo3d

@ -1 +1 @@
Subproject commit 9fbc0948f182cd46c4aaff43b632f92f72fb4fb2 Subproject commit a07b4de2e0753440f0fc664f717e9bc5f46193b9

3
maze.c
View File

@ -6,8 +6,7 @@
#include "haloo3d/haloo3dex_obj.h" #include "haloo3d/haloo3dex_obj.h"
#include "haloo3d/haloo3dex_print.h" #include "haloo3d/haloo3dex_print.h"
#include "unigi/unigi.headers/src/main.h" #include "unigi/main.h"
#include "unigi/unigi.platform.sdl1/src/main.c"
#include "ecs2.h" #include "ecs2.h"
#include "keys.h" #include "keys.h"

1
unigi Submodule

@ -0,0 +1 @@
Subproject commit b7bb4c428b1b5776b58b33be89057bf66082dfa2

1
unigi.platform.sdl1 Submodule

@ -0,0 +1 @@
Subproject commit e6443ef40a27de8e305eda755f43299eb1c6b651

10
unigi/pullall.sh
View File

@ -1,10 +0,0 @@
#!/bin/sh
set -e
cd unigi
git pull
cd ../unigi.headers
git pull
cd ../unigi.ext
git pull
cd ../unigi.platform.sdl1
git pull

1
unigi/unigi

@ -1 +0,0 @@
Subproject commit 34aa7f0a1cd24939c2de879b5dcce03daa0c7de2

1
unigi/unigi.ext

@ -1 +0,0 @@
Subproject commit cf21dd85c6d49509c946ab9f462edc2e8a73327c

1
unigi/unigi.headers

@ -1 +0,0 @@
Subproject commit ab07d46aac8d7043399437b83f81ce8ce3bf1233

1
unigi/unigi.platform.sdl1

@ -1 +0,0 @@
Subproject commit e407020c2118d7ad2f4d43eca5214b6360a0b7cc