Skip to content
Permalink
Browse files

Replace 'make' with $(MAKE)

  • Loading branch information
bear101 committed Feb 12, 2020
1 parent 8daf84f commit 21e2073442e057cafdaa2da3d2f10e20dcfa0e80
Showing with 23 additions and 23 deletions.
  1. +23 −23 Build/Makefile
@@ -23,67 +23,67 @@ genlib:
cd $(BUILDDIR) && cmake $(CMAKE_EXTRA) -DCMAKE_BUILD_TYPE=$(CONFIGTYPE) ../../

buildlib: genlib
make -C $(BUILDDIR) VERBOSE=1 all -j$(JOBS)
$(MAKE) -C $(BUILDDIR) VERBOSE=1 all -j$(JOBS)

android-build:
@echo "Testing if NDK environment variable is set"
test -n "$NDK"
make CONFIGTYPE=$(CONFIGTYPE) \
$(MAKE) CONFIGTYPE=$(CONFIGTYPE) \
CMAKE_EXTRA="-DCMAKE_TOOLCHAIN_FILE=$(TOOLCHAIN_FILE) -DBUILD_TEAMTALK_CORE=ON -DBUILD_TEAMTALK_LIBRARIES=OFF -DBUILD_TEAMTALK_CLIENTS=OFF -DBUILD_TEAMTALKPRO_SERVERS=OFF -DBUILD_TT5SRV=OFF -DBUILD_TT5PROSRV=OFF" buildlib
cd $(TEAMTALK_ROOT)/Library/TeamTalkJNI/jni && $(NDK)/ndk-build

android-armeabi-v7a: teamtalk-env toolchain-env
. $(TOOLCHAIN_ROOT)/toolchain.sh android armeabi-v7a && make TEAMTALK_ROOT=$(TEAMTALK_ROOT) TOOLCHAIN_FILE=$(TOOLCHAIN_ROOT)/toolchain-android-armeabi-v7a.cmake BUILDDIR=build-$@ android-build
. $(TOOLCHAIN_ROOT)/toolchain.sh android armeabi-v7a && $(MAKE) TEAMTALK_ROOT=$(TEAMTALK_ROOT) TOOLCHAIN_FILE=$(TOOLCHAIN_ROOT)/toolchain-android-armeabi-v7a.cmake BUILDDIR=build-$@ android-build

android-arm64-v8a: teamtalk-env toolchain-env
. $(TOOLCHAIN_ROOT)/toolchain.sh android arm64-v8a && make TEAMTALK_ROOT=$(TEAMTALK_ROOT) TOOLCHAIN_FILE=$(TOOLCHAIN_ROOT)/toolchain-android-arm64-v8a.cmake BUILDDIR=build-$@ android-build
. $(TOOLCHAIN_ROOT)/toolchain.sh android arm64-v8a && $(MAKE) TEAMTALK_ROOT=$(TEAMTALK_ROOT) TOOLCHAIN_FILE=$(TOOLCHAIN_ROOT)/toolchain-android-arm64-v8a.cmake BUILDDIR=build-$@ android-build

android-x86: teamtalk-env toolchain-env
. $(TOOLCHAIN_ROOT)/toolchain.sh android x86 && make TEAMTALK_ROOT=$(TEAMTALK_ROOT) TOOLCHAIN_FILE=$(TOOLCHAIN_ROOT)/toolchain-android-x86.cmake BUILDDIR=build-$@ android-build
. $(TOOLCHAIN_ROOT)/toolchain.sh android x86 && $(MAKE) TEAMTALK_ROOT=$(TEAMTALK_ROOT) TOOLCHAIN_FILE=$(TOOLCHAIN_ROOT)/toolchain-android-x86.cmake BUILDDIR=build-$@ android-build

android-x64: teamtalk-env toolchain-env
. $(TOOLCHAIN_ROOT)/toolchain.sh android x86_64 && make TEAMTALK_ROOT=$(TEAMTALK_ROOT) TOOLCHAIN_FILE=$(TOOLCHAIN_ROOT)/toolchain-android-x86_64.cmake BUILDDIR=build-$@ android-build
. $(TOOLCHAIN_ROOT)/toolchain.sh android x86_64 && $(MAKE) TEAMTALK_ROOT=$(TEAMTALK_ROOT) TOOLCHAIN_FILE=$(TOOLCHAIN_ROOT)/toolchain-android-x86_64.cmake BUILDDIR=build-$@ android-build

