From 3a4f0938be7d2f9ed7441a4d68f7bd823b200bb2 Mon Sep 17 00:00:00 2001 From: tic Date: Mon, 26 Feb 2018 14:36:28 +0300 Subject: [PATCH] fixed sdlgpu for linux --- 3rd-party | 2 +- Makefile | 7 +++++-- README.md | 5 ++--- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/3rd-party b/3rd-party index 5548a14..f8e3165 160000 --- a/3rd-party +++ b/3rd-party @@ -1 +1 @@ -Subproject commit 5548a145844dc0cf700efc381156ff574592704e +Subproject commit f8e31654712e43ee34b5a5601ca71245b3ac8fbe diff --git a/Makefile b/Makefile index 15f30a7..2646318 100644 --- a/Makefile +++ b/Makefile @@ -46,7 +46,8 @@ LINUX_INCLUDES= \ LINUX_LIBS= \ $(GTK_LIBS) \ `sdl2-config --static-libs` \ - -L$(3RD_PARTY)/wren-0.1.0/lib + -L$(3RD_PARTY)/wren-0.1.0/lib \ + -L$(3RD_PARTY)/sdl-gpu/build/linux LINUX64_LIBS= \ $(GTK_LIBS) \ @@ -79,7 +80,9 @@ LINUX_LINKER_FLAGS= \ -lm \ -lpthread \ -lrt \ - -lz + -lz \ + -lsdlgpu \ + -lGL MINGW_OUTPUT=$(BIN_NAME).exe diff --git a/README.md b/README.md index b3a7dc4..174bf28 100644 --- a/README.md +++ b/README.md @@ -68,9 +68,8 @@ run the following commands in the Terminal ``` 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 -cd 3rd-party/wren-0.1.0/ -make static -cd ../.. +make static -C 3rd-party/wren-0.1.0/ +make -C 3rd-party/sdl-gpu/build/linux/ make linux ```