From 8b02b29a84168544e09b0757841c3b78d64dad1a Mon Sep 17 00:00:00 2001 From: "BADIM-PC\\Vadim" Date: Thu, 11 Jan 2018 11:42:31 +0300 Subject: [PATCH] bin2txt/makefile uses old 3rd-party libs paths #504 --- tools/bin2txt/makefile | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/tools/bin2txt/makefile b/tools/bin2txt/makefile index c3b269f..e5b65fc 100644 --- a/tools/bin2txt/makefile +++ b/tools/bin2txt/makefile @@ -1,18 +1,17 @@ OPT=-O3 -Wall -std=c99 SRC=bin2txt.c -INCLUDE=-I../../include/zlib +3RD_PARTY = ../../../3rd-party +INCLUDE=-I$(3RD_PARTY)/zlib-1.2.8 +PRE_BUILT = $(3RD_PARTY)/pre-built LIB=-lz all: windows windows: $(SRC) - gcc $(OPT) $(SRC) $(INCLUDE) -L../../lib/mingw $(LIB) -o bin2txt.exe + gcc $(OPT) $(SRC) $(INCLUDE) -L$(PRE_BUILT)/mingw $(LIB) -o bin2txt.exe -linux32: $(SRC) - gcc $(OPT) $(SRC) $(INCLUDE) -L../../lib/linux32 $(LIB) -o bin2txt - -linux64: $(SRC) - gcc $(OPT) $(SRC) $(INCLUDE) -L../../lib/linux $(LIB) -o bin2txt +linux: $(SRC) + gcc $(OPT) $(SRC) $(INCLUDE) $(LIB) -o bin2txt macosx: $(SRC) - gcc $(OPT) $(SRC) $(INCLUDE) -L../../lib/macos $(LIB) -o bin2txt + gcc $(OPT) $(SRC) $(INCLUDE) $(LIB) -o bin2txt