dan/TIC-80-guile
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

linux makefile fix

Browse Source
This commit is contained in:
tic
2018-02-27 10:14:17 +03:00
parent c7666f5ccf
commit c152d072fb
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Makefile
View File

@@ -362,7 +362,16 @@ chip-lto-pro:
$(eval OPT += $(OPT_PRO)) $(eval OPT += $(OPT_PRO))
make chip-lto OPT="$(OPT)" make chip-lto OPT="$(OPT)"
linux: WREN_A=$(3RD_PARTY)/wren-0.1.0/lib/libwren.a
SDLGPU_A=$(3RD_PARTY)/sdl-gpu/build/linux/libsdlgpu.a
$(WREN_A):
make static -C $(3RD_PARTY)/wren-0.1.0/
$(SDLGPU_A):
make -C $(3RD_PARTY)/sdl-gpu/build/linux/
linux: $(WREN_A) $(SDLGPU_A)
$(CC) $(LINUX_INCLUDES) $(SOURCES) $(SYSTEM) $(LPEG_SRC) $(GIF_SRC) $(SOURCES_EXT) $(TIC80_SRC) $(OPT) $(INCLUDES) $(LINUX_LIBS) $(LINUX_LINKER_FLAGS) -o $(BIN_NAME) $(CC) $(LINUX_INCLUDES) $(SOURCES) $(SYSTEM) $(LPEG_SRC) $(GIF_SRC) $(SOURCES_EXT) $(TIC80_SRC) $(OPT) $(INCLUDES) $(LINUX_LIBS) $(LINUX_LINKER_FLAGS) -o $(BIN_NAME)
linux-pro: linux-pro:

2
README.md
View File

@@ -68,8 +68,6 @@ run the following commands in the Terminal
``` ```
sudo apt-get install git build-essential libgtk-3-dev libsdl2-dev lua5.3-dev zlib1g-dev sudo apt-get install git build-essential libgtk-3-dev libsdl2-dev lua5.3-dev zlib1g-dev
git clone --recursive https://github.com/nesbox/TIC-80 git clone --recursive https://github.com/nesbox/TIC-80
make static -C 3rd-party/wren-0.1.0/
make -C 3rd-party/sdl-gpu/build/linux/
make linux make linux
``` ```