generic:
make CMAKE_EXTRA="-DBUILD_TEAMTALK_CORE=ON $(CMAKE_EXTRA)" buildlib
$(MAKE) CMAKE_EXTRA="-DBUILD_TEAMTALK_CORE=ON $(CMAKE_EXTRA)" buildlib

deb32:
make BUILDDIR=build-$@ generic
$(MAKE) BUILDDIR=build-$@ generic

deb64:
make BUILDDIR=build-$@ generic
$(MAKE) BUILDDIR=build-$@ generic

ubuntu64:
# Need to specify JAVA_HOME to help CMake find Java SDK
make JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64 BUILDDIR=build-$@ generic
$(MAKE) JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64 BUILDDIR=build-$@ generic

centos7:
make CMAKE_EXTRA="-DBUILD_TEAMTALK5DLL=OFF -DBUILD_TEAMTALK5PRODLL=OFF -DSTATICCPP=OFF -DBUILD_TEAMTALK_LIBRARIES=OFF -DBUILD_TEAMTALKPRO_SERVERS=OFF -DBUILD_TEAMTALK_CLIENTS=OFF -DBUILD_TEAMTALK_CORE=ON" BUILDDIR=build-$@ buildlib
$(MAKE) CMAKE_EXTRA="-DBUILD_TEAMTALK5DLL=OFF -DBUILD_TEAMTALK5PRODLL=OFF -DSTATICCPP=OFF -DBUILD_TEAMTALK_LIBRARIES=OFF -DBUILD_TEAMTALKPRO_SERVERS=OFF -DBUILD_TEAMTALK_CLIENTS=OFF -DBUILD_TEAMTALK_CORE=ON" BUILDDIR=build-$@ buildlib

rasp:
make JAVA_HOME=/usr/lib/jvm/java-8-openjdk-armhf BUILDDIR=build-$@ generic
$(MAKE) JAVA_HOME=/usr/lib/jvm/java-8-openjdk-armhf BUILDDIR=build-$@ generic

mac:
make BUILDDIR=build-$@ generic
$(MAKE) BUILDDIR=build-$@ generic

ios-build:
make CMAKE_EXTRA="$(CMAKE_EXTRA) -DCMAKE_SYSTEM_NAME=iOS -DCMAKE_OSX_DEPLOYMENT_TARGET=7.0 -DBUILD_TEAMTALK_CORE=ON -DOGG=OFF -DFFMPEG=OFF -DOPUSTOOLS=OFF -DBUILD_TEAMTALK_LIBRARIES=OFF -DBUILD_TEAMTALK_CLIENTS=OFF -DBUILD_TEAMTALKPRO_SERVERS=OFF -DBUILD_TT5SRV=OFF -DBUILD_TT5PROSRV=OFF -DZLIB_STATIC=OFF" buildlib
$(MAKE) CMAKE_EXTRA="$(CMAKE_EXTRA) -DCMAKE_SYSTEM_NAME=iOS -DCMAKE_OSX_DEPLOYMENT_TARGET=7.0 -DBUILD_TEAMTALK_CORE=ON -DOGG=OFF -DFFMPEG=OFF -DOPUSTOOLS=OFF -DBUILD_TEAMTALK_LIBRARIES=OFF -DBUILD_TEAMTALK_CLIENTS=OFF -DBUILD_TEAMTALKPRO_SERVERS=OFF -DBUILD_TT5SRV=OFF -DBUILD_TT5PROSRV=OFF -DZLIB_STATIC=OFF" buildlib

ios-armv7: toolchain-env
make CMAKE_EXTRA="-DCMAKE_OSX_ARCHITECTURES=armv7 -DCMAKE_OSX_SYSROOT=iphoneos" BUILDDIR=build-$@ ios-build
. $(TOOLCHAIN_ROOT)/toolchain.sh ios armv7 && make lipo-arch
$(MAKE) CMAKE_EXTRA="-DCMAKE_OSX_ARCHITECTURES=armv7 -DCMAKE_OSX_SYSROOT=iphoneos" BUILDDIR=build-$@ ios-build
. $(TOOLCHAIN_ROOT)/toolchain.sh ios armv7 && $(MAKE) lipo-arch

