Merge pull request #38 from jbelinda/master

Make it possible to build and use mlx on the FreeBSD OS

Makefile.mk

@@ -13,11 +13,14 @@
 
 INC	=%%%%
 
-
+UNAME = $(shell uname)
 CC	= gcc
+ifeq ($(UNAME),FreeBSD)
+	CC = clang
+endif
 
 NAME		= libmlx.a
-NAME_UNAME	= libmlx_$(shell uname).a
+NAME_UNAME	= libmlx_$(UNAME).a
 
 SRC	= mlx_init.c mlx_new_window.c mlx_pixel_put.c mlx_loop.c \
 	mlx_mouse_hook.c mlx_key_hook.c mlx_expose_hook.c mlx_loop_hook.c \

configure

@@ -1,12 +1,12 @@
-#!/bin/sh
+#!/usr/bin/env sh
 
 set -e
 
-BOLD="\e[1m"
-RESET="\e[0m"
-LIGHT_RED="\e[91m"
-LIGHT_GREEN="\e[92m"
-LIGHT_CYAN="\e[96m"
+BOLD="\033[1m"
+RESET="\033[0m"
+LIGHT_RED="\033[91m"
+LIGHT_GREEN="\033[92m"
+LIGHT_CYAN="\033[96m"
 
 logging(){
 	local type=$1; shift
@@ -75,9 +75,9 @@ EOF
 
 clean(){
 	log_info 'Execute "make clean" from "makefile.gen"'
-	make -f Makefile.gen clean 			
+	${MAKE} -f Makefile.gen clean
 	log_info 'Execute "make clean" from "test/makefile.gen"'
-	make -f Makefile.gen -C test/ --no-print-directory clean
+	${MAKE} -f Makefile.gen -C test/ --no-print-directory clean
 }
 
 parse_args(){
@@ -98,6 +98,11 @@ parse_args(){
 main(){
 	local xlib_inc="$(get_xlib_include_path)"
 
+	case $(uname) in
+		FreeBSD) MAKE=gmake ;;
+		*) MAKE=make ;;
+	esac
+
 	parse_args "$@"
 	if [ -z "$xlib_inc" ]; then
 		log_error "Can't find a suitable X11 include directory."
@@ -113,9 +118,9 @@ main(){
 		cat test/Makefile.mk | grep -v %%%% >> test/Makefile.gen
 
 	log_info 'Execute "make all" from file "makefile.gen"'
-		make -f Makefile.gen all
+		${MAKE} -f Makefile.gen all
 	log_info 'Execute "make all" from file "test/makefile.gen"'
-		(cd test ; make -f Makefile.gen all )
+		(cd test ; ${MAKE} -f Makefile.gen all )
 }
 
 main "$@"

test/Makefile.mk

@@ -3,7 +3,7 @@ INC=%%%%
 
 INCLIB=$(INC)/../lib
 
-CC=gcc
+UNAME := $(shell uname)
 
 CFLAGS= -I$(INC) -O3 -I.. -g
 
@@ -13,11 +13,15 @@ OBJ = $(SRC:%.c=%.o)
 
 LFLAGS = -L.. -lmlx -L$(INCLIB) -lXext -lX11 -lm
 
-UNAME := $(shell uname)
 ifeq ($(UNAME), Darwin)
 	# mac
+	CC = clang
+else ifeq ($(UNAME), FreeBSD)
+	# FreeBSD
+	CC = clang
 else
 	#Linux and others...
+	CC	= gcc
 	LFLAGS += -lbsd
 endif
 

test/run_tests.sh

@@ -1,16 +1,16 @@
-#!/bin/sh
+#!/usr/bin/env sh
 
 # This very basic script simulate user inputs for the CI
 # Feel free to update, improve or remove it if proper 
 # intergration tests and/or unit tests are added.
 
 set -e
 
-BOLD="\e[1m"
-RESET="\e[0m"
-LIGHT_RED="\e[91m"
-LIGHT_GREEN="\e[92m"
-LIGHT_CYAN="\e[96m"
+BOLD="\033[1m"
+RESET="\033[0m"
+LIGHT_RED="\033[91m"
+LIGHT_GREEN="\033[92m"
+LIGHT_CYAN="\033[96m"
 
 logging(){
 	local type=$1; shift
@@ -47,7 +47,7 @@ sigint_handler(){
 
 # look at test/main.c and run ./mlx-test to understand what this function does
 test_default_main(){
-	make -f Makefile.gen all
+	${MAKE} -f Makefile.gen all
 	./mlx-test &
 	PID="$!"
 	log_info "./mlx-test running in background, pid:" $PID
@@ -80,11 +80,15 @@ test_default_main(){
 }
 
 main(){
+	case $(uname) in
+		FreeBSD) MAKE=gmake ;;
+		*) MAKE=make ;;
+	esac
 	cd $(dirname $0)
 	trap at_exit		EXIT
 	trap sigint_handler	INT
 
 	test_default_main
 }
 
-main "$@"
+main "$@"