fixed makefile #577

This commit is contained in:
tic 2018-03-30 09:28:54 +03:00
parent fe117b5157
commit 7606c2dcc4
2 changed files with 3 additions and 3 deletions

View File

@ -379,7 +379,7 @@ $(LUA_A):
make linux -C $(3RD_PARTY)/lua-5.3.1/ make linux -C $(3RD_PARTY)/lua-5.3.1/
$(SDL2_A): $(SDL2_A):
cd $(3RD_PARTY)/SDL2-2.0.7/ && ./configure && make && cd ../.. cd $(3RD_PARTY)/SDL2-2.0.7/ && ./configure --enable-sndio=no && make && cd ../..
linux: $(WREN_A) $(SDLGPU_A) $(LUA_A) $(SDL2_A) linux: $(WREN_A) $(SDLGPU_A) $(LUA_A) $(SDL2_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)

View File

@ -11,8 +11,8 @@ options=("dependencies" "linux" "linux32-lto" "linux64-lto" "emscripten" "wasm"
select opt in "${options[@]}" select opt in "${options[@]}"
do do
case $opt in case $opt in
"dependencies") "install packages")
sudo apt-get install build-essential mercurial make cmake autoconf automake libtool libasound2-dev libpulse-dev libaudio-dev libx11-dev libxext-dev libxrandr-dev libxcursor-dev libxi-dev libxinerama-dev libxxf86vm-dev libxss-dev libgl1-mesa-dev libesd0-dev libdbus-1-dev libudev-dev libgles1-mesa-dev libgles2-mesa-dev libegl1-mesa-dev libibus-1.0-dev fcitx-libs-dev libsamplerate0-dev libgtk-3-dev zlib1g-dev libwayland-dev libxkbcommon-dev wayland-protocols -y sudo apt-get install build-essential mercurial make cmake autoconf automake libtool libasound2-dev libpulse-dev libaudio-dev libx11-dev libxext-dev libxrandr-dev libxcursor-dev libxi-dev libxinerama-dev libxxf86vm-dev libxss-dev libgl1-mesa-dev libesd0-dev libdbus-1-dev libudev-dev libgles1-mesa-dev libgles2-mesa-dev libegl1-mesa-dev libibus-1.0-dev fcitx-libs-dev libsamplerate0-dev libgtk-3-dev zlib1g-dev libwayland-dev libxkbcommon-dev wayland-protocols libsndio-dev -y
;; ;;
"linux") "linux")
make linux make linux