ios-arm64: toolchain-env
make CMAKE_EXTRA="-DCMAKE_OSX_ARCHITECTURES=arm64 -DCMAKE_OSX_SYSROOT=iphoneos" BUILDDIR=build-$@ ios-build
. $(TOOLCHAIN_ROOT)/toolchain.sh ios arm64 && make lipo-arch
$(MAKE) CMAKE_EXTRA="-DCMAKE_OSX_ARCHITECTURES=arm64 -DCMAKE_OSX_SYSROOT=iphoneos" BUILDDIR=build-$@ ios-build
. $(TOOLCHAIN_ROOT)/toolchain.sh ios arm64 && $(MAKE) lipo-arch

ios-i386: toolchain-env
make CMAKE_EXTRA="-DCMAKE_OSX_ARCHITECTURES=i386 -DCMAKE_OSX_SYSROOT=iphonesimulator" BUILDDIR=build-$@ ios-build
. $(TOOLCHAIN_ROOT)/toolchain.sh ios i386 && make lipo-arch
$(MAKE) CMAKE_EXTRA="-DCMAKE_OSX_ARCHITECTURES=i386 -DCMAKE_OSX_SYSROOT=iphonesimulator" BUILDDIR=build-$@ ios-build
. $(TOOLCHAIN_ROOT)/toolchain.sh ios i386 && $(MAKE) lipo-arch

ios-x64: toolchain-env
make CMAKE_EXTRA="-DCMAKE_OSX_ARCHITECTURES=x86_64 -DCMAKE_OSX_SYSROOT=iphonesimulator" BUILDDIR=build-$@ ios-build
. $(TOOLCHAIN_ROOT)/toolchain.sh ios x86_64 && make lipo-arch
$(MAKE) CMAKE_EXTRA="-DCMAKE_OSX_ARCHITECTURES=x86_64 -DCMAKE_OSX_SYSROOT=iphonesimulator" BUILDDIR=build-$@ ios-build
. $(TOOLCHAIN_ROOT)/toolchain.sh ios x86_64 && $(MAKE) lipo-arch

ios-all: ios-armv7 ios-arm64 ios-i386 ios-x64 lipo

@@ -136,7 +136,7 @@ xcodeswap-toolchain: toolchain-env
sudo xcode-select -s $(TOOLCHAIN_ROOT)/Xcode.app/Contents/Developer

teamtalk-jar:
make BUILDDIR=build-$@ CMAKE_EXTRA="-DBUILD_TEAMTALK_CLIENTS=OFF -DBUILD_TEAMTALKPRO_SERVERS=OFF -DBUILD_TEAMTALK_LIBRARY_JNI=OFF -DBUILD_TEAMTALKPRO_LIBRARY_JNI=OFF -DBUILD_TEAMTALK_LIBRARY_DOTNET=OFF -DBUILD_TEAMTALKPRO_LIBRARY_DOTNET=OFF -DBUILD_TEAMTALK_LIBRARY_DOTNET=OFF -DBUILD_TEAMTALKPRO_LIBRARY_DOTNET=OFF" buildlib
$(MAKE) BUILDDIR=build-$@ CMAKE_EXTRA="-DBUILD_TEAMTALK_CLIENTS=OFF -DBUILD_TEAMTALKPRO_SERVERS=OFF -DBUILD_TEAMTALK_LIBRARY_JNI=OFF -DBUILD_TEAMTALKPRO_LIBRARY_JNI=OFF -DBUILD_TEAMTALK_LIBRARY_DOTNET=OFF -DBUILD_TEAMTALKPRO_LIBRARY_DOTNET=OFF -DBUILD_TEAMTALK_LIBRARY_DOTNET=OFF -DBUILD_TEAMTALKPRO_LIBRARY_DOTNET=OFF" buildlib

ubuntu18-depend:
# TeamTalk 5 dependencies

0 comments on commit 21e2073

Please sign in to comment.
You can’t perform that action at this time.