diff options
| author | madmaxoft <github@xoft.cz> | 2013-08-13 23:02:22 +0200 |
|---|---|---|
| committer | madmaxoft <github@xoft.cz> | 2013-08-13 23:02:22 +0200 |
| commit | af645c62c921869a1a6569935000ece3cb909e89 (patch) | |
| tree | f9947aae502b86073f55d47547ef0084a0bf2ca2 /GNUmakefile | |
| parent | Clients are now ticked in cServer first, then in cWorld once they get assigned a world. (diff) | |
| parent | Added ConsoleColors test for testing out linux console color codes. (diff) | |
| download | cuberite-af645c62c921869a1a6569935000ece3cb909e89.tar cuberite-af645c62c921869a1a6569935000ece3cb909e89.tar.gz cuberite-af645c62c921869a1a6569935000ece3cb909e89.tar.bz2 cuberite-af645c62c921869a1a6569935000ece3cb909e89.tar.lz cuberite-af645c62c921869a1a6569935000ece3cb909e89.tar.xz cuberite-af645c62c921869a1a6569935000ece3cb909e89.tar.zst cuberite-af645c62c921869a1a6569935000ece3cb909e89.zip | |
Diffstat (limited to 'GNUmakefile')
| -rw-r--r-- | GNUmakefile | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/GNUmakefile b/GNUmakefile index 5c9cf2bc2..277308e08 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -37,8 +37,6 @@ all: MCServer/MCServer # -- according to http://stackoverflow.com/questions/6183899/undefined-reference-to-dlopen, libs must come after all sources # BUILDDIR ... folder where the intermediate object files are built -LNK_LIBS = -lstdc++ -ldl - ifeq ($(release),1) ################ # release build - fastest run-time, no gdb support @@ -83,6 +81,23 @@ endif +################################################### +# Set the link libraries based on the OS +# Linux uses libdl +# FreeBSD uses libltdl +# TODO: other OSs? + +UNAME := $(shell uname -s) +ifeq ($(UNAME),Linux) + LNK_LIBS = -lstdc++ -ldl +else + LNK_LIBS = -lstdc++ -lltdl +endif + + + + + ################ # 32-bit build override in 64-bit build environments # - so that BearBin doesn't need to modify his makefile after each makefile change :) |