From 1edbcb32b6aa6a2f0795c66772f9bac207d04179 Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Sun, 15 Mar 2015 23:35:36 +0800 Subject: [PATCH 1/4] Makefile: use scons when compiling on a linux host --- Makefile | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 5376abd1..4df20b72 100644 --- a/Makefile +++ b/Makefile @@ -2,11 +2,20 @@ # # To compile on Linux or Mac OSX, use `scons` (SConstruct). -default: build - -build: build_x64 build_x86 +UNAME := $(shell uname) +ifeq ($(UNAME), Linux) +default: build_linux +clean: +else +default: build_windows clean: clean_x64 clean_x86 +endif + +build_linux: + scons all + +build_windows: build_x64 build_x86 build_x64: msbuild freelan-all.sln /p:Configuration=Release /p:Platform=x64 /t:Build From a9aaaf2b4caf7b8ea5604cf153df04202fd15a8d Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Thu, 19 Mar 2015 11:24:35 +0800 Subject: [PATCH 2/4] rename Makefile to Makefile.windows #56 drop any conditional handling and linux-specific code --- Makefile => Makefile.windows | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) rename Makefile => Makefile.windows (74%) diff --git a/Makefile b/Makefile.windows similarity index 74% rename from Makefile rename to Makefile.windows index 4df20b72..5376abd1 100644 --- a/Makefile +++ b/Makefile.windows @@ -2,20 +2,11 @@ # # To compile on Linux or Mac OSX, use `scons` (SConstruct). -UNAME := $(shell uname) +default: build -ifeq ($(UNAME), Linux) -default: build_linux -clean: -else -default: build_windows -clean: clean_x64 clean_x86 -endif - -build_linux: - scons all +build: build_x64 build_x86 -build_windows: build_x64 build_x86 +clean: clean_x64 clean_x86 build_x64: msbuild freelan-all.sln /p:Configuration=Release /p:Platform=x64 /t:Build From d2c05647ccdbfce08763d26211383a92cafc4c00 Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Thu, 19 Mar 2015 11:41:54 +0800 Subject: [PATCH 3/4] README: introduce build instructions specific to linux --- README.linux | 35 +++++++++++++++++++++++++++++++++++ README.md | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 README.linux diff --git a/README.linux b/README.linux new file mode 100644 index 00000000..33cdbfd5 --- /dev/null +++ b/README.linux @@ -0,0 +1,35 @@ +Building on a Linux host +======================== + +build-time requirements +----------------------- + +Make sure you have the necessary build-time requirements installed + +- scons +- python-argparse or python >= 2.7 +- libssl-dev +- libcurl4-openssl-dev +- libboost-system-dev +- libboost-thread-dev, +- libboost-program-options-dev +- libboost-filesystem-dev, +- libboost-iostreams-dev + +building from source +-------------------- + +check out the git master branch of freelan-all and issue the "scons all" command + +building for Debian, Ubuntu and derivates +----------------------------------------- + +There is work going on to have proper Debian packaging available. Please check back soon. + +To install the compile-time dependencies install "debhelper libssl-dev libcurl4-openssl-dev libboost-system-dev libboost-thread-dev libboost-program-options-dev libboost-filesystem-dev libboost-iostreams-dev scons python-argparse" packages as root. + + +building for other distros +-------------------------- + +Packaging patches and instructions will be gladly accepted diff --git a/README.md b/README.md index 3e3e9040..c939d008 100644 --- a/README.md +++ b/README.md @@ -28,6 +28,8 @@ It contains the following projects: Building -------- +See the README file specific to your host environment for general setup instructions. + ### Third-party The build relies on several third-parties. Generally Linux users won't need these, but other platforms such as MacOS or Windows may need these. From 90bf464f3fd5bcc189fab98a4fe53a53d503fd17 Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Thu, 19 Mar 2015 12:14:22 +0800 Subject: [PATCH 4/4] README.linux: slightly improve the wording --- README.linux | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.linux b/README.linux index 33cdbfd5..9c3a43fa 100644 --- a/README.linux +++ b/README.linux @@ -26,7 +26,7 @@ building for Debian, Ubuntu and derivates There is work going on to have proper Debian packaging available. Please check back soon. -To install the compile-time dependencies install "debhelper libssl-dev libcurl4-openssl-dev libboost-system-dev libboost-thread-dev libboost-program-options-dev libboost-filesystem-dev libboost-iostreams-dev scons python-argparse" packages as root. +Install "debhelper libssl-dev libcurl4-openssl-dev libboost-system-dev libboost-thread-dev libboost-program-options-dev libboost-filesystem-dev libboost-iostreams-dev scons python-argparse" packages as root to satisfy compile-time dependencies. building for other distros