Got everything working smoothly in WSL
This commit is contained in:
3
.gitmodules
vendored
Normal file
3
.gitmodules
vendored
Normal file
@@ -0,0 +1,3 @@
|
|||||||
|
[submodule "Box"]
|
||||||
|
path = Box
|
||||||
|
url = https://github.com/Ratstail91/Box.git
|
||||||
1
Box
Submodule
1
Box
Submodule
Submodule Box added at 63c7fde56f
1
makefile
1
makefile
@@ -4,6 +4,7 @@ export TOY_OUTDIR = ../../$(OUTDIR)
|
|||||||
|
|
||||||
all: $(OUTDIR) toy box
|
all: $(OUTDIR) toy box
|
||||||
$(MAKE) -j8 -C source
|
$(MAKE) -j8 -C source
|
||||||
|
cp -r assets $(OUTDIR)
|
||||||
|
|
||||||
toy: $(LIBDIR)
|
toy: $(LIBDIR)
|
||||||
$(MAKE) -j8 -C Box/Toy/source
|
$(MAKE) -j8 -C Box/Toy/source
|
||||||
|
|||||||
@@ -1,6 +1,3 @@
|
|||||||
//moved here for android shenanigans
|
|
||||||
#define SDL_MAIN_HANDLED
|
|
||||||
|
|
||||||
#include "box_engine.h"
|
#include "box_engine.h"
|
||||||
#include "toy_drive_system.h"
|
#include "toy_drive_system.h"
|
||||||
|
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
CC=gcc
|
CC=gcc
|
||||||
|
|
||||||
IDIR+=. ../Toy/source ../box
|
IDIR+=. ../Box/Toy/source ../Box/source
|
||||||
CFLAGS+=$(addprefix -I,$(IDIR)) -g -Wall -W -Wno-unused-parameter -Wno-unused-function -Wno-unused-variable
|
CFLAGS+=$(addprefix -I,$(IDIR)) -g -Wall -W -Wno-unused-parameter -Wno-unused-function -Wno-unused-variable
|
||||||
LIBS+=-lSDL2 -ltoy -lbox
|
LIBS+=-lSDL2 -ltoy -lbox -lSDL2_image -lSDL2_ttf -lSDL2main -lSDL2
|
||||||
|
|
||||||
ODIR = obj
|
ODIR = obj
|
||||||
SRC = $(wildcard *.c)
|
SRC = $(wildcard *.c)
|
||||||
@@ -11,7 +11,7 @@ OBJ = $(addprefix $(ODIR)/,$(SRC:.c=.o))
|
|||||||
OUT=../$(OUTDIR)/airport
|
OUT=../$(OUTDIR)/airport
|
||||||
|
|
||||||
all: $(OBJ)
|
all: $(OBJ)
|
||||||
$(CC) $(CFLAGS) -o $(OUT) $(OBJ) -Wl,-rpath,. -L../$(LIBDIR) $(LIBS)
|
$(CC) $(CFLAGS) -o $(OUT) $(OBJ) -Wl,-rpath,. -L../$(OUTDIR) $(LIBS)
|
||||||
|
|
||||||
$(OBJ): | $(ODIR)
|
$(OBJ): | $(ODIR)
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user