diff --git a/misc/buildbot.sh b/misc/buildbot.sh index a956b4740..69f4686fc 100644 --- a/misc/buildbot.sh +++ b/misc/buildbot.sh @@ -62,14 +62,14 @@ build_nix32() { echo "Building linux32.." cp $SOURCE_DIR/misc/CCicon_nix32 $SOURCE_DIR/src/CCicon_nix32.o rm cc-nix32 - gcc *.c $ALL_FLAGS $LINUX_FLAGS CCicon_nix32.o -DCC_COMMIT_SHA=\"$LATEST\" -m32 -o cc-nix32 -lX11 -lXi -lpthread -lGL -lm -lcurl -lopenal -ldl + gcc *.c $ALL_FLAGS $LINUX_FLAGS CCicon_nix32.o -DCC_COMMIT_SHA=\"$LATEST\" -m32 -o cc-nix32 -lX11 -lXi -lpthread -lGL -lm -lcurl -ldl } build_nix64() { echo "Building linux64.." cp $SOURCE_DIR/misc/CCicon_nix64 $SOURCE_DIR/src/CCicon_nix64.o rm cc-nix64 - gcc *.c $ALL_FLAGS $LINUX_FLAGS CCicon_nix64.o -DCC_COMMIT_SHA=\"$LATEST\" -m64 -o cc-nix64 -lX11 -lXi -lpthread -lGL -lm -lcurl -lopenal -ldl + gcc *.c $ALL_FLAGS $LINUX_FLAGS CCicon_nix64.o -DCC_COMMIT_SHA=\"$LATEST\" -m64 -o cc-nix64 -lX11 -lXi -lpthread -lGL -lm -lcurl -ldl } build_osx32() { @@ -101,7 +101,7 @@ build_rpi() { echo "Building rpi.." cp $SOURCE_DIR/misc/CCicon_rpi $SOURCE_DIR/src/CCicon_rpi.o rm cc-rpi - $RPI_CC *.c $ALL_FLAGS $LINUX_FLAGS CCicon_rpi.o -DCC_COMMIT_SHA=\"$LATEST\" -o cc-rpi -DCC_BUILD_RPI -I ~/rpi/include -L ~/rpi/lib -lGLESv2 -lEGL -lX11 -lXi -lcurl -lopenal -lm -lpthread -ldl -lrt -Wl,-rpath-link ~/rpi/lib + $RPI_CC *.c $ALL_FLAGS $LINUX_FLAGS CCicon_rpi.o -DCC_COMMIT_SHA=\"$LATEST\" -o cc-rpi -DCC_BUILD_RPI -I ~/rpi/include -L ~/rpi/lib -lGLESv2 -lEGL -lX11 -lXi -lcurl -lm -lpthread -ldl -lrt -Wl,-rpath-link ~/rpi/lib } # ----------------------------- diff --git a/readme.md b/readme.md index bd186f71b..ef87c3f56 100644 --- a/readme.md +++ b/readme.md @@ -57,7 +57,7 @@ I am assuming you used the installer from http://www.mingw.org/ Install appropriate libs as required. For ubuntu these are: libx11-dev, libxi-dev, libgl1-mesa-dev, libopenal-dev, libcurl4-gnutls-dev or libcurl4-openssl-dev -```gcc *.c -o ClassiCube -lm -lpthread -lX11 -lXi -lGL -lcurl -lopenal -ldl``` +```gcc *.c -o ClassiCube -lm -lpthread -lX11 -lXi -lGL -lcurl -ldl``` ##### Cross compiling for windows: @@ -66,7 +66,7 @@ Install appropriate libs as required. For ubuntu these are: libx11-dev, libxi-de ##### Raspberry pi Although the regular linux compiliation flags will work fine, to take full advantage of the hardware: -```gcc *.c -o ClassiCube -DCC_BUILD_RPI -lm -lpthread -lX11 -lEGL -lGLESv2 -lcurl -lopenal -ldl``` +```gcc *.c -o ClassiCube -DCC_BUILD_RPI -lm -lpthread -lX11 -lEGL -lGLESv2 -lcurl -ldl``` #### macOS (32 bit) @@ -78,25 +78,25 @@ Although the regular linux compiliation flags will work fine, to take full advan #### FreeBSD -```clang *.c -o ClassiCube -I /usr/local/include -L /usr/local/lib -lm -lpthread -lX11 -lXi -lGL -lcurl -lopenal -lexecinfo``` +```clang *.c -o ClassiCube -I /usr/local/include -L /usr/local/lib -lm -lpthread -lX11 -lXi -lGL -lcurl -lexecinfo``` #### OpenBSD Install libexecinfo package if needed. -```gcc *.c -o ClassiCube -I /usr/X11R6/include -I /usr/local/include -L /usr/X11R6/lib -L /usr/local/lib -lX11 -lXi -lGL -lcurl -lopenal -lexecinfo``` +```gcc *.c -o ClassiCube -I /usr/X11R6/include -I /usr/local/include -L /usr/X11R6/lib -L /usr/local/lib -lX11 -lXi -lGL -lcurl -lexecinfo``` #### NetBSD -```gcc *.c -o ClassiCube -I /usr/X11R7/include -I /usr/pkg/include -L /usr/X11R7/lib -L /usr/pkg/lib -lpthread -lX11 -lXi -lGL -lcurl -lopenal -lexecinfo``` +```gcc *.c -o ClassiCube -I /usr/X11R7/include -I /usr/pkg/include -L /usr/X11R7/lib -L /usr/pkg/lib -lpthread -lX11 -lXi -lGL -lcurl -lexecinfo``` #### DragonflyBSD -```gcc *.c -o ClassiCube -I /usr/local/include -L /usr/local/lib -lm -lpthread -lX11 -lXi -lGL -lcurl -lopenal -lexecinfo``` +```gcc *.c -o ClassiCube -I /usr/local/include -L /usr/local/lib -lm -lpthread -lX11 -lXi -lGL -lcurl -lexecinfo``` #### Solaris -```gcc *.c -o ClassiCube -lm -lsocket -lX11 -lXi -lGL -lcurl -lopenal``` +```gcc *.c -o ClassiCube -lm -lsocket -lX11 -lXi -lGL -lcurl``` NOTE: You have to change entry->d_type == DT_DIR to Directory_Exists(&path) (TODO do this automatically) @@ -104,7 +104,7 @@ NOTE: You have to change entry->d_type == DT_DIR to Directory_Exists(&path) (TOD Install libsdl2_devel, openal_devel, and libexecinfo_devel package if needed. -```gcc *.c -o ClassiCube -lm -lcurl -lexecinfo -lopenal -lGL -lnetwork -lSDL2``` +```gcc *.c -o ClassiCube -lm -lcurl -lexecinfo -lGL -lnetwork -lSDL2``` NOTE: You have to change entry->d_type == DT_DIR to Directory_Exists(&path) (TODO do this automatically) diff --git a/src/Makefile b/src/Makefile index b9830df82..f4646dbb1 100644 --- a/src/Makefile +++ b/src/Makefile @@ -30,11 +30,11 @@ LIBS=-mwindows -lws2_32 -lwininet -lwinmm -limagehlp -lcrypt32 -ld3d9 endif ifeq ($(PLAT),linux) -LIBS=-lX11 -lXi -lpthread -lGL -lm -lopenal -ldl -lcurl +LIBS=-lX11 -lXi -lpthread -lGL -lm -ldl -lcurl endif ifeq ($(PLAT),sunos) -LIBS=-lm -lsocket -lX11 -lXi -lGL -lcurl -lopenal +LIBS=-lm -lsocket -lX11 -lXi -lGL -lcurl endif ifeq ($(PLAT),darwin) @@ -46,31 +46,31 @@ ifeq ($(PLAT),freebsd) CC=clang CFLAGS=-g -pipe -rdynamic -I /usr/local/include -fno-math-errno LDFLAGS=-L /usr/local/lib -LIBS=-lcurl -lexecinfo -lopenal -lGL -lX11 -lXi -lm -lpthread +LIBS=-lcurl -lexecinfo -lGL -lX11 -lXi -lm -lpthread endif ifeq ($(PLAT),openbsd) CFLAGS=-g -pipe -rdynamic -I /usr/X11R6/include -I /usr/local/include -fno-math-errno LDFLAGS=-L /usr/X11R6/lib -L /usr/local/lib -LIBS=-lcurl -lexecinfo -lopenal -lGL -lX11 -lXi +LIBS=-lcurl -lexecinfo -lGL -lX11 -lXi endif ifeq ($(PLAT),netbsd) CFLAGS=-g -pipe -rdynamic -I /usr/X11R7/include -I /usr/pkg/include -fno-math-errno LDFLAGS=-L /usr/X11R7/lib -L /usr/pkg/lib -LIBS=-lcurl -lexecinfo -lopenal -lGL -lX11 -lXi +LIBS=-lcurl -lexecinfo -lGL -lX11 -lXi endif ifeq ($(PLAT),dragonfly) CFLAGS=-g -pipe -rdynamic -I /usr/local/include -fno-math-errno LDFLAGS=-L /usr/local/lib -LIBS=-lcurl -lexecinfo -lopenal -lGL -lX11 -lXi -lm -lpthread +LIBS=-lcurl -lexecinfo -lGL -lX11 -lXi -lm -lpthread endif ifeq ($(PLAT),haiku) CFLAGS=-g -pipe -fno-math-errno LDFLAGS=-g -LIBS=-lcurl -lm -lexecinfo -lopenal -lGL -lnetwork -lSDL2 +LIBS=-lcurl -lm -lexecinfo -lGL -lnetwork -lSDL2 endif ifeq ($(OS),Windows_NT)