last change to support BSD broke cross-comple. fix Makefile so cross-compile work again
This commit is contained in:
parent
6e2c07549d
commit
d80cede9a3
15
Makefile
15
Makefile
|
@ -3,10 +3,17 @@
|
|||
|
||||
include config.mk
|
||||
|
||||
CC ?= $(CROSS)cc
|
||||
AR ?= $(CROSS)ar
|
||||
RANLIB ?= $(CROSS)ranlib
|
||||
STRIP ?= $(CROSS)strip
|
||||
ifeq ($(CROSS),)
|
||||
CC ?= cc
|
||||
AR ?= ar
|
||||
RANLIB ?= ranlib
|
||||
STRIP ?= strip
|
||||
else
|
||||
CC = $(CROSS)gcc
|
||||
AR = $(CROSS)ar
|
||||
RANLIB = $(CROSS)ranlib
|
||||
STRIP = $(CROSS)strip
|
||||
endif
|
||||
|
||||
CFLAGS += -fPIC -O3 -Wall -Iinclude
|
||||
|
||||
|
|
|
@ -23,12 +23,12 @@ case "$1" in
|
|||
"" ) build;;
|
||||
"default" ) build;;
|
||||
"nix32" ) CFLAGS=-m32 LDFLAGS=-m32 build;;
|
||||
"bsd") MAKE=gmake PREFIX=/usr/local build;;
|
||||
"clang" ) CC=clang build;;
|
||||
"bsd" ) MAKE=gmake PREFIX=/usr/local build;;
|
||||
"cross-win32" ) CROSS=i686-w64-mingw32- build;;
|
||||
"cross-win64" ) CROSS=x86_64-w64-mingw32- build;;
|
||||
"cygwin-mingw32" ) CROSS=i686-pc-mingw32- build;;
|
||||
"cygwin-mingw64" ) CROSS=x86_64-w64-mingw32- build;;
|
||||
"gcc") CC=gcc build;;
|
||||
"clang" ) CC=clang build;;
|
||||
"gcc" ) CC=gcc build;;
|
||||
* ) echo "Usage: compile.sh [nix32|bsd|clang|cross-win32|cross-win64|cygwin-mingw32|cygwin-mingw64|gcc]"; exit 1;;
|
||||
esac
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
|
||||
export LD_LIBRARY_PATH=.
|
||||
|
||||
for x in default nix32 clang cross-win32 cross-win64 cygwin-mingw32 cygwin-mingw64; do
|
||||
for x in default nix32 cross-win32 cross-win64 cygwin-mingw32 cygwin-mingw64 bsd clang gcc; do
|
||||
echo -n "Compiling: $x ... "
|
||||
./compile.sh $x &> /dev/null
|
||||
|
||||
|
|
|
@ -4,7 +4,12 @@
|
|||
INCDIR = ../include
|
||||
LIBDIR = ..
|
||||
|
||||
CC ?= $(CROSS)cc
|
||||
ifeq ($(CROSS),)
|
||||
CC ?= cc
|
||||
else
|
||||
CC = $(CROSS)gcc
|
||||
endif
|
||||
|
||||
|
||||
CFLAGS += -fPIC -O3 -Wall -I$(INCDIR) -L$(LIBDIR)
|
||||
|
||||
|
|
Loading…
Reference in New Issue