Having trouble with submodules again
This commit is contained in:
parent
1d17372d8e
commit
2a8cb45651
3
.gitmodules
vendored
3
.gitmodules
vendored
@ -7,3 +7,6 @@
|
|||||||
[submodule "unigi/unigi.platform.sdl1"]
|
[submodule "unigi/unigi.platform.sdl1"]
|
||||||
path = 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
|
||||||
|
[submodule "unigi.platform.sdl2"]
|
||||||
|
path = unigi.platform.sdl2
|
||||||
|
url = https://git.lumen.sh/Fierelier/unigi.platform.sdl2.git
|
||||||
|
4
Makefile
4
Makefile
@ -21,7 +21,7 @@ else
|
|||||||
endif
|
endif
|
||||||
|
|
||||||
HALOOLIB = haloo3d/build/haloo3d_full.a
|
HALOOLIB = haloo3d/build/haloo3d_full.a
|
||||||
UNIGIPLAT = $(BUILDD)/unigi.platform.sdl1.o
|
UNIGIPLAT = $(BUILDD)/unigi.platform.sdl2.o
|
||||||
UNIGILIB = $(BUILDD)/unigi.a
|
UNIGILIB = $(BUILDD)/unigi.a
|
||||||
|
|
||||||
.PHONY: clean
|
.PHONY: clean
|
||||||
@ -33,7 +33,7 @@ libs: $(UNIGILIB) $(HALOOLIB)
|
|||||||
$(HALOOLIB):
|
$(HALOOLIB):
|
||||||
cd haloo3d && $(MAKE) full
|
cd haloo3d && $(MAKE) full
|
||||||
|
|
||||||
$(UNIGIPLAT): unigi.platform.sdl1/main.c
|
$(UNIGIPLAT): unigi.platform.sdl2/main.c
|
||||||
mkdir -p $(BUILDD)
|
mkdir -p $(BUILDD)
|
||||||
$(CC) $(CFLAGS) -I. -c $< -o $@
|
$(CC) $(CFLAGS) -I. -c $< -o $@
|
||||||
|
|
||||||
|
1
unigi
1
unigi
@ -1 +0,0 @@
|
|||||||
Subproject commit cc36d7c9da306334e3b7001ad5d60e6fec48958e
|
|
1
unigi.platform.sdl2
Submodule
1
unigi.platform.sdl2
Submodule
@ -0,0 +1 @@
|
|||||||
|
Subproject commit f5adfe0495095576721ab639fe4044147488c473
|
Loading…
Reference in New Issue
Block a user