diff --git a/build/make/Makefile.android-linux b/build/make/Makefile.android-linux new file mode 100644 index 000000000..aad2a8152 --- /dev/null +++ b/build/make/Makefile.android-linux @@ -0,0 +1,158 @@ +# +# ANDROID CLANG MAKEFILE FOR LINUX +# + +# REQUIRED ENVIRONMENT ARGS: +# ANDROID_NDK_HOME Location of Android NDK +# JAVA_HOME Location of Java JDK + +# android ndk, toolchain and api version +TOOLCHAIN = $(ANDROID_NDK_HOME)/toolchains/llvm/prebuilt/linux-x86_64 +API = 21 + +######################################################################################### +# target platforms +# builds for ARM by default +# for x86/x64 use: make [..] ANDROID_TARGET=x86 + +ifeq ($(ANDROID_TARGET),x86) + TARGET_X86 = i686-linux-android + TARGET_X64 = x86_64-linux-android + TARGET_AR_X86 = i686-linux-android + TARGET_AR_X64 = x86_64-linux-android + SYSROOT_X86 = $(ANDROID_NDK_HOME)/platforms/android-$(API)/arch-x86 + SYSROOT_X64 = $(ANDROID_NDK_HOME)/platforms/android-$(API)/arch-x86_64 + ARCHFLAGS_X86 = -msse -msse2 -msse3 + ARCHFLAGS_X64 = -msse -msse2 -msse3 +else + TARGET_X86 = armv7a-linux-androideabi + TARGET_X64 = aarch64-linux-android + TARGET_AR_X86 = arm-linux-androideabi + TARGET_AR_X64 = aarch64-linux-android + SYSROOT_X86 = $(ANDROID_NDK_HOME)/platforms/android-$(API)/arch-arm + SYSROOT_X64 = $(ANDROID_NDK_HOME)/platforms/android-$(API)/arch-arm64 + ARCHFLAGS_X86 = -DANDROID_ARM_NEON=ON -march=armv7-a -mfloat-abi=softfp -mfpu=neon-fp16 + ARCHFLAGS_X64 = -DANDROID_ARM_NEON=ON -march=armv8-a +endif + +######################################################################################### + +# flags shared between all +FLAGS = -O3 \ + -fpic \ + -DANDROID \ + -D__ANDROID_API__=$(API) \ + -D_SILENCE_CXX17_OLD_ALLOCATOR_MEMBERS_DEPRECATION_WARNING \ + -Wno-deprecated-declarations + +# C Compiler +CC_X86 = $(TOOLCHAIN)/bin/$(TARGET_X86)$(API)-clang +CC_X64 = $(TOOLCHAIN)/bin/$(TARGET_X64)$(API)-clang +CFLAGS_X86 = -static -m32 --target=$(TARGET_X86) -isystem $(ANDROID_NDK_HOME)/sysroot/usr/include/$(TARGET_AR_X86) $(ARCHFLAGS_X86) $(FLAGS) +CFLAGS_X64 = -static -m64 --target=$(TARGET_X64) -isystem $(ANDROID_NDK_HOME)/sysroot/usr/include/$(TARGET_AR_X64) $(ARCHFLAGS_X64) $(FLAGS) + +# C++ Compiler +CXX_X86 = $(TOOLCHAIN)/bin/$(TARGET_X86)$(API)-clang++ +CXX_X64 = $(TOOLCHAIN)/bin/$(TARGET_X64)$(API)-clang++ +CXXFLAGS_X86 = -static -m32 -target $(TARGET_X86) -isystem $(ANDROID_NDK_HOME)/sysroot/usr/include/$(TARGET_AR_X86) $(ARCHFLAGS_X86) $(FLAGS) +CXXFLAGS_X64 = -static -m64 -target $(TARGET_X64) -isystem $(ANDROID_NDK_HOME)/sysroot/usr/include/$(TARGET_AR_X64) $(ARCHFLAGS_X64) $(FLAGS) + +# JAVA JDK +JAR = "$(JAVA_HOME)/bin/jar" +JAVAC = "$(JAVA_HOME)/bin/javac" + +# File Operations +define deletefilepattern + find $(1) -type f -name '$(2)' -delete +endef + +# AR +LIB_X86 = $(TOOLCHAIN)/bin/$(TARGET_AR_X86)-ar +LIB_X64 = $(TOOLCHAIN)/bin/$(TARGET_AR_X64)-ar +LIBFLAGS_X86 = rcs +LIBFLAGS_X64 = rcs + +# AR Functions +define createlib32 + $(LIB_X86) $(LIBFLAGS_X86) $(LIBDIR_X86)/$(1).a $(2) +endef +define createlib64 + $(LIB_X64) $(LIBFLAGS_X64) $(LIBDIR_X64)/$(1).a $(2) +endef + +# Linker +LINK_X86 = $(CXX_X86) +LINK_X64 = $(CXX_X64) +LINKFLAGS_X86 = --sysroot=$(SYSROOT_X86) -target $(TARGET_X86) -isystem $(ANDROID_NDK_HOME)/sysroot/usr/include/$(TARGET_AR_X86) $(ARCHFLAGS_X86) $(FLAGS) +LINKFLAGS_X64 = --sysroot=$(SYSROOT_X64) -target $(TARGET_X64) -isystem $(ANDROID_NDK_HOME)/sysroot/usr/include/$(TARGET_AR_X64) $(ARCHFLAGS_X64) $(FLAGS) +LINKFLAGSDYN_X86 = -shared -static-libstdc++ +LINKFLAGSDYN_X64 = -shared -static-libstdc++ + +# Additional Linker Library Path for shared libraries +LINKPATH_X86 = \ + -L./lib/x86 \ + -L$(SYSROOT_X86)/usr/lib/ \ + -L$(TOOLCHAIN)/sysroot/usr/lib/$(TARGET_AR_X86)/$(API) \ + -L$(TOOLCHAIN)/sysroot/usr/lib/$(TARGET_AR_X86) + +LINKPATH_X64 = \ + -L./lib/x64 \ + -L$(SYSROOT_X64)/usr/lib/ \ + -L$(TOOLCHAIN)/sysroot/usr/lib/$(TARGET_AR_X64)/$(API) \ + -L$(TOOLCHAIN)/sysroot/usr/lib/$(TARGET_AR_X64) + +# Shared Libraries for X86 and X64 +LINKLIBS_ALL = -llog + +# Libraries for X86 or X64 +LINKLIBS_X86 = $(LINKLIBS_ALL) +LINKLIBS_X64 = $(LINKLIBS_ALL) + +# Linker Functions for Executable +define createbin32 + $(LINK_X86) $(LINKFLAGS_X86) $(LINKPATH_X86) $(2) $(3) $(LINKLIBS_X86) -o $(BINDIR_X86)/$(1) +endef +define createbin64 + $(LINK_X64) $(LINKFLAGS_X64) $(LINKPATH_X64) $(2) $(3) $(LINKLIBS_X64) -o $(BINDIR_X64)/$(1) +endef + +# Linker Functions for Shared Library +define createshared32 + $(LINK_X86) $(LINKFLAGS_X86) $(LINKFLAGSDYN_X86) $(LINKPATH_X86) $(2) $(3) $(LINKLIBS_X86) -o $(LIBDIR_X86)/$(1).so +endef +define createshared64 + $(LINK_X64) $(LINKFLAGS_X64) $(LINKFLAGSDYN_X64) $(LINKPATH_X64) $(2) $(3) $(LINKLIBS_X64) -o $(LIBDIR_X64)/$(1).so +endef + +# Qt MOC+RCC+UIC +MOC_X86 = ../../deps/prebuilt/linux/x64/qt-moc +MOC_X64 = ../../deps/prebuilt/linux/x64/qt-moc +ifneq (,$(findstring x86,$(MAKECMDGOALS))) + MOC = $(MOC_X86) +endif +ifneq (,$(findstring x64,$(MAKECMDGOALS))) + MOC = $(MOC_X64) +endif + +RCC_X86 = ../../deps/prebuilt/linux/x64/qt-rcc +RCC_X64 = ../../deps/prebuilt/linux/x64/qt-rcc +ifneq (,$(findstring x86,$(MAKECMDGOALS))) + RCC = $(RCC_X86) +endif +ifneq (,$(findstring x64,$(MAKECMDGOALS))) + RCC = $(RCC_X64) +endif + +UIC_X86 = ../../deps/prebuilt/linux/x64/qt-rcc +UIC_X64 = ../../deps/prebuilt/linux/x64/qt-rcc +ifneq (,$(findstring x86,$(MAKECMDGOALS))) + UIC = $(UIC_X86) +endif +ifneq (,$(findstring x64,$(MAKECMDGOALS))) + UIC = $(UIC_X64) +endif + +##################################################################################### + +# Include Common Parts +include Makefile.android-shared diff --git a/build/make/Makefile.android-osx b/build/make/Makefile.android-osx new file mode 100644 index 000000000..726bd9103 --- /dev/null +++ b/build/make/Makefile.android-osx @@ -0,0 +1,158 @@ +# +# ANDROID CLANG MAKEFILE FOR OSX +# + +# REQUIRED ENVIRONMENT ARGS: +# ANDROID_NDK_HOME Location of Android NDK + +# android ndk, toolchain and api version +TOOLCHAIN = $(ANDROID_NDK_HOME)/toolchains/llvm/prebuilt/darwin-x86_64 +API = 21 + +######################################################################################### +# target platforms +# builds for ARM by default +# for x86/x64 use: make [..] ANDROID_TARGET=x86 + +ifeq ($(ANDROID_TARGET),x86) + TARGET_X86 = i686-linux-android + TARGET_X64 = x86_64-linux-android + TARGET_AR_X86 = i686-linux-android + TARGET_AR_X64 = x86_64-linux-android + SYSROOT_X86 = $(ANDROID_NDK_HOME)/platforms/android-$(API)/arch-x86 + SYSROOT_X64 = $(ANDROID_NDK_HOME)/platforms/android-$(API)/arch-x86_64 + ARCHFLAGS_X86 = -msse -msse2 -msse3 + ARCHFLAGS_X64 = -msse -msse2 -msse3 +else + TARGET_X86 = armv7a-linux-androideabi + TARGET_X64 = aarch64-linux-android + TARGET_AR_X86 = arm-linux-androideabi + TARGET_AR_X64 = aarch64-linux-android + SYSROOT_X86 = $(ANDROID_NDK_HOME)/platforms/android-$(API)/arch-arm + SYSROOT_X64 = $(ANDROID_NDK_HOME)/platforms/android-$(API)/arch-arm64 + ARCHFLAGS_X86 = -DANDROID_ARM_NEON=ON -march=armv7-a -mfloat-abi=softfp -mfpu=neon-fp16 + ARCHFLAGS_X64 = -DANDROID_ARM_NEON=ON -march=armv8-a +endif + +######################################################################################### + +# flags shared between all +FLAGS = -O3 \ + -fpic \ + -DANDROID \ + -D__ANDROID_API__=$(API) \ + -D_SILENCE_CXX17_OLD_ALLOCATOR_MEMBERS_DEPRECATION_WARNING \ + -Wno-deprecated-declarations + +# C Compiler +CC_X86 = $(TOOLCHAIN)/bin/$(TARGET_X86)$(API)-clang +CC_X64 = $(TOOLCHAIN)/bin/$(TARGET_X64)$(API)-clang +CFLAGS_X86 = -static -m32 --target=$(TARGET_X86) -isystem $(ANDROID_NDK_HOME)/sysroot/usr/include/$(TARGET_AR_X86) $(ARCHFLAGS_X86) $(FLAGS) +CFLAGS_X64 = -static -m64 --target=$(TARGET_X64) -isystem $(ANDROID_NDK_HOME)/sysroot/usr/include/$(TARGET_AR_X64) $(ARCHFLAGS_X64) $(FLAGS) + +# C++ Compiler +CXX_X86 = $(TOOLCHAIN)/bin/$(TARGET_X86)$(API)-clang++ +CXX_X64 = $(TOOLCHAIN)/bin/$(TARGET_X64)$(API)-clang++ +CXXFLAGS_X86 = -static -m32 -target $(TARGET_X86) -isystem $(ANDROID_NDK_HOME)/sysroot/usr/include/$(TARGET_AR_X86) $(ARCHFLAGS_X86) $(FLAGS) +CXXFLAGS_X64 = -static -m64 -target $(TARGET_X64) -isystem $(ANDROID_NDK_HOME)/sysroot/usr/include/$(TARGET_AR_X64) $(ARCHFLAGS_X64) $(FLAGS) + +# JAVA JDK +JAVA_HOME:=`/usr/libexec/java_home` +JAR = "$(JAVA_HOME)/bin/jar" +JAVAC = "$(JAVA_HOME)/bin/javac" + +# File Operations +define deletefilepattern + find $(1) -type f -name '$(2)' -delete +endef + +# AR +LIB_X86 = $(TOOLCHAIN)/bin/$(TARGET_AR_X86)-ar +LIB_X64 = $(TOOLCHAIN)/bin/$(TARGET_AR_X64)-ar +LIBFLAGS_X86 = rcs +LIBFLAGS_X64 = rcs + +# AR Functions +define createlib32 + $(LIB_X86) $(LIBFLAGS_X86) $(LIBDIR_X86)/$(1).a $(2) +endef +define createlib64 + $(LIB_X64) $(LIBFLAGS_X64) $(LIBDIR_X64)/$(1).a $(2) +endef + +# Linker +LINK_X86 = $(CXX_X86) +LINK_X64 = $(CXX_X64) +LINKFLAGS_X86 = --sysroot=$(SYSROOT_X86) -target $(TARGET_X86) -isystem $(ANDROID_NDK_HOME)/sysroot/usr/include/$(TARGET_AR_X86) $(ARCHFLAGS_X86) $(FLAGS) +LINKFLAGS_X64 = --sysroot=$(SYSROOT_X64) -target $(TARGET_X64) -isystem $(ANDROID_NDK_HOME)/sysroot/usr/include/$(TARGET_AR_X64) $(ARCHFLAGS_X64) $(FLAGS) +LINKFLAGSDYN_X86 = -shared -static-libstdc++ +LINKFLAGSDYN_X64 = -shared -static-libstdc++ + +# Additional Linker Library Path for shared libraries +LINKPATH_X86 = \ + -L./lib/x86 \ + -L$(SYSROOT_X86)/usr/lib/ \ + -L$(TOOLCHAIN)/sysroot/usr/lib/$(TARGET_AR_X86)/$(API) \ + -L$(TOOLCHAIN)/sysroot/usr/lib/$(TARGET_AR_X86) + +LINKPATH_X64 = \ + -L./lib/x64 \ + -L$(SYSROOT_X64)/usr/lib/ \ + -L$(TOOLCHAIN)/sysroot/usr/lib/$(TARGET_AR_X64)/$(API) \ + -L$(TOOLCHAIN)/sysroot/usr/lib/$(TARGET_AR_X64) + +# Shared Libraries for X86 and X64 +LINKLIBS_ALL = -llog + +# Libraries for X86 or X64 +LINKLIBS_X86 = $(LINKLIBS_ALL) +LINKLIBS_X64 = $(LINKLIBS_ALL) + +# Linker Functions for Executable +define createbin32 + $(LINK_X86) $(LINKFLAGS_X86) $(LINKPATH_X86) $(2) $(3) $(LINKLIBS_X86) -o $(BINDIR_X86)/$(1) +endef +define createbin64 + $(LINK_X64) $(LINKFLAGS_X64) $(LINKPATH_X64) $(2) $(3) $(LINKLIBS_X64) -o $(BINDIR_X64)/$(1) +endef + +# Linker Functions for Shared Library +define createshared32 + $(LINK_X86) $(LINKFLAGS_X86) $(LINKFLAGSDYN_X86) $(LINKPATH_X86) $(2) $(3) $(LINKLIBS_X86) -o $(LIBDIR_X86)/$(1).so +endef +define createshared64 + $(LINK_X64) $(LINKFLAGS_X64) $(LINKFLAGSDYN_X64) $(LINKPATH_X64) $(2) $(3) $(LINKLIBS_X64) -o $(LIBDIR_X64)/$(1).so +endef + +# Qt MOC+RCC+UIC +MOC_X86 = ../../deps/prebuilt/osx/x64/qt-moc +MOC_X64 = ../../deps/prebuilt/osx/x64/qt-moc +ifneq (,$(findstring x86,$(MAKECMDGOALS))) + MOC = $(MOC_X86) +endif +ifneq (,$(findstring x64,$(MAKECMDGOALS))) + MOC = $(MOC_X64) +endif + +RCC_X86 = ../../deps/prebuilt/osx/x64/qt-rcc +RCC_X64 = ../../deps/prebuilt/osx/x64/qt-rcc +ifneq (,$(findstring x86,$(MAKECMDGOALS))) + RCC = $(RCC_X86) +endif +ifneq (,$(findstring x64,$(MAKECMDGOALS))) + RCC = $(RCC_X64) +endif + +UIC_X86 = ../../deps/prebuilt/osx/x64/qt-rcc +UIC_X64 = ../../deps/prebuilt/osx/x64/qt-rcc +ifneq (,$(findstring x86,$(MAKECMDGOALS))) + UIC = $(UIC_X86) +endif +ifneq (,$(findstring x64,$(MAKECMDGOALS))) + UIC = $(UIC_X64) +endif + +##################################################################################### + +# Include Common Parts +include Makefile.android-shared diff --git a/build/make/Makefile.android-shared b/build/make/Makefile.android-shared new file mode 100644 index 000000000..a09e7b4a2 --- /dev/null +++ b/build/make/Makefile.android-shared @@ -0,0 +1,159 @@ +# Shared between Win/Linux/Mac + +# Platform Specific additional defines +ENGINE_DEFINES_X86_PLAT = -DNEUROMORE_PLATFORM_ANDROID +ENGINE_DEFINES_X64_PLAT = -DNEUROMORE_PLATFORM_ANDROID +ENGINEJNI_DEFINES_X86_PLAT = -DNEUROMORE_PLATFORM_ANDROID +ENGINEJNI_DEFINES_X64_PLAT = -DNEUROMORE_PLATFORM_ANDROID +QTBASE_DEFINES_X86_PLAT = -DNEUROMORE_PLATFORM_ANDROID -DQT_QPA_DEFAULT_PLATFORM_NAME=\"android\" -DQT_FEATURE_fontconfig=-1 +QTBASE_DEFINES_X64_PLAT = -DNEUROMORE_PLATFORM_ANDROID -DQT_QPA_DEFAULT_PLATFORM_NAME=\"android\" -DQT_FEATURE_fontconfig=-1 +STUDIO_DEFINES_X86_PLAT = -DNEUROMORE_PLATFORM_ANDROID -DQT_QPA_DEFAULT_PLATFORM_NAME=\"android\" -DQT_FEATURE_fontconfig=-1 +STUDIO_DEFINES_X64_PLAT = -DNEUROMORE_PLATFORM_ANDROID -DQT_QPA_DEFAULT_PLATFORM_NAME=\"android\" -DQT_FEATURE_fontconfig=-1 + +# Platform Specific additional includes +ENGINE_INCLUDES_X86_PLAT = +ENGINE_INCLUDES_X64_PLAT = +ENGINEJNI_INCLUDES_X86_PLAT = +ENGINEJNI_INCLUDES_X64_PLAT = +QTBASE_INCLUDES_X86_PLAT = +QTBASE_INCLUDES_X64_PLAT = +STUDIO_INCLUDES_X86_PLAT = +STUDIO_INCLUDES_X64_PLAT = + +##################################################################################### +# Include Common Makefile +include Makefile.common + +##################################################################################### +# Platform Specific additional objects to build +##################################################################################### + +ENGINE_OBJS = $(ENGINE_OBJS_ALL) + +ENGINEJNI_OBJS = $(ENGINEJNI_OBJS_ALL) +ENGINEJNI_JOBJS = $(ENGINEJNI_JOBJS_ALL) +ENGINEJNI_LIBS_X86 = $(LIBDIR_X86)/Engine.a \ + $(DEPSLIBDIR_X86)/edflib.a \ + $(DEPSLIBDIR_X86)/oscpack.a \ + $(DEPSLIBDIR_X86)/kissfft.a \ + $(DEPSLIBDIR_X86)/zlib.a +ENGINEJNI_LIBS_X64 = $(LIBDIR_X64)/Engine.a \ + $(DEPSLIBDIR_X64)/edflib.a \ + $(DEPSLIBDIR_X64)/oscpack.a \ + $(DEPSLIBDIR_X64)/kissfft.a \ + $(DEPSLIBDIR_X64)/zlib.a + +QTBASE_MOCH = $(QTBASE_MOCH_ALL) +QTBASE_MOCC = $(QTBASE_MOCC_ALL) +QTBASE_UICH = $(QTBASE_UICH_ALL) +QTBASE_RCCH = $(QTBASE_RCCH_ALL) +QTBASE_OBJS = $(QTBASE_OBJS_ALL) +QTBASE_OBJS_MOC = $(QTBASE_OBJS_MOC_ALL) +QTBASE_OBJS_RCC = $(QTBASE_OBJS_RCC_ALL) + +STUDIO_MOCH = $(STUDIO_MOCH_ALL) +STUDIO_MOCC = $(STUDIO_MOCC_ALL) +STUDIO_UICH = $(STUDIO_UICH_ALL) +STUDIO_RCCH = $(STUDIO_RCCH_ALL) +STUDIO_OBJS = $(STUDIO_OBJS_ALL) +STUDIO_OBJS_MOC = $(STUDIO_OBJS_MOC_ALL) +STUDIO_OBJS_RCC = $(STUDIO_OBJS_RCC_ALL) +STUDIO_RES = $(STUDIO_RES_ALL) + +STUDIO_LIBS_X86 = $(LIBDIR_X86)/QtBase.a \ + $(LIBDIR_X86)/Engine.a \ + $(DEPSLIBDIR_X86)/singleapplication.a \ + $(DEPSLIBDIR_X86)/qt-bluetooth.a \ + $(DEPSLIBDIR_X86)/qt-concurrent.a \ + $(DEPSLIBDIR_X86)/qt-eventdispatchers.a \ + $(DEPSLIBDIR_X86)/qt-gamepad.a \ + $(DEPSLIBDIR_X86)/qt-multimedia.a \ + $(DEPSLIBDIR_X86)/qt-multimediawidgets.a \ + $(DEPSLIBDIR_X86)/qt-network.a \ + $(DEPSLIBDIR_X86)/qt-opengl.a \ + $(DEPSLIBDIR_X86)/qt-platform-android.a \ + $(DEPSLIBDIR_X86)/qt-fontdatabases.a \ + $(DEPSLIBDIR_X86)/qt-printsupport.a \ + $(DEPSLIBDIR_X86)/qt-serialport.a \ + $(DEPSLIBDIR_X86)/qt-widgets.a \ + $(DEPSLIBDIR_X86)/qt-gui.a \ + $(DEPSLIBDIR_X86)/qt-xml.a \ + $(DEPSLIBDIR_X86)/qt-dbus.a \ + $(DEPSLIBDIR_X86)/qt-core.a \ + $(DEPSLIBDIR_X86)/double-conversion.a \ + $(DEPSLIBDIR_X86)/edflib.a \ + $(DEPSLIBDIR_X86)/fontconfig.a \ + $(DEPSLIBDIR_X86)/freetype.a \ + $(DEPSLIBDIR_X86)/harfbuzz.a \ + $(DEPSLIBDIR_X86)/harfbuzz-ng.a \ + $(DEPSLIBDIR_X86)/kissfft.a \ + $(DEPSLIBDIR_X86)/libssl.a \ + $(DEPSLIBDIR_X86)/libcrypto.a \ + $(DEPSLIBDIR_X86)/opencv-core.a \ + $(DEPSLIBDIR_X86)/opencv-imgcodecs.a \ + $(DEPSLIBDIR_X86)/opencv-imgproc.a \ + $(DEPSLIBDIR_X86)/opencv-videoio.a \ + $(DEPSLIBDIR_X86)/minizip.a \ + $(DEPSLIBDIR_X86)/oscpack.a \ + $(DEPSLIBDIR_X86)/pcre2.a \ + $(DEPSLIBDIR_X86)/tinyaes.a \ + $(DEPSLIBDIR_X86)/tinyobjloader.a \ + $(DEPSLIBDIR_X86)/tinyxml.a \ + $(DEPSLIBDIR_X86)/libjpeg.a \ + $(DEPSLIBDIR_X86)/libpng.a \ + $(DEPSLIBDIR_X86)/zlib.a +STUDIO_LIBS_X64 = $(LIBDIR_X64)/QtBase.a \ + $(LIBDIR_X64)/Engine.a \ + $(DEPSLIBDIR_X64)/singleapplication.a \ + $(DEPSLIBDIR_X64)/qt-bluetooth.a \ + $(DEPSLIBDIR_X64)/qt-concurrent.a \ + $(DEPSLIBDIR_X64)/qt-eventdispatchers.a \ + $(DEPSLIBDIR_X64)/qt-gamepad.a \ + $(DEPSLIBDIR_X64)/qt-multimedia.a \ + $(DEPSLIBDIR_X64)/qt-multimediawidgets.a \ + $(DEPSLIBDIR_X64)/qt-network.a \ + $(DEPSLIBDIR_X64)/qt-opengl.a \ + $(DEPSLIBDIR_X64)/qt-platform-android.a \ + $(DEPSLIBDIR_X64)/qt-fontdatabases.a \ + $(DEPSLIBDIR_X64)/qt-printsupport.a \ + $(DEPSLIBDIR_X64)/qt-serialport.a \ + $(DEPSLIBDIR_X64)/qt-widgets.a \ + $(DEPSLIBDIR_X64)/qt-gui.a \ + $(DEPSLIBDIR_X64)/qt-xml.a \ + $(DEPSLIBDIR_X64)/qt-dbus.a \ + $(DEPSLIBDIR_X64)/qt-core.a \ + $(DEPSLIBDIR_X64)/double-conversion.a \ + $(DEPSLIBDIR_X64)/edflib.a \ + $(DEPSLIBDIR_X64)/fontconfig.a \ + $(DEPSLIBDIR_X64)/freetype.a \ + $(DEPSLIBDIR_X64)/harfbuzz.a \ + $(DEPSLIBDIR_X64)/harfbuzz-ng.a \ + $(DEPSLIBDIR_X64)/kissfft.a \ + $(DEPSLIBDIR_X64)/libssl.a \ + $(DEPSLIBDIR_X64)/libcrypto.a \ + $(DEPSLIBDIR_X64)/opencv-core.a \ + $(DEPSLIBDIR_X64)/opencv-imgcodecs.a \ + $(DEPSLIBDIR_X64)/opencv-imgproc.a \ + $(DEPSLIBDIR_X64)/opencv-videoio.a \ + $(DEPSLIBDIR_X64)/minizip.a \ + $(DEPSLIBDIR_X64)/oscpack.a \ + $(DEPSLIBDIR_X64)/pcre2.a \ + $(DEPSLIBDIR_X64)/tinyaes.a \ + $(DEPSLIBDIR_X64)/tinyobjloader.a \ + $(DEPSLIBDIR_X64)/tinyxml.a \ + $(DEPSLIBDIR_X64)/libjpeg.a \ + $(DEPSLIBDIR_X64)/libpng.a \ + $(DEPSLIBDIR_X64)/zlib.a + +##################################################################################### +# Include Targets + +include Makefile.targets + +all-x86: all-common-x86 \ + EngineJNI-x86 + +all-x64: all-common-x64 \ + EngineJNI-x64 + +all: all-x86 all-x64 diff --git a/build/make/Makefile.android-win b/build/make/Makefile.android-win new file mode 100644 index 000000000..273a882ae --- /dev/null +++ b/build/make/Makefile.android-win @@ -0,0 +1,158 @@ +# +# ANDROID CLANG MAKEFILE FOR WINDOWS +# + +# REQUIRED ENVIRONMENT ARGS: +# ANDROID_NDK_HOME Location of Android NDK +# JAVA_HOME Location of Java JDK + +# android ndk, toolchain and api version +TOOLCHAIN = $(ANDROID_NDK_HOME)/toolchains/llvm/prebuilt/windows-x86_64 +API = 21 + +######################################################################################### +# target platforms +# builds for ARM by default +# for x86/x64 use: make [..] ANDROID_TARGET=x86 + +ifeq ($(ANDROID_TARGET),x86) + TARGET_X86 = i686-linux-android + TARGET_X64 = x86_64-linux-android + TARGET_AR_X86 = i686-linux-android + TARGET_AR_X64 = x86_64-linux-android + SYSROOT_X86 = $(ANDROID_NDK_HOME)/platforms/android-$(API)/arch-x86 + SYSROOT_X64 = $(ANDROID_NDK_HOME)/platforms/android-$(API)/arch-x86_64 + ARCHFLAGS_X86 = -msse -msse2 -msse3 + ARCHFLAGS_X64 = -msse -msse2 -msse3 +else + TARGET_X86 = armv7a-linux-androideabi + TARGET_X64 = aarch64-linux-android + TARGET_AR_X86 = arm-linux-androideabi + TARGET_AR_X64 = aarch64-linux-android + SYSROOT_X86 = $(ANDROID_NDK_HOME)/platforms/android-$(API)/arch-arm + SYSROOT_X64 = $(ANDROID_NDK_HOME)/platforms/android-$(API)/arch-arm64 + ARCHFLAGS_X86 = -DANDROID_ARM_NEON=ON -march=armv7-a -mfloat-abi=softfp -mfpu=neon-fp16 + ARCHFLAGS_X64 = -DANDROID_ARM_NEON=ON -march=armv8-a +endif + +######################################################################################### + +# flags shared between all +FLAGS = -O3 \ + -fpic \ + -DANDROID \ + -D__ANDROID_API__=$(API) \ + -D_SILENCE_CXX17_OLD_ALLOCATOR_MEMBERS_DEPRECATION_WARNING \ + -Wno-deprecated-declarations + +# C Compiler +CC_X86 = $(TOOLCHAIN)/bin/$(TARGET_X86)$(API)-clang.cmd +CC_X64 = $(TOOLCHAIN)/bin/$(TARGET_X64)$(API)-clang.cmd +CFLAGS_X86 = -static -m32 --target=$(TARGET_X86) -isystem $(ANDROID_NDK_HOME)/sysroot/usr/include/$(TARGET_AR_X86) $(ARCHFLAGS_X86) $(FLAGS) +CFLAGS_X64 = -static -m64 --target=$(TARGET_X64) -isystem $(ANDROID_NDK_HOME)/sysroot/usr/include/$(TARGET_AR_X64) $(ARCHFLAGS_X64) $(FLAGS) + +# C++ Compiler +CXX_X86 = $(TOOLCHAIN)/bin/$(TARGET_X86)$(API)-clang++.cmd +CXX_X64 = $(TOOLCHAIN)/bin/$(TARGET_X64)$(API)-clang++.cmd +CXXFLAGS_X86 = -static -m32 -target $(TARGET_X86) -isystem $(ANDROID_NDK_HOME)/sysroot/usr/include/$(TARGET_AR_X86) $(ARCHFLAGS_X86) $(FLAGS) +CXXFLAGS_X64 = -static -m64 -target $(TARGET_X64) -isystem $(ANDROID_NDK_HOME)/sysroot/usr/include/$(TARGET_AR_X64) $(ARCHFLAGS_X64) $(FLAGS) + +# JAVA JDK +JAR = "$(JAVA_HOME)/bin/jar.exe" +JAVAC = "$(JAVA_HOME)/bin/javac.exe" + +# File Operations +define deletefilepattern + del /s /q $(subst /,\,$(1))\$(2) +endef + +# AR +LIB_X86 = $(TOOLCHAIN)/bin/$(TARGET_AR_X86)-ar.exe +LIB_X64 = $(TOOLCHAIN)/bin/$(TARGET_AR_X64)-ar.exe +LIBFLAGS_X86 = rcs +LIBFLAGS_X64 = rcs + +# AR Functions +define createlib32 + $(LIB_X86) $(LIBFLAGS_X86) $(LIBDIR_X86)/$(1).a $(2) +endef +define createlib64 + $(LIB_X64) $(LIBFLAGS_X64) $(LIBDIR_X64)/$(1).a $(2) +endef + +# Linker +LINK_X86 = $(CXX_X86) +LINK_X64 = $(CXX_X64) +LINKFLAGS_X86 = --sysroot=$(SYSROOT_X86) -target $(TARGET_X86) -isystem $(ANDROID_NDK_HOME)/sysroot/usr/include/$(TARGET_AR_X86) $(ARCHFLAGS_X86) $(FLAGS) +LINKFLAGS_X64 = --sysroot=$(SYSROOT_X64) -target $(TARGET_X64) -isystem $(ANDROID_NDK_HOME)/sysroot/usr/include/$(TARGET_AR_X64) $(ARCHFLAGS_X64) $(FLAGS) +LINKFLAGSDYN_X86 = -shared -static-libstdc++ +LINKFLAGSDYN_X64 = -shared -static-libstdc++ + +# Additional Linker Library Path for shared libraries +LINKPATH_X86 = \ + -L./lib/x86 \ + -L$(SYSROOT_X86)/usr/lib/ \ + -L$(TOOLCHAIN)/sysroot/usr/lib/$(TARGET_AR_X86)/$(API) \ + -L$(TOOLCHAIN)/sysroot/usr/lib/$(TARGET_AR_X86) + +LINKPATH_X64 = \ + -L./lib/x64 \ + -L$(SYSROOT_X64)/usr/lib/ \ + -L$(TOOLCHAIN)/sysroot/usr/lib/$(TARGET_AR_X64)/$(API) \ + -L$(TOOLCHAIN)/sysroot/usr/lib/$(TARGET_AR_X64) + +# Shared Libraries for X86 and X64 +LINKLIBS_ALL = -llog + +# Libraries for X86 or X64 +LINKLIBS_X86 = $(LINKLIBS_ALL) +LINKLIBS_X64 = $(LINKLIBS_ALL) + +# Linker Functions for Executable +define createbin32 + $(LINK_X86) $(LINKFLAGS_X86) $(LINKPATH_X86) $(2) $(3) $(LINKLIBS_X86) -o $(BINDIR_X86)/$(1) +endef +define createbin64 + $(LINK_X64) $(LINKFLAGS_X64) $(LINKPATH_X64) $(2) $(3) $(LINKLIBS_X64) -o $(BINDIR_X64)/$(1) +endef + +# Linker Functions for Shared Library +define createshared32 + $(LINK_X86) $(LINKFLAGS_X86) $(LINKFLAGSDYN_X86) $(LINKPATH_X86) $(2) $(3) $(LINKLIBS_X86) -o $(LIBDIR_X86)/$(1).so +endef +define createshared64 + $(LINK_X64) $(LINKFLAGS_X64) $(LINKFLAGSDYN_X64) $(LINKPATH_X64) $(2) $(3) $(LINKLIBS_X64) -o $(LIBDIR_X64)/$(1).so +endef + +# Qt MOC+RCC+UIC +MOC_X86 = ../../deps/prebuilt/win/x86/qt-moc.exe +MOC_X64 = ../../deps/prebuilt/win/x64/qt-moc.exe +ifneq (,$(findstring x86,$(MAKECMDGOALS))) + MOC = $(MOC_X86) +endif +ifneq (,$(findstring x64,$(MAKECMDGOALS))) + MOC = $(MOC_X64) +endif + +RCC_X86 = ../../deps/prebuilt/win/x86/qt-rcc.exe +RCC_X64 = ../../deps/prebuilt/win/x64/qt-rcc.exe +ifneq (,$(findstring x86,$(MAKECMDGOALS))) + RCC = $(RCC_X86) +endif +ifneq (,$(findstring x64,$(MAKECMDGOALS))) + RCC = $(RCC_X64) +endif + +UIC_X86 = ../../deps/prebuilt/win/x86/qt-rcc.exe +UIC_X64 = ../../deps/prebuilt/win/x64/qt-rcc.exe +ifneq (,$(findstring x86,$(MAKECMDGOALS))) + UIC = $(UIC_X86) +endif +ifneq (,$(findstring x64,$(MAKECMDGOALS))) + UIC = $(UIC_X64) +endif + +##################################################################################### + +# Include Common Parts +include Makefile.android-shared diff --git a/build/make/Makefile.common b/build/make/Makefile.common index 4145d796c..1b4c1a9ba 100644 --- a/build/make/Makefile.common +++ b/build/make/Makefile.common @@ -33,8 +33,8 @@ ENGINE_DEFINES_X64 = $(ENGINE_DEFINES) $(ENGINE_DEFINES_X64_PLAT) ENGINE_INCLUDES = -I$(ENGINE_INCDIR) -I$(ENGINE_SRCDIR) -I$(DEPSINCDIR) ENGINE_INCLUDES_X86 = $(ENGINE_INCLUDES) $(ENGINE_INCLUDES_X86_PLAT) ENGINE_INCLUDES_X64 = $(ENGINE_INCLUDES) $(ENGINE_INCLUDES_X64_PLAT) -ENGINE_BUILD_X86 = $(CXX) $(CXXFLAGS_X86) $(ENGINE_DEFINES_X86) $(ENGINE_INCLUDES_X86) -c $(@:$(ENGINE_OBJDIR_X86)%.o=$(ENGINE_SRCDIR)%.cpp) -o $@ -ENGINE_BUILD_X64 = $(CXX) $(CXXFLAGS_X64) $(ENGINE_DEFINES_X64) $(ENGINE_INCLUDES_X64) -c $(@:$(ENGINE_OBJDIR_X64)%.o=$(ENGINE_SRCDIR)%.cpp) -o $@ +ENGINE_BUILD_X86 = $(CXX_X86) $(CXXFLAGS_X86) $(ENGINE_DEFINES_X86) $(ENGINE_INCLUDES_X86) -c $(@:$(ENGINE_OBJDIR_X86)%.o=$(ENGINE_SRCDIR)%.cpp) -o $@ +ENGINE_BUILD_X64 = $(CXX_X64) $(CXXFLAGS_X64) $(ENGINE_DEFINES_X64) $(ENGINE_INCLUDES_X64) -c $(@:$(ENGINE_OBJDIR_X64)%.o=$(ENGINE_SRCDIR)%.cpp) -o $@ ENGINE_OBJS_ALL = Core/AABB.o \ Core/AES.o \ Core/AttributeFactory.o \ @@ -231,6 +231,51 @@ $(ENGINE_OBJDIR_X86)/%.o: $(ENGINE_OBJDIR_X64)/%.o: $(ENGINE_BUILD_X64) +################################################################################################################### +# ENGINEJNI +################################################################################################################### +ENGINEJNI_INCDIR = $(INCDIR)/EngineJNI +ENGINEJNI_SRCDIR = $(SRCDIR)/EngineJNI +ENGINEJNI_OBJDIR_X86 = $(OBJDIR_X86)/EngineJNI +ENGINEJNI_OBJDIR_X64 = $(OBJDIR_X64)/EngineJNI +ENGINEJNI_DEFINES = -DUNICODE \ + -DNDEBUG \ + -Wno-unknown-warning-option +ENGINEJNI_DEFINES_X86 = $(ENGINEJNI_DEFINES) $(ENGINEJNI_DEFINES_X86_PLAT) +ENGINEJNI_DEFINES_X64 = $(ENGINEJNI_DEFINES) $(ENGINEJNI_DEFINES_X64_PLAT) +ENGINEJNI_INCLUDES = -I$(ENGINEJNI_INCDIR) \ + -I$(ENGINEJNI_SRCDIR) \ + -I$(DEPSINCDIR) \ + -I$(SRCDIR)/Engine +ENGINEJNI_INCLUDES_X86 = $(ENGINEJNI_INCLUDES) $(ENGINEJNI_INCLUDES_X86_PLAT) +ENGINEJNI_INCLUDES_X64 = $(ENGINEJNI_INCLUDES) $(ENGINEJNI_INCLUDES_X64_PLAT) +ENGINEJNI_BUILD_X86 = $(CXX_X86) $(CXXFLAGS_X86) $(ENGINEJNI_DEFINES_X86) $(ENGINEJNI_INCLUDES_X86) -c $(@:$(ENGINEJNI_OBJDIR_X86)%.o=$(ENGINEJNI_SRCDIR)%.cpp) -o $@ +ENGINEJNI_BUILD_X64 = $(CXX_X64) $(CXXFLAGS_X64) $(ENGINEJNI_DEFINES_X64) $(ENGINEJNI_INCLUDES_X64) -c $(@:$(ENGINEJNI_OBJDIR_X64)%.o=$(ENGINEJNI_SRCDIR)%.cpp) -o $@ +ENGINEJNI_OBJS_ALL = neuromoreEngineJni.o +ENGINEJNI_JBUILD_X86 = $(JAVAC) -sourcepath $(ENGINEJNI_SRCDIR)/Java -d $(ENGINEJNI_OBJDIR_X86)/Java $(@:$(ENGINEJNI_OBJDIR_X86)%.class=$(ENGINEJNI_SRCDIR)%.java) +ENGINEJNI_JBUILD_X64 = $(JAVAC) -sourcepath $(ENGINEJNI_SRCDIR)/Java -d $(ENGINEJNI_OBJDIR_X64)/Java $(@:$(ENGINEJNI_OBJDIR_X64)%.class=$(ENGINEJNI_SRCDIR)%.java) +ENGINEJNI_JOBJS_ALL = Java/com/neuromore/engine/ICallback.class \ + Java/com/neuromore/engine/Wrapper.class \ + Java/com/neuromore/engine/enums/EAssetType.class \ + Java/com/neuromore/engine/enums/EDevice.class \ + Java/com/neuromore/engine/enums/EGenericDeviceInputs.class \ + Java/com/neuromore/engine/enums/EMuseInputs.class \ + Java/com/neuromore/engine/enums/EPowerLineFrequencyType.class \ + Java/com/neuromore/engine/enums/ESenseSkinResponseInputs.class \ + Java/com/neuromore/engine/enums/EStatus.class + +$(ENGINEJNI_OBJDIR_X86)/%.o: + $(ENGINEJNI_BUILD_X86) + +$(ENGINEJNI_OBJDIR_X64)/%.o: + $(ENGINEJNI_BUILD_X64) + +$(ENGINEJNI_OBJDIR_X86)/%.class: + $(ENGINEJNI_JBUILD_X86) + +$(ENGINEJNI_OBJDIR_X64)/%.class: + $(ENGINEJNI_JBUILD_X64) + ################################################################################################################### # QTBASE ################################################################################################################### @@ -347,9 +392,9 @@ QTBASE_RCCH_ALL = Resources/Assets.cpp \ Resources/GraphResources.cpp \ Resources/LayoutResources.cpp \ Resources/QtBaseResources.cpp -QTBASE_BUILD_X86 = $(CXX) $(CXXFLAGS_X86) $(QTBASE_DEFINES_X86) $(QTBASE_INCLUDES_X86) \ +QTBASE_BUILD_X86 = $(CXX_X86) $(CXXFLAGS_X86) $(QTBASE_DEFINES_X86) $(QTBASE_INCLUDES_X86) \ -c $(@:$(QTBASE_OBJDIR_X86)%.o=$(QTBASE_SRCDIR)%.cpp) -o $@ -QTBASE_BUILD_X64 = $(CXX) $(CXXFLAGS_X64) $(QTBASE_DEFINES_X64) $(QTBASE_INCLUDES_X64) \ +QTBASE_BUILD_X64 = $(CXX_X64) $(CXXFLAGS_X64) $(QTBASE_DEFINES_X64) $(QTBASE_INCLUDES_X64) \ -c $(@:$(QTBASE_OBJDIR_X64)%.o=$(QTBASE_SRCDIR)%.cpp) -o $@ QTBASE_OBJS_ALL = AttributeWidgets/AttributeSetGridWidget.o \ AttributeWidgets/AttributeWidgetCreators.o \ @@ -457,14 +502,14 @@ QTBASE_OBJS_ALL = AttributeWidgets/AttributeSetGridWidget.o \ Slider.o \ Spinbox.o \ SystemInfo.o -QTBASE_BUILD_MOC_X86 = $(CXX) $(CXXFLAGS_X86) $(QTBASE_DEFINES_X86) $(QTBASE_INCLUDES_X86) \ +QTBASE_BUILD_MOC_X86 = $(CXX_X86) $(CXXFLAGS_X86) $(QTBASE_DEFINES_X86) $(QTBASE_INCLUDES_X86) \ -c $(@:$(QTBASE_OBJDIR_X86)/%.omoc=$(QTBASE_MOCDIR_X86)/moc_$(@F:.omoc=.cpp)) -o $@ -QTBASE_BUILD_MOC_X64 = $(CXX) $(CXXFLAGS_X64) $(QTBASE_DEFINES_X64) $(QTBASE_INCLUDES_X64) \ +QTBASE_BUILD_MOC_X64 = $(CXX_X64) $(CXXFLAGS_X64) $(QTBASE_DEFINES_X64) $(QTBASE_INCLUDES_X64) \ -c $(@:$(QTBASE_OBJDIR_X64)/%.omoc=$(QTBASE_MOCDIR_X64)/moc_$(@F:.omoc=.cpp)) -o $@ QTBASE_OBJS_MOC_ALL = $(patsubst %.cpp,%.omoc,$(QTBASE_MOCH_ALL)) -QTBASE_BUILD_RCC_X86 = $(CXX) $(CXXFLAGS_X86) $(QTBASE_DEFINES_X86) $(QTBASE_INCLUDES_X86) \ +QTBASE_BUILD_RCC_X86 = $(CXX_X86) $(CXXFLAGS_X86) $(QTBASE_DEFINES_X86) $(QTBASE_INCLUDES_X86) \ -c $(@:$(QTBASE_OBJDIR_X86)/%.orcc=$(QTBASE_RCCDIR_X86)/qrc_$(@F:.orcc=.cpp)) -o $@ -QTBASE_BUILD_RCC_X64 = $(CXX) $(CXXFLAGS_X64) $(QTBASE_DEFINES_X64) $(QTBASE_INCLUDES_X64) \ +QTBASE_BUILD_RCC_X64 = $(CXX_X64) $(CXXFLAGS_X64) $(QTBASE_DEFINES_X64) $(QTBASE_INCLUDES_X64) \ -c $(@:$(QTBASE_OBJDIR_X64)/%.orcc=$(QTBASE_RCCDIR_X64)/qrc_$(@F:.orcc=.cpp)) -o $@ QTBASE_OBJS_RCC_ALL = Assets.orcc \ DeviceResources.orcc \ @@ -688,9 +733,9 @@ STUDIO_RCC_X64 = $(RCC_X64) --name $(basename $(@F)) \ $(@:$(STUDIO_RCCDIR_X64)/%.cpp=$(STUDIO_SRCDIR)/%.qrc) \ --output $(@:$(STUDIO_RCCDIR_X64)/%.cpp=$(STUDIO_RCCDIR_X64)/qrc_$(@F)) STUDIO_RCCH_ALL = Resources/StudioResources.cpp -STUDIO_BUILD_X86 = $(CXX) $(CXXFLAGS_X86) $(STUDIO_DEFINES_X86) $(STUDIO_INCLUDES_X86) \ +STUDIO_BUILD_X86 = $(CXX_X86) $(CXXFLAGS_X86) $(STUDIO_DEFINES_X86) $(STUDIO_INCLUDES_X86) \ -c $(@:$(STUDIO_OBJDIR_X86)%.o=$(STUDIO_SRCDIR)%.cpp) -o $@ -STUDIO_BUILD_X64 = $(CXX) $(CXXFLAGS_X64) $(STUDIO_DEFINES_X64) $(STUDIO_INCLUDES_X64) \ +STUDIO_BUILD_X64 = $(CXX_X64) $(CXXFLAGS_X64) $(STUDIO_DEFINES_X64) $(STUDIO_INCLUDES_X64) \ -c $(@:$(STUDIO_OBJDIR_X64)%.o=$(STUDIO_SRCDIR)%.cpp) -o $@ STUDIO_OBJS_ALL = Devices/ABM/AbmDriver.o \ Devices/ABM/AbmThreadHandler.o \ @@ -819,14 +864,14 @@ STUDIO_OBJS_ALL = Devices/ABM/AbmDriver.o \ MainWindow.o \ Visualization.o \ VisualizationManager.o -STUDIO_BUILD_MOC_X86 = $(CXX) $(CXXFLAGS_X86) $(STUDIO_DEFINES_X86) $(STUDIO_INCLUDES_X86) \ +STUDIO_BUILD_MOC_X86 = $(CXX_X86) $(CXXFLAGS_X86) $(STUDIO_DEFINES_X86) $(STUDIO_INCLUDES_X86) \ -c $(@:$(STUDIO_OBJDIR_X86)/%.omoc=$(STUDIO_MOCDIR_X86)/moc_$(@F:.omoc=.cpp)) -o $@ -STUDIO_BUILD_MOC_X64 = $(CXX) $(CXXFLAGS_X64) $(STUDIO_DEFINES_X64) $(STUDIO_INCLUDES_X64) \ +STUDIO_BUILD_MOC_X64 = $(CXX_X64) $(CXXFLAGS_X64) $(STUDIO_DEFINES_X64) $(STUDIO_INCLUDES_X64) \ -c $(@:$(STUDIO_OBJDIR_X64)/%.omoc=$(STUDIO_MOCDIR_X64)/moc_$(@F:.omoc=.cpp)) -o $@ STUDIO_OBJS_MOC_ALL = $(patsubst %.cpp,%.omoc,$(STUDIO_MOCH_ALL)) -STUDIO_BUILD_RCC_X86 = $(CXX) $(CXXFLAGS_X86) $(STUDIO_DEFINES_X86) $(STUDIO_INCLUDES_X86) \ +STUDIO_BUILD_RCC_X86 = $(CXX_X86) $(CXXFLAGS_X86) $(STUDIO_DEFINES_X86) $(STUDIO_INCLUDES_X86) \ -c $(@:$(STUDIO_OBJDIR_X86)/%.orcc=$(STUDIO_RCCDIR_X86)/qrc_$(@F:.orcc=.cpp)) -o $@ -STUDIO_BUILD_RCC_X64 = $(CXX) $(CXXFLAGS_X64) $(STUDIO_DEFINES_X64) $(STUDIO_INCLUDES_X64) \ +STUDIO_BUILD_RCC_X64 = $(CXX_X64) $(CXXFLAGS_X64) $(STUDIO_DEFINES_X64) $(STUDIO_INCLUDES_X64) \ -c $(@:$(STUDIO_OBJDIR_X64)/%.orcc=$(STUDIO_RCCDIR_X64)/qrc_$(@F:.orcc=.cpp)) -o $@ STUDIO_OBJS_RCC_ALL = StudioResources.orcc STUDIO_BUILD_MRC_X86 = $(MRC) $(MRCFLAGS_X86) $(STUDIO_DEFINES_X86) $(STUDIO_INCLUDES_X86) \ diff --git a/build/make/Makefile.linux b/build/make/Makefile.linux index 58cdb0ca8..afb480e00 100644 --- a/build/make/Makefile.linux +++ b/build/make/Makefile.linux @@ -7,7 +7,9 @@ TARGET_X86 = i686-linux-gnu TARGET_X64 = x86_64-linux-gnu # flags shared between all -FLAGS = -O2 -D_SILENCE_CXX17_OLD_ALLOCATOR_MEMBERS_DEPRECATION_WARNING \ +FLAGS = -O3 \ + -fpic \ + -D_SILENCE_CXX17_OLD_ALLOCATOR_MEMBERS_DEPRECATION_WARNING \ -Wno-deprecated-declarations # Architecture flags @@ -15,14 +17,20 @@ ARCHFLAGS_X86 = -msse -msse2 ARCHFLAGS_X64 = -msse -msse2 # C Compiler -CC = clang -CFLAGS_X86 = -m32 --target=$(TARGET_X86) $(ARCHFLAGS_X86) $(FLAGS) -CFLAGS_X64 = -m64 --target=$(TARGET_X64) $(ARCHFLAGS_X64) $(FLAGS) +CC_X86 = clang +CC_X64 = clang +CFLAGS_X86 = -static -m32 --target=$(TARGET_X86) $(ARCHFLAGS_X86) $(FLAGS) +CFLAGS_X64 = -static -m64 --target=$(TARGET_X64) $(ARCHFLAGS_X64) $(FLAGS) # C++ Compiler -CXX = clang++ -CXXFLAGS_X86 = -m32 -target $(TARGET_X86) $(ARCHFLAGS_X86) -Xclang -flto-visibility-public-std -std=c++17 $(FLAGS) -CXXFLAGS_X64 = -m64 -target $(TARGET_X64) $(ARCHFLAGS_X64) -Xclang -flto-visibility-public-std -std=c++17 $(FLAGS) +CXX_X86 = clang++ +CXX_X64 = clang++ +CXXFLAGS_X86 = -static -m32 -target $(TARGET_X86) $(ARCHFLAGS_X86) -Xclang -flto-visibility-public-std -std=c++17 $(FLAGS) +CXXFLAGS_X64 = -static -m64 -target $(TARGET_X64) $(ARCHFLAGS_X64) -Xclang -flto-visibility-public-std -std=c++17 $(FLAGS) + +# JAVA JDK +JAR = "$(JAVA_HOME)/bin/jar" +JAVAC = "$(JAVA_HOME)/bin/javac" # File Operations define deletefilepattern @@ -30,20 +38,24 @@ define deletefilepattern endef # Platform Specific additional defines -ENGINE_DEFINES_X86_PLAT = -DNEUROMORE_PLATFORM_LINUX -ENGINE_DEFINES_X64_PLAT = -DNEUROMORE_PLATFORM_LINUX -QTBASE_DEFINES_X86_PLAT = -DNEUROMORE_PLATFORM_LINUX -DQT_QPA_DEFAULT_PLATFORM_NAME=\"xcb\" -DQT_FEATURE_fontconfig=1 -QTBASE_DEFINES_X64_PLAT = -DNEUROMORE_PLATFORM_LINUX -DQT_QPA_DEFAULT_PLATFORM_NAME=\"xcb\" -DQT_FEATURE_fontconfig=1 -STUDIO_DEFINES_X86_PLAT = -DNEUROMORE_PLATFORM_LINUX -DQT_QPA_DEFAULT_PLATFORM_NAME=\"xcb\" -DQT_FEATURE_fontconfig=1 -STUDIO_DEFINES_X64_PLAT = -DNEUROMORE_PLATFORM_LINUX -DQT_QPA_DEFAULT_PLATFORM_NAME=\"xcb\" -DQT_FEATURE_fontconfig=1 +ENGINE_DEFINES_X86_PLAT = -DNEUROMORE_PLATFORM_LINUX +ENGINE_DEFINES_X64_PLAT = -DNEUROMORE_PLATFORM_LINUX +ENGINEJNI_DEFINES_X86_PLAT = -DNEUROMORE_PLATFORM_LINUX +ENGINEJNI_DEFINES_X64_PLAT = -DNEUROMORE_PLATFORM_LINUX +QTBASE_DEFINES_X86_PLAT = -DNEUROMORE_PLATFORM_LINUX -DQT_QPA_DEFAULT_PLATFORM_NAME=\"xcb\" -DQT_FEATURE_fontconfig=1 +QTBASE_DEFINES_X64_PLAT = -DNEUROMORE_PLATFORM_LINUX -DQT_QPA_DEFAULT_PLATFORM_NAME=\"xcb\" -DQT_FEATURE_fontconfig=1 +STUDIO_DEFINES_X86_PLAT = -DNEUROMORE_PLATFORM_LINUX -DQT_QPA_DEFAULT_PLATFORM_NAME=\"xcb\" -DQT_FEATURE_fontconfig=1 +STUDIO_DEFINES_X64_PLAT = -DNEUROMORE_PLATFORM_LINUX -DQT_QPA_DEFAULT_PLATFORM_NAME=\"xcb\" -DQT_FEATURE_fontconfig=1 # Platform Specific additional includes -ENGINE_INCLUDES_X86_PLAT = -ENGINE_INCLUDES_X64_PLAT = -QTBASE_INCLUDES_X86_PLAT = -QTBASE_INCLUDES_X64_PLAT = -STUDIO_INCLUDES_X86_PLAT = -STUDIO_INCLUDES_X64_PLAT = +ENGINE_INCLUDES_X86_PLAT = +ENGINE_INCLUDES_X64_PLAT = +ENGINEJNI_INCLUDES_X86_PLAT = -I"$(JAVA_HOME)/include" -I"$(JAVA_HOME)/include/linux" +ENGINEJNI_INCLUDES_X64_PLAT = -I"$(JAVA_HOME)/include" -I"$(JAVA_HOME)/include/linux" +QTBASE_INCLUDES_X86_PLAT = +QTBASE_INCLUDES_X64_PLAT = +STUDIO_INCLUDES_X86_PLAT = +STUDIO_INCLUDES_X64_PLAT = ##################################################################################### # Qt MOC+RCC+UIC @@ -80,61 +92,53 @@ endif include Makefile.common # LIB Tool -LIB = ar +LIB_X86 = ar +LIB_X64 = ar LIBFLAGS_X86 = rc LIBFLAGS_X64 = rc # LIB Functions define createlib32 - $(LIB) $(LIBFLAGS_X86) $(LIBDIR_X86)/$(1).a $(2) + $(LIB_X86) $(LIBFLAGS_X86) $(LIBDIR_X86)/$(1).a $(2) endef define createlib64 - $(LIB) $(LIBFLAGS_X64) $(LIBDIR_X64)/$(1).a $(2) + $(LIB_X64) $(LIBFLAGS_X64) $(LIBDIR_X64)/$(1).a $(2) endef ##################################################################################### # Linker -LINK = $(CXX) -LINKFLAGS_X86 = $(CXXFLAGS_X86) -LINKFLAGS_X64 = $(CXXFLAGS_X64) +LINK_X86 = $(CXX_X86) +LINK_X64 = $(CXX_X64) +LINKFLAGS_X86 = -target $(TARGET_X86) $(FLAGS) +LINKFLAGS_X64 = -target $(TARGET_X64) $(FLAGS) +LINKFLAGSDYN_X86 = -fpic -shared -static-libstdc++ +LINKFLAGSDYN_X64 = -fpic -shared -static-libstdc++ # Additional Linker Library Path for shared libraries LINKPATH_X86 = -L./lib/x86 LINKPATH_X64 = -L./lib/x64 -# Shared Libraries for X86 and X64 -LINKLIBS_ALL = -lpthread \ - -ldl \ - -lGL \ - -lexpat \ - -lX11 \ - -lX11-xcb \ - -lxkbcommon \ - -lxcb \ - -lxcb-glx \ - -lxcb-icccm \ - -lxcb-image \ - -lxcb-keysyms \ - -lxcb-randr \ - -lxcb-render \ - -lxcb-render-util \ - -lxcb-shape \ - -lxcb-shm \ - -lxcb-sync \ - -lxcb-xfixes \ - -lxcb-xinerama \ - -lxcb-xkb +# Shared Libraries for X86 and X64 (for ALL projects +LINKLIBS_ALL = # Libraries for X86 or X64 LINKLIBS_X86 = $(LINKLIBS_ALL) LINKLIBS_X64 = $(LINKLIBS_ALL) -# Linker Functions +# Linker Functions for Executable define createbin32 - $(LINK) $(LINKFLAGS_X86) $(LINKPATH_X86) $(2) $(3) $(LINKLIBS_X86) -o $(BINDIR_X86)/$(1) + $(LINK_X86) $(LINKFLAGS_X86) $(LINKPATH_X86) $(2) $(3) $(LINKLIBS_X86) -o $(BINDIR_X86)/$(1) endef define createbin64 - $(LINK) $(LINKFLAGS_X64) $(LINKPATH_X64) $(2) $(3) $(LINKLIBS_X64) -o $(BINDIR_X64)/$(1) + $(LINK_X64) $(LINKFLAGS_X64) $(LINKPATH_X64) $(2) $(3) $(LINKLIBS_X64) -o $(BINDIR_X64)/$(1) +endef + +# Linker Functions for Shared Library +define createshared32 + $(LINK_X86) $(LINKFLAGS_X86) $(LINKFLAGSDYN_X86) $(LINKPATH_X86) $(2) $(3) $(LINKLIBS_X86) -o $(LIBDIR_X86)/$(1).so +endef +define createshared64 + $(LINK_X64) $(LINKFLAGS_X64) $(LINKFLAGSDYN_X64) $(LINKPATH_X64) $(2) $(3) $(LINKLIBS_X64) -o $(LIBDIR_X64)/$(1).so endef ##################################################################################### @@ -143,6 +147,19 @@ endef ENGINE_OBJS = $(ENGINE_OBJS_ALL) +ENGINEJNI_OBJS = $(ENGINEJNI_OBJS_ALL) +ENGINEJNI_JOBJS = $(ENGINEJNI_JOBJS_ALL) +ENGINEJNI_LIBS_X86 = $(LIBDIR_X86)/Engine.a \ + $(DEPSLIBDIR_X86)/edflib.a \ + $(DEPSLIBDIR_X86)/oscpack.a \ + $(DEPSLIBDIR_X86)/kissfft.a \ + $(DEPSLIBDIR_X86)/zlib.a +ENGINEJNI_LIBS_X64 = $(LIBDIR_X64)/Engine.a \ + $(DEPSLIBDIR_X64)/edflib.a \ + $(DEPSLIBDIR_X64)/oscpack.a \ + $(DEPSLIBDIR_X64)/kissfft.a \ + $(DEPSLIBDIR_X64)/zlib.a + QTBASE_MOCH = $(QTBASE_MOCH_ALL) QTBASE_MOCC = $(QTBASE_MOCC_ALL) QTBASE_UICH = $(QTBASE_UICH_ALL) @@ -159,7 +176,27 @@ STUDIO_OBJS = $(STUDIO_OBJS_ALL) STUDIO_OBJS_MOC = $(STUDIO_OBJS_MOC_ALL) STUDIO_OBJS_RCC = $(STUDIO_OBJS_RCC_ALL) STUDIO_RES = $(STUDIO_RES_ALL) - +STUDIO_LIBS_ALL = -lpthread \ + -ldl \ + -lGL \ + -lexpat \ + -lX11 \ + -lX11-xcb \ + -lxkbcommon \ + -lxcb \ + -lxcb-glx \ + -lxcb-icccm \ + -lxcb-image \ + -lxcb-keysyms \ + -lxcb-randr \ + -lxcb-render \ + -lxcb-render-util \ + -lxcb-shape \ + -lxcb-shm \ + -lxcb-sync \ + -lxcb-xfixes \ + -lxcb-xinerama \ + -lxcb-xkb STUDIO_LIBS_X86 = $(LIBDIR_X86)/QtBase.a \ $(LIBDIR_X86)/Engine.a \ $(DEPSLIBDIR_X86)/singleapplication.a \ @@ -201,7 +238,8 @@ STUDIO_LIBS_X86 = $(LIBDIR_X86)/QtBase.a \ $(DEPSLIBDIR_X86)/tinyxml.a \ $(DEPSLIBDIR_X86)/libjpeg.a \ $(DEPSLIBDIR_X86)/libpng.a \ - $(DEPSLIBDIR_X86)/zlib.a + $(DEPSLIBDIR_X86)/zlib.a \ + $(STUDIO_LIBS_ALL) STUDIO_LIBS_X64 = $(LIBDIR_X64)/QtBase.a \ $(LIBDIR_X64)/Engine.a \ $(DEPSLIBDIR_X64)/singleapplication.a \ @@ -243,9 +281,18 @@ STUDIO_LIBS_X64 = $(LIBDIR_X64)/QtBase.a \ $(DEPSLIBDIR_X64)/tinyxml.a \ $(DEPSLIBDIR_X64)/libjpeg.a \ $(DEPSLIBDIR_X64)/libpng.a \ - $(DEPSLIBDIR_X64)/zlib.a + $(DEPSLIBDIR_X64)/zlib.a \ + $(STUDIO_LIBS_ALL) ##################################################################################### # Include Targets include Makefile.targets + +all-x86: all-common-x86 \ + Studio-x86 + +all-x64: all-common-x64 \ + Studio-x64 + +all: all-x86 all-x64 diff --git a/build/make/Makefile.osx b/build/make/Makefile.osx index 3a6b3a7ab..0695191be 100644 --- a/build/make/Makefile.osx +++ b/build/make/Makefile.osx @@ -8,45 +8,57 @@ TARGET_X64 = x86_64-apple-darwin19.2.0 OSX_MINVER = 10.12 # flags shared between all -FLAGS = -O2 \ +FLAGS = -O3 \ + -fpic \ -mmacosx-version-min=$(OSX_MINVER) \ -D_SILENCE_CXX17_OLD_ALLOCATOR_MEMBERS_DEPRECATION_WARNING \ -Wno-deprecated-declarations # Architecture flags -ARCHFLAGS_X86 = -msse -msse2 -ARCHFLAGS_X64 = -msse -msse2 +ARCHFLAGS_X86 = -mtune=intel -msse -msse2 -msse3 -mssse3 +ARCHFLAGS_X64 = -mtune=intel -msse -msse2 -msse3 -mssse3 # C Compiler -CC = clang +CC_X86 = clang +CC_X64 = clang CFLAGS_X86 = -m32 --target=$(TARGET_X86) $(ARCHFLAGS_X86) $(FLAGS) CFLAGS_X64 = -m64 --target=$(TARGET_X64) $(ARCHFLAGS_X64) $(FLAGS) # C++ Compiler -CXX = clang++ +CXX_X86 = clang++ +CXX_X64 = clang++ CXXFLAGS_X86 = -m32 -target $(TARGET_X86) $(ARCHFLAGS_X86) -Xclang -flto-visibility-public-std -std=c++17 $(FLAGS) CXXFLAGS_X64 = -m64 -target $(TARGET_X64) $(ARCHFLAGS_X64) -Xclang -flto-visibility-public-std -std=c++17 $(FLAGS) +# JAVA JDK +JAVA_HOME:=`/usr/libexec/java_home` +JAR = "$(JAVA_HOME)/bin/jar" +JAVAC = "$(JAVA_HOME)/bin/javac" + # File Operations define deletefilepattern find $(1) -type f -name '$(2)' -delete endef # Platform Specific additional defines -ENGINE_DEFINES_X86_PLAT = -DNEUROMORE_PLATFORM_OSX -ENGINE_DEFINES_X64_PLAT = -DNEUROMORE_PLATFORM_OSX -QTBASE_DEFINES_X86_PLAT = -DNEUROMORE_PLATFORM_OSX -DQT_QPA_DEFAULT_PLATFORM_NAME=\"cocoa\" -DQT_FEATURE_fontconfig=1 -QTBASE_DEFINES_X64_PLAT = -DNEUROMORE_PLATFORM_OSX -DQT_QPA_DEFAULT_PLATFORM_NAME=\"cocoa\" -DQT_FEATURE_fontconfig=1 -STUDIO_DEFINES_X86_PLAT = -DNEUROMORE_PLATFORM_OSX -DQT_QPA_DEFAULT_PLATFORM_NAME=\"cocoa\" -DQT_FEATURE_fontconfig=1 -STUDIO_DEFINES_X64_PLAT = -DNEUROMORE_PLATFORM_OSX -DQT_QPA_DEFAULT_PLATFORM_NAME=\"cocoa\" -DQT_FEATURE_fontconfig=1 +ENGINE_DEFINES_X86_PLAT = -DNEUROMORE_PLATFORM_OSX +ENGINE_DEFINES_X64_PLAT = -DNEUROMORE_PLATFORM_OSX +ENGINEJNI_DEFINES_X86_PLAT = -DNEUROMORE_PLATFORM_OSX +ENGINEJNI_DEFINES_X64_PLAT = -DNEUROMORE_PLATFORM_OSX +QTBASE_DEFINES_X86_PLAT = -DNEUROMORE_PLATFORM_OSX -DQT_QPA_DEFAULT_PLATFORM_NAME=\"cocoa\" -DQT_FEATURE_fontconfig=1 +QTBASE_DEFINES_X64_PLAT = -DNEUROMORE_PLATFORM_OSX -DQT_QPA_DEFAULT_PLATFORM_NAME=\"cocoa\" -DQT_FEATURE_fontconfig=1 +STUDIO_DEFINES_X86_PLAT = -DNEUROMORE_PLATFORM_OSX -DQT_QPA_DEFAULT_PLATFORM_NAME=\"cocoa\" -DQT_FEATURE_fontconfig=1 +STUDIO_DEFINES_X64_PLAT = -DNEUROMORE_PLATFORM_OSX -DQT_QPA_DEFAULT_PLATFORM_NAME=\"cocoa\" -DQT_FEATURE_fontconfig=1 # Platform Specific additional includes -ENGINE_INCLUDES_X86_PLAT = -ENGINE_INCLUDES_X64_PLAT = -QTBASE_INCLUDES_X86_PLAT = -QTBASE_INCLUDES_X64_PLAT = -STUDIO_INCLUDES_X86_PLAT = -STUDIO_INCLUDES_X64_PLAT = +ENGINE_INCLUDES_X86_PLAT = +ENGINE_INCLUDES_X64_PLAT = +ENGINEJNI_INCLUDES_X86_PLAT = -I"$(JAVA_HOME)/include" -I"$(JAVA_HOME)/include/darwin" +ENGINEJNI_INCLUDES_X64_PLAT = -I"$(JAVA_HOME)/include" -I"$(JAVA_HOME)/include/darwin" +QTBASE_INCLUDES_X86_PLAT = +QTBASE_INCLUDES_X64_PLAT = +STUDIO_INCLUDES_X86_PLAT = +STUDIO_INCLUDES_X64_PLAT = ##################################################################################### # Qt MOC+RCC+UIC @@ -83,23 +95,27 @@ endif include Makefile.common # LIB Tool -LIB = ar +LIB_X86 = ar +LIB_X64 = ar LIBFLAGS_X86 = rc LIBFLAGS_X64 = rc # LIB Functions define createlib32 - $(LIB) $(LIBFLAGS_X86) $(LIBDIR_X86)/$(1).a $(2) + $(LIB_X86) $(LIBFLAGS_X86) $(LIBDIR_X86)/$(1).a $(2) endef define createlib64 - $(LIB) $(LIBFLAGS_X64) $(LIBDIR_X64)/$(1).a $(2) + $(LIB_X64) $(LIBFLAGS_X64) $(LIBDIR_X64)/$(1).a $(2) endef ##################################################################################### # Linker -LINK = $(CXX) -LINKFLAGS_X86 = $(CXXFLAGS_X86) -LINKFLAGS_X64 = $(CXXFLAGS_X64) +LINK_X86 = $(CXX_X86) +LINK_X64 = $(CXX_X64) +LINKFLAGS_X86 = -target $(TARGET_X86) $(FLAGS) +LINKFLAGS_X64 = -target $(TARGET_X64) $(FLAGS) +LINKFLAGSDYN_X86 = -fpic -shared +LINKFLAGSDYN_X64 = -fpic -shared # Additional Linker Library Path for shared libraries LINKPATH_X86 = -L./lib/x86 @@ -124,12 +140,20 @@ LINKLIBS_ALL = -lcups \ LINKLIBS_X86 = $(LINKLIBS_ALL) LINKLIBS_X64 = $(LINKLIBS_ALL) -# Linker Functions +# Linker Functions for Executable define createbin32 - $(LINK) $(LINKFLAGS_X86) $(LINKPATH_X86) $(2) $(3) $(LINKLIBS_X86) -o $(BINDIR_X86)/$(1) + $(LINK_X86) $(LINKFLAGS_X86) $(LINKPATH_X86) $(2) $(3) $(LINKLIBS_X86) -o $(BINDIR_X86)/$(1) endef define createbin64 - $(LINK) $(LINKFLAGS_X64) $(LINKPATH_X64) $(2) $(3) $(LINKLIBS_X64) -o $(BINDIR_X64)/$(1) + $(LINK_X64) $(LINKFLAGS_X64) $(LINKPATH_X64) $(2) $(3) $(LINKLIBS_X64) -o $(BINDIR_X64)/$(1) +endef + +# Linker Functions for Shared Library +define createshared32 + $(LINK_X86) $(LINKFLAGS_X86) $(LINKFLAGSDYN_X86) $(LINKPATH_X86) $(2) $(3) $(LINKLIBS_X86) -o $(LIBDIR_X86)/$(1).so +endef +define createshared64 + $(LINK_X64) $(LINKFLAGS_X64) $(LINKFLAGSDYN_X64) $(LINKPATH_X64) $(2) $(3) $(LINKLIBS_X64) -o $(LIBDIR_X64)/$(1).so endef ##################################################################################### @@ -138,6 +162,19 @@ endef ENGINE_OBJS = $(ENGINE_OBJS_ALL) +ENGINEJNI_OBJS = $(ENGINEJNI_OBJS_ALL) +ENGINEJNI_JOBJS = $(ENGINEJNI_JOBJS_ALL) +ENGINEJNI_LIBS_X86 = $(LIBDIR_X86)/Engine.a \ + $(DEPSLIBDIR_X86)/edflib.a \ + $(DEPSLIBDIR_X86)/oscpack.a \ + $(DEPSLIBDIR_X86)/kissfft.a \ + $(DEPSLIBDIR_X86)/zlib.a +ENGINEJNI_LIBS_X64 = $(LIBDIR_X64)/Engine.a \ + $(DEPSLIBDIR_X64)/edflib.a \ + $(DEPSLIBDIR_X64)/oscpack.a \ + $(DEPSLIBDIR_X64)/kissfft.a \ + $(DEPSLIBDIR_X64)/zlib.a + QTBASE_MOCH = $(QTBASE_MOCH_ALL) QTBASE_MOCC = $(QTBASE_MOCC_ALL) QTBASE_UICH = $(QTBASE_UICH_ALL) @@ -240,3 +277,11 @@ STUDIO_LIBS_X64 = $(LIBDIR_X64)/QtBase.a \ # Include Targets include Makefile.targets + +all-x86: all-common-x86 \ + Studio-x86 + +all-x64: all-common-x64 \ + Studio-x64 + +all: all-x86 all-x64 diff --git a/build/make/Makefile.targets b/build/make/Makefile.targets index e1ab3cb04..f89e9bdf6 100644 --- a/build/make/Makefile.targets +++ b/build/make/Makefile.targets @@ -27,6 +27,35 @@ Engine-x64-clean: Engine-clean: Engine-x86-clean Engine-x64-clean ################################################################################################################### +# ENGINEJNI +################################################################################################################### +ENGINEJNI_OBJS_X86 := $(patsubst %,$(ENGINEJNI_OBJDIR_X86)/%,$(ENGINEJNI_OBJS)) +ENGINEJNI_OBJS_X64 := $(patsubst %,$(ENGINEJNI_OBJDIR_X64)/%,$(ENGINEJNI_OBJS)) +ENGINEJNI_JOBJS_X86 := $(patsubst %,$(ENGINEJNI_OBJDIR_X86)/%,$(ENGINEJNI_JOBJS)) +ENGINEJNI_JOBJS_X64 := $(patsubst %,$(ENGINEJNI_OBJDIR_X64)/%,$(ENGINEJNI_JOBJS)) + +EngineJNI-x86: Engine-x86 $(ENGINEJNI_OBJS_X86) $(ENGINEJNI_JOBJS_X86) + $(call createshared32,EngineJNI,$(ENGINEJNI_OBJS_X86),$(ENGINEJNI_LIBS_X86)) + $(JAR) cf $(LIBDIR_X86)/EngineJNI.jar -C $(ENGINEJNI_OBJDIR_X86)/Java . + +EngineJNI-x64: Engine-x64 $(ENGINEJNI_OBJS_X64) $(ENGINEJNI_JOBJS_X64) + $(call createshared64,EngineJNI,$(ENGINEJNI_OBJS_X64),$(ENGINEJNI_LIBS_X64)) + $(JAR) cf $(LIBDIR_X64)/EngineJNI.jar -C $(ENGINEJNI_OBJDIR_X64)/Java . + +EngineJNI: EngineJNI-x86 EngineJNI-x64 + +EngineJNI-x86-clean: + $(call deletefilepattern,$(LIBDIR_X86),EngineJNI.*) + $(call deletefilepattern,$(ENGINEJNI_OBJDIR_X86),*.o) + $(call deletefilepattern,$(ENGINEJNI_OBJDIR_X86)/Java,*.class) + +EngineJNI-x64-clean: + $(call deletefilepattern,$(LIBDIR_X64),EngineJNI.*) + $(call deletefilepattern,$(ENGINEJNI_OBJDIR_X64),*.o) + $(call deletefilepattern,$(ENGINEJNI_OBJDIR_X64)/Java,*.class) + +EngineJNI-clean: EngineJNI-x86-clean EngineJNI-x64-clean +################################################################################################################### # QTBASE ################################################################################################################### QTBASE_MOCH_X86 := $(patsubst %,$(QTBASE_MOCDIR_X86)/%,$(QTBASE_MOCH)) @@ -135,10 +164,10 @@ Studio-clean: Studio-x86-clean Studio-x64-clean ################################################################################################################### # ALL ################################################################################################################### -all-x86: Engine-x86 QtBase-x86 Studio-x86 -all-x64: Engine-x64 QtBase-x64 Studio-x64 -all: all-x86 all-x64 +all-common-x86: Engine-x86 QtBase-x86 +all-common-x64: Engine-x64 QtBase-x64 +all-common: all-common-x86 all-common-x64 -clean-x86: Engine-x86-clean QtBase-x86-clean Studio-x86-clean -clean-x64: Engine-x64-clean QtBase-x64-clean Studio-x64-clean +clean-x86: Engine-x86-clean EngineJNI-x86-clean QtBase-x86-clean Studio-x86-clean +clean-x64: Engine-x64-clean EngineJNI-x64-clean QtBase-x64-clean Studio-x64-clean clean: clean-x86 clean-x64 diff --git a/build/make/Makefile.win b/build/make/Makefile.win index 917ae72f6..22203eced 100644 --- a/build/make/Makefile.win +++ b/build/make/Makefile.win @@ -7,7 +7,7 @@ TARGET_X86 = i686-pc-windows-msvc TARGET_X64 = x86_64-pc-windows-msvc # flags shared between all -FLAGS = -O2 \ +FLAGS = -O3 \ -D_CRT_SECURE_NO_WARNINGS \ -D_CRT_NONSTDC_NO_DEPRECATE \ -D_WINSOCK_DEPRECATED_NO_WARNINGS \ @@ -20,35 +20,45 @@ ARCHFLAGS_X86 = -msse -msse2 ARCHFLAGS_X64 = -msse -msse2 # C Compiler -CC = clang-cl +CC_X86 = clang-cl +CC_X64 = clang-cl CFLAGS_X86 = -MT -TC -m32 --target=$(TARGET_X86) $(ARCHFLAGS_X86) $(FLAGS) CFLAGS_X64 = -MT -TC -m64 --target=$(TARGET_X64) $(ARCHFLAGS_X64) $(FLAGS) # C++ Compiler -CXX = clang++ +CXX_X86 = clang++ +CXX_X64 = clang++ CXXFLAGS_X86 = -MT -TP -m32 -target $(TARGET_X86) $(ARCHFLAGS_X86) -Xclang -flto-visibility-public-std -std=c++17 $(FLAGS) CXXFLAGS_X64 = -MT -TP -m64 -target $(TARGET_X64) $(ARCHFLAGS_X64) -Xclang -flto-visibility-public-std -std=c++17 $(FLAGS) +# JAVA JDK +JAR = "$(JAVA_HOME)/bin/jar.exe" +JAVAC = "$(JAVA_HOME)/bin/javac.exe" + # File Operations define deletefilepattern del /s /q $(subst /,\,$(1))\$(2) endef # Platform Specific additional defines -ENGINE_DEFINES_X86_PLAT = -DNEUROMORE_PLATFORM_WINDOWS -DNEUROMORE_ARCHITECTURE_X86 -ENGINE_DEFINES_X64_PLAT = -DNEUROMORE_PLATFORM_WINDOWS -DNEUROMORE_ARCHITECTURE_X86 -QTBASE_DEFINES_X86_PLAT = -DNEUROMORE_PLATFORM_WINDOWS -DNEUROMORE_ARCHITECTURE_X86 -DQT_QPA_DEFAULT_PLATFORM_NAME=\"windows\" -QTBASE_DEFINES_X64_PLAT = -DNEUROMORE_PLATFORM_WINDOWS -DNEUROMORE_ARCHITECTURE_X86 -DQT_QPA_DEFAULT_PLATFORM_NAME=\"windows\" -STUDIO_DEFINES_X86_PLAT = -DNEUROMORE_PLATFORM_WINDOWS -DNEUROMORE_ARCHITECTURE_X86 -DUSE_WINTHREAD -DQT_QPA_DEFAULT_PLATFORM_NAME=\"windows\" -STUDIO_DEFINES_X64_PLAT = -DNEUROMORE_PLATFORM_WINDOWS -DNEUROMORE_ARCHITECTURE_X86 -DUSE_WINTHREAD -DQT_QPA_DEFAULT_PLATFORM_NAME=\"windows\" +ENGINE_DEFINES_X86_PLAT = -DNEUROMORE_PLATFORM_WINDOWS -DNEUROMORE_ARCHITECTURE_X86 +ENGINE_DEFINES_X64_PLAT = -DNEUROMORE_PLATFORM_WINDOWS -DNEUROMORE_ARCHITECTURE_X86 +ENGINEJNI_DEFINES_X86_PLAT = -DWIN32 -DNEUROMORE_PLATFORM_WINDOWS -DNEUROMORE_ARCHITECTURE_X86 +ENGINEJNI_DEFINES_X64_PLAT = -DWIN32 -DNEUROMORE_PLATFORM_WINDOWS -DNEUROMORE_ARCHITECTURE_X86 +QTBASE_DEFINES_X86_PLAT = -DNEUROMORE_PLATFORM_WINDOWS -DNEUROMORE_ARCHITECTURE_X86 -DQT_QPA_DEFAULT_PLATFORM_NAME=\"windows\" +QTBASE_DEFINES_X64_PLAT = -DNEUROMORE_PLATFORM_WINDOWS -DNEUROMORE_ARCHITECTURE_X86 -DQT_QPA_DEFAULT_PLATFORM_NAME=\"windows\" +STUDIO_DEFINES_X86_PLAT = -DNEUROMORE_PLATFORM_WINDOWS -DNEUROMORE_ARCHITECTURE_X86 -DUSE_WINTHREAD -DQT_QPA_DEFAULT_PLATFORM_NAME=\"windows\" +STUDIO_DEFINES_X64_PLAT = -DNEUROMORE_PLATFORM_WINDOWS -DNEUROMORE_ARCHITECTURE_X86 -DUSE_WINTHREAD -DQT_QPA_DEFAULT_PLATFORM_NAME=\"windows\" # Platform Specific additional includes -ENGINE_INCLUDES_X86_PLAT = -ENGINE_INCLUDES_X64_PLAT = -QTBASE_INCLUDES_X86_PLAT = -QTBASE_INCLUDES_X64_PLAT = -STUDIO_INCLUDES_X86_PLAT = -STUDIO_INCLUDES_X64_PLAT = +ENGINE_INCLUDES_X86_PLAT = +ENGINE_INCLUDES_X64_PLAT = +ENGINEJNI_INCLUDES_X86_PLAT = -I"$(JAVA_HOME)/include" -I"$(JAVA_HOME)/include/win32" +ENGINEJNI_INCLUDES_X64_PLAT = -I"$(JAVA_HOME)/include" -I"$(JAVA_HOME)/include/win32" +QTBASE_INCLUDES_X86_PLAT = +QTBASE_INCLUDES_X64_PLAT = +STUDIO_INCLUDES_X86_PLAT = +STUDIO_INCLUDES_X64_PLAT = ##################################################################################### # Qt MOC+RCC+UIC @@ -85,23 +95,27 @@ endif include Makefile.common # LIB Tool -LIB = llvm-lib +LIB_X86 = llvm-lib +LIB_X64 = llvm-lib LIBFLAGS_X86 = /NOLOGO /MACHINE:X86 /LIBPATH:$(LIBDIR_X86) LIBFLAGS_X64 = /NOLOGO /MACHINE:X64 /LIBPATH:$(LIBDIR_X64) # LIB Functions define createlib32 - $(LIB) $(LIBFLAGS_X86) /OUT:"$(LIBDIR_X86)\$(1).lib" $(2) + $(LIB_X86) $(LIBFLAGS_X86) /OUT:"$(LIBDIR_X86)\$(1).lib" $(2) endef define createlib64 - $(LIB) $(LIBFLAGS_X64) /OUT:"$(LIBDIR_X64)\$(1).lib" $(2) + $(LIB_X64) $(LIBFLAGS_X64) /OUT:"$(LIBDIR_X64)\$(1).lib" $(2) endef ##################################################################################### # Linker -LINK = lld-link -LINKFLAGS_X86 = -machine:x86 -subsystem:console -LINKFLAGS_X64 = -machine:x64 -subsystem:console +LINK_X86 = lld-link +LINK_X64 = lld-link +LINKFLAGS_X86 = -machine:x86 -subsystem:console +LINKFLAGS_X64 = -machine:x64 -subsystem:console +LINKFLAGSDYN_X86 = -DLL +LINKFLAGSDYN_X64 = -DLL # Visual Studio and Windows SDK Folders DIRVCTOOLS := $(subst \,/,$(VCToolsInstallDir)) @@ -131,12 +145,20 @@ LINKLIBS_ALL = libucrt.lib libvcruntime.lib libcmt.lib libcpmt.lib \ LINKLIBS_X86 = $(LINKLIBS_ALL) LINKLIBS_X64 = $(LINKLIBS_ALL) -# Linker Functions +# Linker Functions for Executable define createbin32 - $(LINK) $(2) -out:$(BINDIR_X86)/$(1).exe $(LINKFLAGS_X86) $(LINKPATH_X86) $(LINKLIBS_X86) $(3) + $(LINK_X86) $(2) -out:$(BINDIR_X86)/$(1).exe $(LINKFLAGS_X86) $(LINKPATH_X86) $(LINKLIBS_X86) $(3) endef define createbin64 - $(LINK) $(2) -out:$(BINDIR_X64)/$(1).exe $(LINKFLAGS_X64) $(LINKPATH_X64) $(LINKLIBS_X64) $(3) + $(LINK_X64) $(2) -out:$(BINDIR_X64)/$(1).exe $(LINKFLAGS_X64) $(LINKPATH_X64) $(LINKLIBS_X64) $(3) +endef + +# Linker Functions for Shared Library +define createshared32 + $(LINK_X86) $(2) -out:$(LIBDIR_X86)/$(1).dll $(LINKFLAGS_X86) $(LINKFLAGSDYN_X86) $(LINKPATH_X86) $(LINKLIBS_X86) $(3) +endef +define createshared64 + $(LINK_X64) $(2) -out:$(LIBDIR_X64)/$(1).dll $(LINKFLAGS_X64) $(LINKFLAGSDYN_X64) $(LINKPATH_X64) $(LINKLIBS_X64) $(3) endef ##################################################################################### @@ -152,6 +174,19 @@ MRCFLAGS_X64 = /D \"WIN32\" /l 0x0409 /nologo ENGINE_OBJS = $(ENGINE_OBJS_ALL) +ENGINEJNI_OBJS = $(ENGINEJNI_OBJS_ALL) +ENGINEJNI_JOBJS = $(ENGINEJNI_JOBJS_ALL) +ENGINEJNI_LIBS_X86 = $(LIBDIR_X86)/Engine.lib \ + $(DEPSLIBDIR_X86)/edflib.lib \ + $(DEPSLIBDIR_X86)/oscpack.lib \ + $(DEPSLIBDIR_X86)/kissfft.lib \ + $(DEPSLIBDIR_X86)/zlib.lib +ENGINEJNI_LIBS_X64 = $(LIBDIR_X64)/Engine.lib \ + $(DEPSLIBDIR_X64)/edflib.lib \ + $(DEPSLIBDIR_X64)/oscpack.lib \ + $(DEPSLIBDIR_X64)/kissfft.lib \ + $(DEPSLIBDIR_X64)/zlib.lib + QTBASE_MOCH = $(QTBASE_MOCH_ALL) QTBASE_MOCC = $(QTBASE_MOCC_ALL) QTBASE_UICH = $(QTBASE_UICH_ALL) @@ -174,3 +209,11 @@ STUDIO_RES = $(STUDIO_RES_ALL) \ # Include Targets include Makefile.targets + +all-x86: all-common-x86 \ + Studio-x86 + +all-x64: all-common-x64 \ + Studio-x64 + +all: all-x86 all-x64 diff --git a/build/make/obj/x64/EngineJNI/.gitignore b/build/make/obj/x64/EngineJNI/.gitignore new file mode 100644 index 000000000..72e8ffc0d --- /dev/null +++ b/build/make/obj/x64/EngineJNI/.gitignore @@ -0,0 +1 @@ +* diff --git a/build/make/obj/x64/EngineJNI/Java/.gitignore b/build/make/obj/x64/EngineJNI/Java/.gitignore new file mode 100644 index 000000000..72e8ffc0d --- /dev/null +++ b/build/make/obj/x64/EngineJNI/Java/.gitignore @@ -0,0 +1 @@ +* diff --git a/build/make/obj/x86/EngineJNI/.gitignore b/build/make/obj/x86/EngineJNI/.gitignore new file mode 100644 index 000000000..72e8ffc0d --- /dev/null +++ b/build/make/obj/x86/EngineJNI/.gitignore @@ -0,0 +1 @@ +* diff --git a/build/make/obj/x86/EngineJNI/Java/.gitignore b/build/make/obj/x86/EngineJNI/Java/.gitignore new file mode 100644 index 000000000..72e8ffc0d --- /dev/null +++ b/build/make/obj/x86/EngineJNI/Java/.gitignore @@ -0,0 +1 @@ +* diff --git a/build/vs/EngineJNI.vcxproj b/build/vs/EngineJNI.vcxproj new file mode 100644 index 000000000..40f046501 --- /dev/null +++ b/build/vs/EngineJNI.vcxproj @@ -0,0 +1,408 @@ + + + + + Debug + x64 + + + Production + Win32 + + + Production + x64 + + + Release + Win32 + + + Debug + Win32 + + + Release + x64 + + + + + + + {876FEE61-779A-4953-8ECE-8B2507903067} + 10.0 + Win32Proj + Win32 + EngineJNI + NoUpgrade + + + + DynamicLibrary + Unicode + v142 + true + false + + + DynamicLibrary + Unicode + v142 + true + false + + + DynamicLibrary + Unicode + v142 + true + false + + + DynamicLibrary + Unicode + v142 + true + false + + + DynamicLibrary + Unicode + v142 + false + + + DynamicLibrary + Unicode + v142 + false + + + + + + + + + + <_ProjectFileVersion>10.0.20506.1 + lib\x86\ + lib\x86\ + obj\x86\$(TargetName)\ + obj\x86\$(TargetName)\ + $(ProjectName) + $(ProjectName) + $(ProjectName) + $(ProjectName) + .dll + .dll + .dll + .dll + lib\x86\ + obj\x86\$(TargetName)_d\ + $(ProjectName)_d + $(ProjectName)_d + .dll + .dll + + + lib\x64\ + obj\x64\$(TargetName)_d\ + + + lib\x64\ + obj\x64\$(TargetName)\ + + + lib\x64\ + obj\x64\$(TargetName)\ + + + + ..\..\deps\include;..\..\src\Engine;%JAVA_HOME%\include;%JAVA_HOME%\include\win32;%(AdditionalIncludeDirectories) + $(IntDir) + CompileAsCpp + Sync + AnySuitable + true + false + MaxSpeed + NotUsing + MultiThreaded + false + false + Level4 + NEUROMORE_PLATFORM_WINDOWS;_UNICODE;UNICODE;WIN32;NDEBUG;ECB=1;CBC=1;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;NEUROMORE_ARCHITECTURE_X86;%(PreprocessorDefinitions) + $(IntDir) + + + $(OutDir)$(TargetName).pdb + true + Speed + true + 4189 + true + + + WIN32;NDEBUG;_UNICODE;UNICODE;NEUROMORE_ARCHITECTURE_X86;NEUROMORE_PLATFORM_WINDOWS;ECB=1;CBC=1;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + + + %(AdditionalIncludeDirectories) + $(ProjectDir)/$(IntDir) + %(Filename).h + %(Filename).tlb + %(Filename)_i.c + %(Filename)_p.c + + + %(AdditionalOptions) + MachineX86 + 6.02 + Console + + + Engine.lib;oscpack.lib;zlib.lib;edflib.lib;kissfft.lib;%(AdditionalDependencies) + ./lib/x86;../../deps/build/vs/lib/x86 + + + + + ..\..\deps\include;..\..\src\Engine;%JAVA_HOME%\include;%JAVA_HOME%\include\win32;%(AdditionalIncludeDirectories) + $(IntDir) + CompileAsCpp + Sync + AnySuitable + true + false + MaxSpeed + NotUsing + MultiThreaded + false + false + Level4 + PRODUCTION_BUILD;NEUROMORE_PLATFORM_WINDOWS;_UNICODE;UNICODE;WIN32;NDEBUG;ECB=1;CBC=1;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;NEUROMORE_ARCHITECTURE_X86;%(PreprocessorDefinitions) + $(IntDir) + + + $(OutDir)$(TargetName).pdb + true + Speed + true + 4189 + true + + + WIN32;NDEBUG;_UNICODE;UNICODE;NEUROMORE_ARCHITECTURE_X86;NEUROMORE_PLATFORM_WINDOWS;ECB=1;CBC=1;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + + + %(AdditionalIncludeDirectories) + $(ProjectDir)/$(IntDir) + %(Filename).h + %(Filename).tlb + %(Filename)_i.c + %(Filename)_p.c + + + %(AdditionalOptions) + MachineX86 + 6.02 + Console + + + Engine.lib;oscpack.lib;zlib.lib;edflib.lib;kissfft.lib;%(AdditionalDependencies) + ./lib/x86;../../deps/build/vs/lib/x86 + + + + + ..\..\deps\include;..\..\src\Engine;%JAVA_HOME%\include;%JAVA_HOME%\include\win32;%(AdditionalIncludeDirectories) + $(IntDir) + CompileAsCpp + Sync + AnySuitable + true + false + MaxSpeed + NotUsing + MultiThreaded + false + false + Level4 + NEUROMORE_PLATFORM_WINDOWS;_UNICODE;UNICODE;WIN32;NDEBUG;ECB=1;CBC=1;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;NEUROMORE_ARCHITECTURE_X86;%(PreprocessorDefinitions) + $(IntDir) + + + $(OutDir)$(TargetName).pdb + true + Speed + true + true + 4189 + + + WIN32;NDEBUG;_UNICODE;UNICODE;NEUROMORE_ARCHITECTURE_X86;NEUROMORE_PLATFORM_WINDOWS;ECB=1;CBC=1;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + + + %(AdditionalIncludeDirectories) + $(ProjectDir)/$(IntDir) + %(Filename).h + %(Filename).tlb + %(Filename)_i.c + %(Filename)_p.c + + + %(AdditionalOptions) + 6.02 + Console + + + Engine.lib;oscpack.lib;zlib.lib;edflib.lib;kissfft.lib;%(AdditionalDependencies) + ./lib/x64;../../deps/build/vs/lib/x64 + + + + + ..\..\deps\include;..\..\src\Engine;%JAVA_HOME%\include;%JAVA_HOME%\include\win32;%(AdditionalIncludeDirectories) + $(IntDir) + CompileAsCpp + Sync + AnySuitable + true + false + MaxSpeed + NotUsing + MultiThreaded + false + false + Level4 + PRODUCTION_BUILD;NEUROMORE_PLATFORM_WINDOWS;_UNICODE;UNICODE;WIN32;NDEBUG;ECB=1;CBC=1;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;NEUROMORE_ARCHITECTURE_X86;%(PreprocessorDefinitions) + $(IntDir) + + + $(OutDir)$(TargetName).pdb + true + Speed + true + true + 4189 + + + WIN32;NDEBUG;_UNICODE;UNICODE;NEUROMORE_ARCHITECTURE_X86;NEUROMORE_PLATFORM_WINDOWS;ECB=1;CBC=1;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + + + %(AdditionalIncludeDirectories) + $(ProjectDir)/$(IntDir) + %(Filename).h + %(Filename).tlb + %(Filename)_i.c + %(Filename)_p.c + + + %(AdditionalOptions) + 6.02 + Console + + + Engine.lib;oscpack.lib;zlib.lib;edflib.lib;kissfft.lib;%(AdditionalDependencies) + ./lib/x64;../../deps/build/vs/lib/x64 + + + + + ..\..\deps\include;..\..\src\Engine;%JAVA_HOME%\include;%JAVA_HOME%\include\win32;%(AdditionalIncludeDirectories) + $(IntDir) + EnableFastChecks + CompileAsCpp + ProgramDatabase + Sync + Disabled + true + false + Disabled + NotUsing + MultiThreadedDebug + false + false + Level4 + NEUROMORE_PLATFORM_WINDOWS;_UNICODE;UNICODE;WIN32;ECB=1;CBC=1;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;NEUROMORE_ARCHITECTURE_X86;%(PreprocessorDefinitions) + $(IntDir) + $(OutDir)$(TargetName).pdb + 4189 + + + WIN32;_DEBUG;_UNICODE;UNICODE;NEUROMORE_ARCHITECTURE_X86;NEUROMORE_PLATFORM_WINDOWS;ECB=1;CBC=1;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + + + %(AdditionalIncludeDirectories) + $(ProjectDir)/$(IntDir) + %(Filename).h + %(Filename).tlb + %(Filename)_i.c + %(Filename)_p.c + + + %(AdditionalOptions) + MachineX86 + 6.02 + Console + + + Engine_d.lib;oscpack_d.lib;zlib_d.lib;edflib_d.lib;kissfft_d.lib;%(AdditionalDependencies) + ./lib/x86;../../deps/build/vs/lib/x86 + + + + + ..\..\deps\include;..\..\src\Engine;%JAVA_HOME%\include;%JAVA_HOME%\include\win32;%(AdditionalIncludeDirectories) + $(IntDir) + EnableFastChecks + CompileAsCpp + ProgramDatabase + Sync + Disabled + true + false + Disabled + NotUsing + MultiThreadedDebug + false + false + Level4 + NEUROMORE_PLATFORM_WINDOWS;_UNICODE;UNICODE;WIN32;ECB=1;CBC=1;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;NEUROMORE_ARCHITECTURE_X86;%(PreprocessorDefinitions) + $(IntDir) + $(OutDir)$(TargetName).pdb + false + 4189 + + + WIN32;_DEBUG;_UNICODE;UNICODE;NEUROMORE_ARCHITECTURE_X86;NEUROMORE_PLATFORM_WINDOWS;ECB=1;CBC=1;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + + + %(AdditionalIncludeDirectories) + $(ProjectDir)/$(IntDir) + %(Filename).h + %(Filename).tlb + %(Filename)_i.c + %(Filename)_p.c + + + %(AdditionalOptions) + 6.02 + Console + + + Engine_d.lib;oscpack_d.lib;zlib_d.lib;edflib_d.lib;kissfft_d.lib;%(AdditionalDependencies) + ./lib/x64;../../deps/build/vs/lib/x64 + + + + + + \ No newline at end of file diff --git a/build/vs/EngineJNI.vcxproj.user b/build/vs/EngineJNI.vcxproj.user new file mode 100644 index 000000000..88a550947 --- /dev/null +++ b/build/vs/EngineJNI.vcxproj.user @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/build/vs/Neuromore.sln b/build/vs/Neuromore.sln index ec62d5784..f19e2cfc3 100644 --- a/build/vs/Neuromore.sln +++ b/build/vs/Neuromore.sln @@ -1,6 +1,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.28307.705 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.29418.71 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Dependencies", "Dependencies", "{4A29E4B7-FCF4-4222-B475-9C130C432EC9}" EndProject @@ -263,6 +263,15 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "singleapplication", "..\..\ {B9C29AF5-8688-411B-A99C-FF62ADC05FAC} = {B9C29AF5-8688-411B-A99C-FF62ADC05FAC} EndProjectSection EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EngineJNI", "EngineJNI.vcxproj", "{876FEE61-779A-4953-8ECE-8B2507903067}" + ProjectSection(ProjectDependencies) = postProject + {C87EC79E-09A3-30D0-8E44-C3A4FF514530} = {C87EC79E-09A3-30D0-8E44-C3A4FF514530} + {F9C29AB5-8688-410B-A99C-0D62ADC05FAC} = {F9C29AB5-8688-410B-A99C-0D62ADC05FAC} + {F9C29BB5-8685-410B-A99C-0D62ADC05FAC} = {F9C29BB5-8685-410B-A99C-0D62ADC05FAC} + {F9C29BB5-8688-410B-A99C-0D62ADC05FAC} = {F9C29BB5-8688-410B-A99C-0D62ADC05FAC} + {E2C146F9-F840-4C21-9CA9-E1DD9649AB7A} = {E2C146F9-F840-4C21-9CA9-E1DD9649AB7A} + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|x64 = Debug|x64 @@ -873,6 +882,12 @@ Global {07A0D17A-6E53-4B36-8FAC-9ACB0603B7BD}.Release|x64.Build.0 = Release|x64 {07A0D17A-6E53-4B36-8FAC-9ACB0603B7BD}.Release|x86.ActiveCfg = Release|Win32 {07A0D17A-6E53-4B36-8FAC-9ACB0603B7BD}.Release|x86.Build.0 = Release|Win32 + {876FEE61-779A-4953-8ECE-8B2507903067}.Debug|x64.ActiveCfg = Debug|x64 + {876FEE61-779A-4953-8ECE-8B2507903067}.Debug|x86.ActiveCfg = Debug|Win32 + {876FEE61-779A-4953-8ECE-8B2507903067}.Production|x64.ActiveCfg = Production|x64 + {876FEE61-779A-4953-8ECE-8B2507903067}.Production|x86.ActiveCfg = Production|Win32 + {876FEE61-779A-4953-8ECE-8B2507903067}.Release|x64.ActiveCfg = Release|x64 + {876FEE61-779A-4953-8ECE-8B2507903067}.Release|x86.ActiveCfg = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -928,6 +943,7 @@ Global {B9C29AF5-8688-420B-A99C-FF62ADC05FAC} = {4A29E4B7-FCF4-4222-B475-9C130C432EC9} {B9C29AF5-8688-411B-A99C-FF62ADC05FAC} = {4A29E4B7-FCF4-4222-B475-9C130C432EC9} {07A0D17A-6E53-4B36-8FAC-9ACB0603B7BD} = {4A29E4B7-FCF4-4222-B475-9C130C432EC9} + {876FEE61-779A-4953-8ECE-8B2507903067} = {23A1D9BB-4CE7-4F13-9349-E90CC76C6A70} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {C35C1FAA-76CB-3437-8405-E3A13F2D5A00} diff --git a/build/vs/QtBase.vcxproj b/build/vs/QtBase.vcxproj index 64eb2f0ae..5fbc44cd5 100644 --- a/build/vs/QtBase.vcxproj +++ b/build/vs/QtBase.vcxproj @@ -130,7 +130,7 @@ false false Level3 - QT_NO_FONTCONFIG;QT_QPA_DEFAULT_PLATFORM_NAME="windows";_UNICODE;UNICODE;PCRE2_STATIC;PCRE2_CODE_UNIT_WIDTH=16;OPENSSL_STATIC;OPENSSL_NO_DYNAMIC_ENGINE;QT_BLUETOOTH_LIB;QT_CORE_LIB;QT_CONCURRENT_LIB;QT_GAMEPAD_LIB;QT_GUI_LIB;QT_MULTIMEDIA_LIB;QT_NETWORK_LIB;QT_MULTIMEDIAWIDGETS_LIB;QT_WIDGETS_LIB;QT_OPENGL_LIB;QT_PRINTSUPPORT_LIB;QT_SERIALPORT_LIB;QT_XML_LIB;QT_LINKED_OPENSSL;QT_STATIC;WIN32;NEUROMORE_ARCHITECTURE_X86;NEUROMORE_PLATFORM_WINDOWS;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;QT_NO_DEBUG;NDEBUG;%(PreprocessorDefinitions) + QT_LARGEFILE_SUPPORT=64;QT_NO_FONTCONFIG;QT_QPA_DEFAULT_PLATFORM_NAME="windows";_UNICODE;UNICODE;PCRE2_STATIC;PCRE2_CODE_UNIT_WIDTH=16;OPENSSL_STATIC;OPENSSL_NO_DYNAMIC_ENGINE;QT_BLUETOOTH_LIB;QT_CORE_LIB;QT_CONCURRENT_LIB;QT_GAMEPAD_LIB;QT_GUI_LIB;QT_MULTIMEDIA_LIB;QT_NETWORK_LIB;QT_MULTIMEDIAWIDGETS_LIB;QT_WIDGETS_LIB;QT_OPENGL_LIB;QT_PRINTSUPPORT_LIB;QT_SERIALPORT_LIB;QT_XML_LIB;QT_LINKED_OPENSSL;QT_STATIC;WIN32;NEUROMORE_ARCHITECTURE_X86;NEUROMORE_PLATFORM_WINDOWS;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;QT_NO_DEBUG;NDEBUG;%(PreprocessorDefinitions) $(IntDir) @@ -183,7 +183,7 @@ QtBase.cmd false false Level3 - PRODUCTION_BUILD;QT_NO_FONTCONFIG;QT_QPA_DEFAULT_PLATFORM_NAME="windows";_UNICODE;UNICODE;PCRE2_STATIC;PCRE2_CODE_UNIT_WIDTH=16;OPENSSL_STATIC;OPENSSL_NO_DYNAMIC_ENGINE;QT_BLUETOOTH_LIB;QT_CORE_LIB;QT_CONCURRENT_LIB;QT_GAMEPAD_LIB;QT_GUI_LIB;QT_MULTIMEDIA_LIB;QT_NETWORK_LIB;QT_MULTIMEDIAWIDGETS_LIB;QT_WIDGETS_LIB;QT_OPENGL_LIB;QT_PRINTSUPPORT_LIB;QT_SERIALPORT_LIB;QT_XML_LIB;QT_LINKED_OPENSSL;QT_STATIC;WIN32;NEUROMORE_ARCHITECTURE_X86;NEUROMORE_PLATFORM_WINDOWS;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;QT_NO_DEBUG;NDEBUG;%(PreprocessorDefinitions) + QT_LARGEFILE_SUPPORT=64;PRODUCTION_BUILD;QT_NO_FONTCONFIG;QT_QPA_DEFAULT_PLATFORM_NAME="windows";_UNICODE;UNICODE;PCRE2_STATIC;PCRE2_CODE_UNIT_WIDTH=16;OPENSSL_STATIC;OPENSSL_NO_DYNAMIC_ENGINE;QT_BLUETOOTH_LIB;QT_CORE_LIB;QT_CONCURRENT_LIB;QT_GAMEPAD_LIB;QT_GUI_LIB;QT_MULTIMEDIA_LIB;QT_NETWORK_LIB;QT_MULTIMEDIAWIDGETS_LIB;QT_WIDGETS_LIB;QT_OPENGL_LIB;QT_PRINTSUPPORT_LIB;QT_SERIALPORT_LIB;QT_XML_LIB;QT_LINKED_OPENSSL;QT_STATIC;WIN32;NEUROMORE_ARCHITECTURE_X86;NEUROMORE_PLATFORM_WINDOWS;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;QT_NO_DEBUG;NDEBUG;%(PreprocessorDefinitions) $(IntDir) @@ -236,7 +236,7 @@ QtBase.cmd false false Level3 - QT_NO_FONTCONFIG;QT_QPA_DEFAULT_PLATFORM_NAME="windows";_UNICODE;UNICODE;PCRE2_STATIC;PCRE2_CODE_UNIT_WIDTH=16;OPENSSL_STATIC;OPENSSL_NO_DYNAMIC_ENGINE;QT_BLUETOOTH_LIB;QT_CORE_LIB;QT_CONCURRENT_LIB;QT_GAMEPAD_LIB;QT_GUI_LIB;QT_MULTIMEDIA_LIB;QT_NETWORK_LIB;QT_MULTIMEDIAWIDGETS_LIB;QT_WIDGETS_LIB;QT_OPENGL_LIB;QT_PRINTSUPPORT_LIB;QT_SERIALPORT_LIB;QT_XML_LIB;QT_LINKED_OPENSSL;QT_STATIC;QT_NO_DEBUG;WIN32;NEUROMORE_ARCHITECTURE_X86;NEUROMORE_PLATFORM_WINDOWS;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions) + QT_LARGEFILE_SUPPORT=64;QT_NO_FONTCONFIG;QT_QPA_DEFAULT_PLATFORM_NAME="windows";_UNICODE;UNICODE;PCRE2_STATIC;PCRE2_CODE_UNIT_WIDTH=16;OPENSSL_STATIC;OPENSSL_NO_DYNAMIC_ENGINE;QT_BLUETOOTH_LIB;QT_CORE_LIB;QT_CONCURRENT_LIB;QT_GAMEPAD_LIB;QT_GUI_LIB;QT_MULTIMEDIA_LIB;QT_NETWORK_LIB;QT_MULTIMEDIAWIDGETS_LIB;QT_WIDGETS_LIB;QT_OPENGL_LIB;QT_PRINTSUPPORT_LIB;QT_SERIALPORT_LIB;QT_XML_LIB;QT_LINKED_OPENSSL;QT_STATIC;QT_NO_DEBUG;WIN32;NEUROMORE_ARCHITECTURE_X86;NEUROMORE_PLATFORM_WINDOWS;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions) $(IntDir) @@ -288,7 +288,7 @@ QtBase.cmd false false Level3 - PRODUCTION_BUILD;QT_NO_FONTCONFIG;QT_QPA_DEFAULT_PLATFORM_NAME="windows";_UNICODE;UNICODE;PCRE2_STATIC;PCRE2_CODE_UNIT_WIDTH=16;OPENSSL_STATIC;OPENSSL_NO_DYNAMIC_ENGINE;QT_BLUETOOTH_LIB;QT_CORE_LIB;QT_CONCURRENT_LIB;QT_GAMEPAD_LIB;QT_GUI_LIB;QT_MULTIMEDIA_LIB;QT_NETWORK_LIB;QT_MULTIMEDIAWIDGETS_LIB;QT_WIDGETS_LIB;QT_OPENGL_LIB;QT_PRINTSUPPORT_LIB;QT_SERIALPORT_LIB;QT_XML_LIB;QT_LINKED_OPENSSL;QT_STATIC;QT_NO_DEBUG;WIN32;NEUROMORE_ARCHITECTURE_X86;NEUROMORE_PLATFORM_WINDOWS;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions) + QT_LARGEFILE_SUPPORT=64;PRODUCTION_BUILD;QT_NO_FONTCONFIG;QT_QPA_DEFAULT_PLATFORM_NAME="windows";_UNICODE;UNICODE;PCRE2_STATIC;PCRE2_CODE_UNIT_WIDTH=16;OPENSSL_STATIC;OPENSSL_NO_DYNAMIC_ENGINE;QT_BLUETOOTH_LIB;QT_CORE_LIB;QT_CONCURRENT_LIB;QT_GAMEPAD_LIB;QT_GUI_LIB;QT_MULTIMEDIA_LIB;QT_NETWORK_LIB;QT_MULTIMEDIAWIDGETS_LIB;QT_WIDGETS_LIB;QT_OPENGL_LIB;QT_PRINTSUPPORT_LIB;QT_SERIALPORT_LIB;QT_XML_LIB;QT_LINKED_OPENSSL;QT_STATIC;QT_NO_DEBUG;WIN32;NEUROMORE_ARCHITECTURE_X86;NEUROMORE_PLATFORM_WINDOWS;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions) $(IntDir) @@ -342,7 +342,7 @@ QtBase.cmd false false Level3 - QT_NO_FONTCONFIG;QT_QPA_DEFAULT_PLATFORM_NAME="windows";PCRE2_STATIC;PCRE2_CODE_UNIT_WIDTH=16;_UNICODE;UNICODE;QT_BLUETOOTH_LIB;QT_CORE_LIB;QT_CONCURRENT_LIB;QT_GAMEPAD_LIB;QT_GUI_LIB;QT_MULTIMEDIA_LIB;QT_NETWORK_LIB;QT_MULTIMEDIAWIDGETS_LIB;QT_WIDGETS_LIB;QT_OPENGL_LIB;QT_PRINTSUPPORT_LIB;QT_SERIALPORT_LIB;QT_XML_LIB;QT_STATIC;NEUROMORE_ARCHITECTURE_X86;NEUROMORE_PLATFORM_WINDOWS;WIN32;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;_DEBUG;%(PreprocessorDefinitions) + QT_LARGEFILE_SUPPORT=64;QT_NO_FONTCONFIG;QT_QPA_DEFAULT_PLATFORM_NAME="windows";PCRE2_STATIC;PCRE2_CODE_UNIT_WIDTH=16;_UNICODE;UNICODE;QT_BLUETOOTH_LIB;QT_CORE_LIB;QT_CONCURRENT_LIB;QT_GAMEPAD_LIB;QT_GUI_LIB;QT_MULTIMEDIA_LIB;QT_NETWORK_LIB;QT_MULTIMEDIAWIDGETS_LIB;QT_WIDGETS_LIB;QT_OPENGL_LIB;QT_PRINTSUPPORT_LIB;QT_SERIALPORT_LIB;QT_XML_LIB;QT_STATIC;NEUROMORE_ARCHITECTURE_X86;NEUROMORE_PLATFORM_WINDOWS;WIN32;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;_DEBUG;%(PreprocessorDefinitions) $(IntDir) $(OutDir)$(TargetName).pdb 4065 @@ -391,7 +391,7 @@ QtBase.cmd false false Level3 - QT_NO_FONTCONFIG;QT_QPA_DEFAULT_PLATFORM_NAME="windows";PCRE2_STATIC;PCRE2_CODE_UNIT_WIDTH=16;_UNICODE;UNICODE;QT_BLUETOOTH_LIB;QT_CORE_LIB;QT_CONCURRENT_LIB;QT_GAMEPAD_LIB;QT_GUI_LIB;QT_MULTIMEDIA_LIB;QT_NETWORK_LIB;QT_MULTIMEDIAWIDGETS_LIB;QT_WIDGETS_LIB;QT_OPENGL_LIB;QT_PRINTSUPPORT_LIB;QT_SERIALPORT_LIB;QT_XML_LIB;QT_STATIC;NEUROMORE_ARCHITECTURE_X86;NEUROMORE_PLATFORM_WINDOWS;WIN32;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;_DEBUG;%(PreprocessorDefinitions) + QT_LARGEFILE_SUPPORT=64;QT_NO_FONTCONFIG;QT_QPA_DEFAULT_PLATFORM_NAME="windows";PCRE2_STATIC;PCRE2_CODE_UNIT_WIDTH=16;_UNICODE;UNICODE;QT_BLUETOOTH_LIB;QT_CORE_LIB;QT_CONCURRENT_LIB;QT_GAMEPAD_LIB;QT_GUI_LIB;QT_MULTIMEDIA_LIB;QT_NETWORK_LIB;QT_MULTIMEDIAWIDGETS_LIB;QT_WIDGETS_LIB;QT_OPENGL_LIB;QT_PRINTSUPPORT_LIB;QT_SERIALPORT_LIB;QT_XML_LIB;QT_STATIC;NEUROMORE_ARCHITECTURE_X86;NEUROMORE_PLATFORM_WINDOWS;WIN32;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;_DEBUG;%(PreprocessorDefinitions) $(IntDir) $(OutDir)$(TargetName).pdb 4065 diff --git a/build/vs/Studio.vcxproj b/build/vs/Studio.vcxproj index 690563824..aa6858b5d 100644 --- a/build/vs/Studio.vcxproj +++ b/build/vs/Studio.vcxproj @@ -527,7 +527,7 @@ NotUsing MultiThreadedDebug Level3 - QT_NO_FONTCONFIG;QT_QPA_DEFAULT_PLATFORM_NAME="windows";WIN32;_WINDOWS;NEUROMORE_PLATFORM_WINDOWS;__TBB_NO_IMPLICIT_LINKAGE;USE_WINTHREAD;OPENSSL_STATIC;OPENSSL_NO_DYNAMIC_ENGINE;QT_LINKED_OPENSSL;QT_STATIC;PCRE2_STATIC;PCRE2_CODE_UNIT_WIDTH=16;PCRE2_STATIC;QT_STATIC;_DEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + QT_LARGEFILE_SUPPORT=64;QT_NO_FONTCONFIG;QT_QPA_DEFAULT_PLATFORM_NAME="windows";WIN32;_WINDOWS;NEUROMORE_PLATFORM_WINDOWS;__TBB_NO_IMPLICIT_LINKAGE;USE_WINTHREAD;OPENSSL_STATIC;OPENSSL_NO_DYNAMIC_ENGINE;QT_LINKED_OPENSSL;QT_STATIC;PCRE2_STATIC;PCRE2_CODE_UNIT_WIDTH=16;PCRE2_STATIC;QT_STATIC;_DEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) $(IntDir) $(IntDir) $(OutDir)$(TargetName).pdb @@ -582,7 +582,7 @@ Studio.cmd NotUsing MultiThreadedDebug Level3 - QT_NO_FONTCONFIG;QT_QPA_DEFAULT_PLATFORM_NAME="windows";WIN32;_WINDOWS;NEUROMORE_PLATFORM_WINDOWS;__TBB_NO_IMPLICIT_LINKAGE;USE_WINTHREAD;OPENSSL_STATIC;OPENSSL_NO_DYNAMIC_ENGINE;QT_LINKED_OPENSSL;QT_STATIC;PCRE2_STATIC;PCRE2_CODE_UNIT_WIDTH=16;QT_STATIC;_DEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + QT_LARGEFILE_SUPPORT=64;QT_NO_FONTCONFIG;QT_QPA_DEFAULT_PLATFORM_NAME="windows";WIN32;_WINDOWS;NEUROMORE_PLATFORM_WINDOWS;__TBB_NO_IMPLICIT_LINKAGE;USE_WINTHREAD;OPENSSL_STATIC;OPENSSL_NO_DYNAMIC_ENGINE;QT_LINKED_OPENSSL;QT_STATIC;PCRE2_STATIC;PCRE2_CODE_UNIT_WIDTH=16;QT_STATIC;_DEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) $(IntDir) $(IntDir) $(OutDir)$(TargetName).pdb @@ -638,7 +638,7 @@ Studio.cmd MultiThreaded Level3 None - QT_NO_FONTCONFIG;QT_QPA_DEFAULT_PLATFORM_NAME="windows";_UNICODE;UNICODE;PCRE2_STATIC;PCRE2_CODE_UNIT_WIDTH=16;OPENSSL_STATIC;OPENSSL_NO_DYNAMIC_ENGINE;NEUROMORE_ARCHITECTURE_X86;NEUROMORE_PLATFORM_WINDOWS;__TBB_NO_IMPLICIT_LINKAGE;USE_WINTHREAD;QT_LINKED_OPENSSL;QT_STATIC;WIN32;_WINDOWS;QT_NO_DEBUG;NDEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + QT_LARGEFILE_SUPPORT=64;QT_NO_FONTCONFIG;QT_QPA_DEFAULT_PLATFORM_NAME="windows";_UNICODE;UNICODE;PCRE2_STATIC;PCRE2_CODE_UNIT_WIDTH=16;OPENSSL_STATIC;OPENSSL_NO_DYNAMIC_ENGINE;NEUROMORE_ARCHITECTURE_X86;NEUROMORE_PLATFORM_WINDOWS;__TBB_NO_IMPLICIT_LINKAGE;USE_WINTHREAD;QT_LINKED_OPENSSL;QT_STATIC;WIN32;_WINDOWS;QT_NO_DEBUG;NDEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) $(IntDir) $(IntDir) $(OutDir)$(TargetName).pdb @@ -706,7 +706,7 @@ Studio.cmd MultiThreaded Level3 None - PRODUCTION_BUILD;QT_NO_FONTCONFIG;QT_QPA_DEFAULT_PLATFORM_NAME="windows";_UNICODE;UNICODE;PCRE2_STATIC;PCRE2_CODE_UNIT_WIDTH=16;OPENSSL_STATIC;OPENSSL_NO_DYNAMIC_ENGINE;NEUROMORE_ARCHITECTURE_X86;NEUROMORE_PLATFORM_WINDOWS;__TBB_NO_IMPLICIT_LINKAGE;USE_WINTHREAD;QT_LINKED_OPENSSL;QT_STATIC;WIN32;_WINDOWS;QT_NO_DEBUG;NDEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + QT_LARGEFILE_SUPPORT=64;PRODUCTION_BUILD;QT_NO_FONTCONFIG;QT_QPA_DEFAULT_PLATFORM_NAME="windows";_UNICODE;UNICODE;PCRE2_STATIC;PCRE2_CODE_UNIT_WIDTH=16;OPENSSL_STATIC;OPENSSL_NO_DYNAMIC_ENGINE;NEUROMORE_ARCHITECTURE_X86;NEUROMORE_PLATFORM_WINDOWS;__TBB_NO_IMPLICIT_LINKAGE;USE_WINTHREAD;QT_LINKED_OPENSSL;QT_STATIC;WIN32;_WINDOWS;QT_NO_DEBUG;NDEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) $(IntDir) $(IntDir) $(OutDir)$(TargetName).pdb @@ -774,7 +774,7 @@ Studio.cmd MultiThreaded Level3 None - QT_NO_FONTCONFIG;QT_QPA_DEFAULT_PLATFORM_NAME="windows";WIN32;_WINDOWS;NEUROMORE_PLATFORM_WINDOWS;__TBB_NO_IMPLICIT_LINKAGE;USE_WINTHREAD;OPENSSL_STATIC;OPENSSL_NO_DYNAMIC_ENGINE;QT_LINKED_OPENSSL;QT_STATIC;QT_NO_DEBUG;PCRE2_STATIC;PCRE2_CODE_UNIT_WIDTH=16;NDEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + QT_LARGEFILE_SUPPORT=64;QT_NO_FONTCONFIG;QT_QPA_DEFAULT_PLATFORM_NAME="windows";WIN32;_WINDOWS;NEUROMORE_PLATFORM_WINDOWS;__TBB_NO_IMPLICIT_LINKAGE;USE_WINTHREAD;OPENSSL_STATIC;OPENSSL_NO_DYNAMIC_ENGINE;QT_LINKED_OPENSSL;QT_STATIC;QT_NO_DEBUG;PCRE2_STATIC;PCRE2_CODE_UNIT_WIDTH=16;NDEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) $(IntDir) $(IntDir) $(OutDir)$(TargetName).pdb @@ -843,7 +843,7 @@ Studio.cmd MultiThreaded Level3 None - PRODUCTION_BUILD;QT_NO_FONTCONFIG;QT_QPA_DEFAULT_PLATFORM_NAME="windows";WIN32;_WINDOWS;NEUROMORE_PLATFORM_WINDOWS;__TBB_NO_IMPLICIT_LINKAGE;USE_WINTHREAD;OPENSSL_STATIC;OPENSSL_NO_DYNAMIC_ENGINE;QT_LINKED_OPENSSL;QT_STATIC;QT_NO_DEBUG;PCRE2_STATIC;PCRE2_CODE_UNIT_WIDTH=16;NDEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + QT_LARGEFILE_SUPPORT=64;PRODUCTION_BUILD;QT_NO_FONTCONFIG;QT_QPA_DEFAULT_PLATFORM_NAME="windows";WIN32;_WINDOWS;NEUROMORE_PLATFORM_WINDOWS;__TBB_NO_IMPLICIT_LINKAGE;USE_WINTHREAD;OPENSSL_STATIC;OPENSSL_NO_DYNAMIC_ENGINE;QT_LINKED_OPENSSL;QT_STATIC;QT_NO_DEBUG;PCRE2_STATIC;PCRE2_CODE_UNIT_WIDTH=16;NDEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) $(IntDir) $(IntDir) $(OutDir)$(TargetName).pdb diff --git a/deps/build/make/Makefile.android-linux b/deps/build/make/Makefile.android-linux new file mode 100644 index 000000000..bbde34d99 --- /dev/null +++ b/deps/build/make/Makefile.android-linux @@ -0,0 +1,158 @@ +# +# ANDROID CLANG MAKEFILE FOR LINUX +# + +# REQUIRED ENVIRONMENT ARGS: +# ANDROID_NDK_HOME Location of Android NDK +# JAVA_HOME Location of Java JDK + +# android ndk, toolchain and api version +TOOLCHAIN = $(ANDROID_NDK_HOME)/toolchains/llvm/prebuilt/linux-x86_64 +API = 21 + +######################################################################################### +# target platforms +# builds for ARM by default +# for x86/x64 use: make [..] ANDROID_TARGET=x86 + +ifeq ($(ANDROID_TARGET),x86) + TARGET_X86 = i686-linux-android + TARGET_X64 = x86_64-linux-android + TARGET_AR_X86 = i686-linux-android + TARGET_AR_X64 = x86_64-linux-android + SYSROOT_X86 = $(ANDROID_NDK_HOME)/platforms/android-$(API)/arch-x86 + SYSROOT_X64 = $(ANDROID_NDK_HOME)/platforms/android-$(API)/arch-x86_64 + ARCHFLAGS_X86 = -msse -msse2 -msse3 + ARCHFLAGS_X64 = -msse -msse2 -msse3 +else + TARGET_X86 = armv7a-linux-androideabi + TARGET_X64 = aarch64-linux-android + TARGET_AR_X86 = arm-linux-androideabi + TARGET_AR_X64 = aarch64-linux-android + SYSROOT_X86 = $(ANDROID_NDK_HOME)/platforms/android-$(API)/arch-arm + SYSROOT_X64 = $(ANDROID_NDK_HOME)/platforms/android-$(API)/arch-arm64 + ARCHFLAGS_X86 = -DANDROID_ARM_NEON=ON -march=armv7-a -mfloat-abi=softfp -mfpu=neon-fp16 + ARCHFLAGS_X64 = -DANDROID_ARM_NEON=ON -march=armv8-a +endif + +######################################################################################### + +# flags shared between all +FLAGS = -O3 \ + -fpic \ + -static \ + -DANDROID \ + -D__ANDROID_API__=$(API) \ + -D_SILENCE_CXX17_OLD_ALLOCATOR_MEMBERS_DEPRECATION_WARNING \ + -Wno-deprecated-declarations \ + -Wno-incompatible-pointer-types \ + -Wno-implicit-function-declaration \ + -Wno-implicit-int \ + -Wno-int-conversion + +# C Compiler +CC_X86 = $(TOOLCHAIN)/bin/$(TARGET_X86)$(API)-clang +CC_X64 = $(TOOLCHAIN)/bin/$(TARGET_X64)$(API)-clang +CFLAGS_X86 = -m32 --target=$(TARGET_X86) -isystem $(ANDROID_NDK_HOME)/sysroot/usr/include/$(TARGET_AR_X86) $(ARCHFLAGS_X86) $(FLAGS) +CFLAGS_X64 = -m64 --target=$(TARGET_X64) -isystem $(ANDROID_NDK_HOME)/sysroot/usr/include/$(TARGET_AR_X64) $(ARCHFLAGS_X64) $(FLAGS) + +# C++ Compiler +CXX_X86 = $(TOOLCHAIN)/bin/$(TARGET_X86)$(API)-clang++ +CXX_X64 = $(TOOLCHAIN)/bin/$(TARGET_X64)$(API)-clang++ +CXXFLAGS_ALL = -Xclang -flto-visibility-public-std $(FLAGS) +CXXFLAGS_A_X86 = -m32 -target $(TARGET_X86) -isystem $(ANDROID_NDK_HOME)/sysroot/usr/include/$(TARGET_AR_X86) $(ARCHFLAGS_X86) $(CXXFLAGS_ALL) +CXXFLAGS_A_X64 = -m64 -target $(TARGET_X64) -isystem $(ANDROID_NDK_HOME)/sysroot/usr/include/$(TARGET_AR_X64) $(ARCHFLAGS_X64) $(CXXFLAGS_ALL) +CXXFLAGS_X86 = $(CXXFLAGS_A_X86) -std=c++17 +CXXFLAGS_X64 = $(CXXFLAGS_A_X64) -std=c++17 +CXX14FLAGS_X86 = $(CXXFLAGS_A_X86) -std=c++14 +CXX14FLAGS_X64 = $(CXXFLAGS_A_X64) -std=c++14 + +# File Operations +define deletefilepattern + find $(1) -type f -name '$(2)' -delete +endef + +# AR +LIB_X86 = $(TOOLCHAIN)/bin/$(TARGET_AR_X86)-ar +LIB_X64 = $(TOOLCHAIN)/bin/$(TARGET_AR_X64)-ar +LIBFLAGS_X86 = rcs +LIBFLAGS_X64 = rcs + +# AR Functions +define createlib32 + $(LIB_X86) $(LIBFLAGS_X86) $(LIBDIR_X86)/$(1).a $(2) +endef +define createlib64 + $(LIB_X64) $(LIBFLAGS_X64) $(LIBDIR_X64)/$(1).a $(2) +endef + +# Linker +LINK_X86 = $(CXX_X86) +LINK_X64 = $(CXX_X64) +LINKFLAGS_X86 = --sysroot=$(SYSROOT_X86) $(CXXFLAGS_X86) +LINKFLAGS_X64 = --sysroot=$(SYSROOT_X64) $(CXXFLAGS_X64) + +# Linker Library Path +LINKPATH_X86 = \ + -L./lib/x86 \ + -L$(SYSROOT_X86)/usr/lib/ \ + -L$(TOOLCHAIN)/sysroot/usr/lib/$(TARGET_AR_X86)/$(API) \ + -L$(TOOLCHAIN)/sysroot/usr/lib/$(TARGET_AR_X86) + +LINKPATH_X64 = \ + -L./lib/x64 \ + -L$(SYSROOT_X64)/usr/lib/ \ + -L$(TOOLCHAIN)/sysroot/usr/lib/$(TARGET_AR_X64)/$(API) \ + -L$(TOOLCHAIN)/sysroot/usr/lib/$(TARGET_AR_X64) + +# Libraries for X86 and X64 +LINKLIBS_ALL = + +# Libraries for X86 or X64 +LINKLIBS_X86 = $(LINKLIBS_ALL) +LINKLIBS_X64 = $(LINKLIBS_ALL) + +# Linker Functions +define createbin32 + $(LINK_X86) $(LINKFLAGS_X86) $(LINKPATH_X86) $(2) $(3) $(LINKLIBS_X86) -o $(BINDIR_X86)/$(1) +endef +define createbin64 + $(LINK_X64) $(LINKFLAGS_X64) $(LINKPATH_X64) $(2) $(3) $(LINKLIBS_X64) -o $(BINDIR_X64)/$(1) +endef + +# Qt MOC+RCC+UIC +MOC_X86 = "../../prebuilt/linux/x64/qt-moc" +MOC_X64 = "../../prebuilt/linux/x64/qt-moc" +ifneq (,$(findstring x86,$(MAKECMDGOALS))) + MOC = $(MOC_X86) +endif +ifneq (,$(findstring x64,$(MAKECMDGOALS))) + MOC = $(MOC_X64) +endif + +RCC_X86 = "../../prebuilt/linux/x64/qt-rcc" +RCC_X64 = "../../prebuilt/linux/x64/qt-rcc" +ifneq (,$(findstring x86,$(MAKECMDGOALS))) + RCC = $(RCC_X86) +endif +ifneq (,$(findstring x64,$(MAKECMDGOALS))) + RCC = $(RCC_X64) +endif + +UIC_X86 = "../../prebuilt/linux/x64/qt-uic" +UIC_X64 = "../../prebuilt/linux/x64/qt-uic" +ifneq (,$(findstring x86,$(MAKECMDGOALS))) + UIC = $(UIC_X86) +endif +ifneq (,$(findstring x64,$(MAKECMDGOALS))) + UIC = $(UIC_X64) +endif + +# Platform specific bash file exists check +QTCORE_MOC_CMD_X86 = if [ -f $(@:$(QTCORE_MOCDIR_X86)/%.moc=$(QTCORE_SRCDIR)/%.cpp) ]; then $(QTCORE_MOC_C_X86); else $(QTCORE_MOC_MM_X86); fi +QTCORE_MOC_CMD_X64 = if [ -f $(@:$(QTCORE_MOCDIR_X64)/%.moc=$(QTCORE_SRCDIR)/%.cpp) ]; then $(QTCORE_MOC_C_X64); else $(QTCORE_MOC_MM_X64); fi + +##################################################################################### + +# Include Common Parts +include Makefile.android-shared diff --git a/deps/build/make/Makefile.android-osx b/deps/build/make/Makefile.android-osx new file mode 100644 index 000000000..160ff50f5 --- /dev/null +++ b/deps/build/make/Makefile.android-osx @@ -0,0 +1,157 @@ +# +# ANDROID CLANG MAKEFILE FOR OSX +# + +# REQUIRED ENVIRONMENT ARGS: +# ANDROID_NDK_HOME Location of Android NDK + +# android ndk, toolchain and api version +TOOLCHAIN = $(ANDROID_NDK_HOME)/toolchains/llvm/prebuilt/darwin-x86_64 +API = 21 + +######################################################################################### +# target platforms +# builds for ARM by default +# for x86/x64 use: make [..] ANDROID_TARGET=x86 + +ifeq ($(ANDROID_TARGET),x86) + TARGET_X86 = i686-linux-android + TARGET_X64 = x86_64-linux-android + TARGET_AR_X86 = i686-linux-android + TARGET_AR_X64 = x86_64-linux-android + SYSROOT_X86 = $(ANDROID_NDK_HOME)/platforms/android-$(API)/arch-x86 + SYSROOT_X64 = $(ANDROID_NDK_HOME)/platforms/android-$(API)/arch-x86_64 + ARCHFLAGS_X86 = -msse -msse2 -msse3 + ARCHFLAGS_X64 = -msse -msse2 -msse3 +else + TARGET_X86 = armv7a-linux-androideabi + TARGET_X64 = aarch64-linux-android + TARGET_AR_X86 = arm-linux-androideabi + TARGET_AR_X64 = aarch64-linux-android + SYSROOT_X86 = $(ANDROID_NDK_HOME)/platforms/android-$(API)/arch-arm + SYSROOT_X64 = $(ANDROID_NDK_HOME)/platforms/android-$(API)/arch-arm64 + ARCHFLAGS_X86 = -DANDROID_ARM_NEON=ON -march=armv7-a -mfloat-abi=softfp -mfpu=neon-fp16 + ARCHFLAGS_X64 = -DANDROID_ARM_NEON=ON -march=armv8-a +endif + +######################################################################################### + +# flags shared between all +FLAGS = -O3 \ + -fpic \ + -static \ + -DANDROID \ + -D__ANDROID_API__=$(API) \ + -D_SILENCE_CXX17_OLD_ALLOCATOR_MEMBERS_DEPRECATION_WARNING \ + -Wno-deprecated-declarations \ + -Wno-incompatible-pointer-types \ + -Wno-implicit-function-declaration \ + -Wno-implicit-int \ + -Wno-int-conversion + +# C Compiler +CC_X86 = $(TOOLCHAIN)/bin/$(TARGET_X86)$(API)-clang +CC_X64 = $(TOOLCHAIN)/bin/$(TARGET_X64)$(API)-clang +CFLAGS_X86 = -m32 --target=$(TARGET_X86) -isystem $(ANDROID_NDK_HOME)/sysroot/usr/include/$(TARGET_AR_X86) $(ARCHFLAGS_X86) $(FLAGS) +CFLAGS_X64 = -m64 --target=$(TARGET_X64) -isystem $(ANDROID_NDK_HOME)/sysroot/usr/include/$(TARGET_AR_X64) $(ARCHFLAGS_X64) $(FLAGS) + +# C++ Compiler +CXX_X86 = $(TOOLCHAIN)/bin/$(TARGET_X86)$(API)-clang++ +CXX_X64 = $(TOOLCHAIN)/bin/$(TARGET_X64)$(API)-clang++ +CXXFLAGS_ALL = -Xclang -flto-visibility-public-std $(FLAGS) +CXXFLAGS_A_X86 = -m32 -target $(TARGET_X86) -isystem $(ANDROID_NDK_HOME)/sysroot/usr/include/$(TARGET_AR_X86) $(ARCHFLAGS_X86) $(CXXFLAGS_ALL) +CXXFLAGS_A_X64 = -m64 -target $(TARGET_X64) -isystem $(ANDROID_NDK_HOME)/sysroot/usr/include/$(TARGET_AR_X64) $(ARCHFLAGS_X64) $(CXXFLAGS_ALL) +CXXFLAGS_X86 = $(CXXFLAGS_A_X86) -std=c++17 +CXXFLAGS_X64 = $(CXXFLAGS_A_X64) -std=c++17 +CXX14FLAGS_X86 = $(CXXFLAGS_A_X86) -std=c++14 +CXX14FLAGS_X64 = $(CXXFLAGS_A_X64) -std=c++14 + +# File Operations +define deletefilepattern + find $(1) -type f -name '$(2)' -delete +endef + +# AR +LIB_X86 = $(TOOLCHAIN)/bin/$(TARGET_AR_X86)-ar +LIB_X64 = $(TOOLCHAIN)/bin/$(TARGET_AR_X64)-ar +LIBFLAGS_X86 = rcs +LIBFLAGS_X64 = rcs + +# AR Functions +define createlib32 + $(LIB_X86) $(LIBFLAGS_X86) $(LIBDIR_X86)/$(1).a $(2) +endef +define createlib64 + $(LIB_X64) $(LIBFLAGS_X64) $(LIBDIR_X64)/$(1).a $(2) +endef + +# Linker +LINK_X86 = $(CXX_X86) +LINK_X64 = $(CXX_X64) +LINKFLAGS_X86 = --sysroot=$(SYSROOT_X86) $(CXXFLAGS_X86) +LINKFLAGS_X64 = --sysroot=$(SYSROOT_X64) $(CXXFLAGS_X64) + +# Linker Library Path +LINKPATH_X86 = \ + -L./lib/x86 \ + -L$(SYSROOT_X86)/usr/lib/ \ + -L$(TOOLCHAIN)/sysroot/usr/lib/$(TARGET_AR_X86)/$(API) \ + -L$(TOOLCHAIN)/sysroot/usr/lib/$(TARGET_AR_X86) + +LINKPATH_X64 = \ + -L./lib/x64 \ + -L$(SYSROOT_X64)/usr/lib/ \ + -L$(TOOLCHAIN)/sysroot/usr/lib/$(TARGET_AR_X64)/$(API) \ + -L$(TOOLCHAIN)/sysroot/usr/lib/$(TARGET_AR_X64) + +# Libraries for X86 and X64 +LINKLIBS_ALL = + +# Libraries for X86 or X64 +LINKLIBS_X86 = $(LINKLIBS_ALL) +LINKLIBS_X64 = $(LINKLIBS_ALL) + +# Linker Functions +define createbin32 + $(LINK_X86) $(LINKFLAGS_X86) $(LINKPATH_X86) $(2) $(3) $(LINKLIBS_X86) -o $(BINDIR_X86)/$(1) +endef +define createbin64 + $(LINK_X64) $(LINKFLAGS_X64) $(LINKPATH_X64) $(2) $(3) $(LINKLIBS_X64) -o $(BINDIR_X64)/$(1) +endef + +# Qt MOC+RCC+UIC +MOC_X86 = "../../prebuilt/osx/x64/qt-moc" +MOC_X64 = "../../prebuilt/osx/x64/qt-moc" +ifneq (,$(findstring x86,$(MAKECMDGOALS))) + MOC = $(MOC_X86) +endif +ifneq (,$(findstring x64,$(MAKECMDGOALS))) + MOC = $(MOC_X64) +endif + +RCC_X86 = "../../prebuilt/osx/x64/qt-rcc" +RCC_X64 = "../../prebuilt/osx/x64/qt-rcc" +ifneq (,$(findstring x86,$(MAKECMDGOALS))) + RCC = $(RCC_X86) +endif +ifneq (,$(findstring x64,$(MAKECMDGOALS))) + RCC = $(RCC_X64) +endif + +UIC_X86 = "../../prebuilt/osx/x64/qt-uic" +UIC_X64 = "../../prebuilt/osx/x64/qt-uic" +ifneq (,$(findstring x86,$(MAKECMDGOALS))) + UIC = $(UIC_X86) +endif +ifneq (,$(findstring x64,$(MAKECMDGOALS))) + UIC = $(UIC_X64) +endif + +# Platform specific bash file exists check +QTCORE_MOC_CMD_X86 = if [ -f $(@:$(QTCORE_MOCDIR_X86)/%.moc=$(QTCORE_SRCDIR)/%.cpp) ]; then $(QTCORE_MOC_C_X86); else $(QTCORE_MOC_MM_X86); fi +QTCORE_MOC_CMD_X64 = if [ -f $(@:$(QTCORE_MOCDIR_X64)/%.moc=$(QTCORE_SRCDIR)/%.cpp) ]; then $(QTCORE_MOC_C_X64); else $(QTCORE_MOC_MM_X64); fi + +##################################################################################### + +# Include Common Parts +include Makefile.android-shared diff --git a/deps/build/make/Makefile.android-shared b/deps/build/make/Makefile.android-shared new file mode 100644 index 000000000..8aa618d65 --- /dev/null +++ b/deps/build/make/Makefile.android-shared @@ -0,0 +1,569 @@ +# Shared between Win/Linux/Mac + +# Platform Specific additional defines +LIBCRYPTO_DEFINES_X86_PLAT = -DOPENSSLDIR=\"/etc/ssl\" -DENGINESDIR=\".\" +LIBCRYPTO_DEFINES_X64_PLAT = -DOPENSSLDIR=\"/etc/ssl\" -DENGINESDIR=\".\" +LIBSSL_DEFINES_X86_PLAT = -DOPENSSLDIR=\"/etc/ssl\" -DENGINESDIR=\".\" +LIBSSL_DEFINES_X64_PLAT = -DOPENSSLDIR=\"/etc/ssl\" -DENGINESDIR=\".\" +FONTCONFIG_DEFINES_X86_PLAT = +FONTCONFIG_DEFINES_X64_PLAT = +OPENCVCORE_DEFINES_X86_PLAT = +OPENCVCORE_DEFINES_X64_PLAT = +OPENCVIMGCODECS_DEFINES_X86_PLAT = +OPENCVIMGCODECS_DEFINES_X64_PLAT = +OPENCVIMGPROC_DEFINES_X86_PLAT = +OPENCVIMGPROC_DEFINES_X64_PLAT = +OPENCVVIDEOIO_DEFINES_X86_PLAT = +OPENCVVIDEOIO_DEFINES_X64_PLAT = +QTBOOTSTRAP_DEFINES_X86_PLAT = +QTBOOTSTRAP_DEFINES_X64_PLAT = +QTMOC_DEFINES_X86_PLAT = +QTMOC_DEFINES_X64_PLAT = +QTRCC_DEFINES_X86_PLAT = +QTRCC_DEFINES_X64_PLAT = +QTUIC_DEFINES_X86_PLAT = +QTUIC_DEFINES_X64_PLAT = +QTBLUETOOTH_DEFINES_X86_PLAT = -DQT_ANDROID_BLUETOOTH -DQT_FEATURE_bluez=-1 -DQT_FEATURE_dbus=-1 +QTBLUETOOTH_DEFINES_X64_PLAT = -DQT_ANDROID_BLUETOOTH -DQT_FEATURE_bluez=-1 -DQT_FEATURE_dbus=-1 +QTCONCURRENT_DEFINES_X86_PLAT = +QTCONCURRENT_DEFINES_X64_PLAT = +QTCORE_DEFINES_X86_PLAT = -DQT_UNIX_SEMAPHORE -DQT_FEATURE_dbus=-1 +QTCORE_DEFINES_X64_PLAT = -DQT_UNIX_SEMAPHORE -DQT_FEATURE_dbus=-1 +QTDBUS_DEFINES_X86_PLAT = -DQT_FEATURE_dbus=-1 +QTDBUS_DEFINES_X64_PLAT = -DQT_FEATURE_dbus=-1 +QTEVENTDISPATCHERS_DEFINES_X86_PLAT = +QTEVENTDISPATCHERS_DEFINES_X64_PLAT = +QTFONTDATABASES_DEFINES_X86_PLAT = -DQT_FEATURE_fontconfig=-1 +QTFONTDATABASES_DEFINES_X64_PLAT = -DQT_FEATURE_fontconfig=-1 +QTGAMEPAD_DEFINES_X86_PLAT = +QTGAMEPAD_DEFINES_X64_PLAT = +QTGUI_DEFINES_X86_PLAT = -DQT_QPA_DEFAULT_PLATFORM_NAME=\"android\" -DQT_FEATURE_fontconfig=-1 -DQT_FEATURE_dbus=-1 +QTGUI_DEFINES_X64_PLAT = -DQT_QPA_DEFAULT_PLATFORM_NAME=\"android\" -DQT_FEATURE_fontconfig=-1 -DQT_FEATURE_dbus=-1 +QTMULTIMEDIA_DEFINES_X86_PLAT = +QTMULTIMEDIA_DEFINES_X64_PLAT = +QTMULTIMEDIAWIDGETS_DEFINES_X86_PLAT= +QTMULTIMEDIAWIDGETS_DEFINES_X64_PLAT= +QTNETWORK_DEFINES_X86_PLAT = -DOPENSSLDIR=\"/etc/ssl\" -DENGINESDIR=\".\" +QTNETWORK_DEFINES_X64_PLAT = -DOPENSSLDIR=\"/etc/ssl\" -DENGINESDIR=\".\" +QTOPENGL_DEFINES_X86_PLAT = -DQT_OPENGL_ES -DQT_OPENGL_ES_2 -DQT_OPENGL_ES_3 +QTOPENGL_DEFINES_X64_PLAT = -DQT_OPENGL_ES -DQT_OPENGL_ES_2 -DQT_OPENGL_ES_3 +QTPLATFORMWINDOWS_DEFINES_X86_PLAT = +QTPLATFORMWINDOWS_DEFINES_X64_PLAT = +QTPLATFORMXCB_DEFINES_X86_PLAT = -DQT_QPA_DEFAULT_PLATFORM_NAME=\"android\" -DQT_FEATURE_fontconfig=-1 -DQT_FEATURE_dbus=-1 +QTPLATFORMXCB_DEFINES_X64_PLAT = -DQT_QPA_DEFAULT_PLATFORM_NAME=\"android\" -DQT_FEATURE_fontconfig=-1 -DQT_FEATURE_dbus=-1 +QTPLATFORMCOCOA_DEFINES_X86_PLAT = +QTPLATFORMCOCOA_DEFINES_X64_PLAT = +QTPRINTSUPPORT_DEFINES_X86_PLAT = +QTPRINTSUPPORT_DEFINES_X64_PLAT = +QTSERIALPORT_DEFINES_X86_PLAT = +QTSERIALPORT_DEFINES_X64_PLAT = +QTWIDGETS_DEFINES_X86_PLAT = +QTWIDGETS_DEFINES_X64_PLAT = +QTXML_DEFINES_X86_PLAT = +QTXML_DEFINES_X64_PLAT = +SINGLEAPPLICATION_DEFINES_X86_PLAT = +SINGLEAPPLICATION_DEFINES_X64_PLAT = + +# Platform Specific additional includes +OPENCVCORE_INCLUDES_X86_PLAT = +OPENCVCORE_INCLUDES_X64_PLAT = +OPENCVIMGCODECS_INCLUDES_X86_PLAT = +OPENCVIMGCODECS_INCLUDES_X64_PLAT = +OPENCVIMGPROC_INCLUDES_X86_PLAT = +OPENCVIMGPROC_INCLUDES_X64_PLAT = +OPENCVVIDEOIO_INCLUDES_X86_PLAT = +OPENCVVIDEOIO_INCLUDES_X64_PLAT = +QTBOOTSTRAP_INCLUDES_X86_PLAT = -I../../include/qt/mkspecs/android-clang +QTBOOTSTRAP_INCLUDES_X64_PLAT = -I../../include/qt/mkspecs/android-clang +QTMOC_INCLUDES_X86_PLAT = -I../../include/qt/mkspecs/android-clang +QTMOC_INCLUDES_X64_PLAT = -I../../include/qt/mkspecs/android-clang +QTRCC_INCLUDES_X86_PLAT = -I../../include/qt/mkspecs/android-clang +QTRCC_INCLUDES_X64_PLAT = -I../../include/qt/mkspecs/android-clang +QTUIC_INCLUDES_X86_PLAT = -I../../include/qt/mkspecs/android-clang +QTUIC_INCLUDES_X64_PLAT = -I../../include/qt/mkspecs/android-clang +QTBLUETOOTH_INCLUDES_X86_PLAT = -I../../include/qt/mkspecs/android-clang +QTBLUETOOTH_INCLUDES_X64_PLAT = -I../../include/qt/mkspecs/android-clang +QTCONCURRENT_INCLUDES_X86_PLAT = -I../../include/qt/mkspecs/android-clang +QTCONCURRENT_INCLUDES_X64_PLAT = -I../../include/qt/mkspecs/android-clang +QTCORE_INCLUDES_X86_PLAT = -I../../include/qt/mkspecs/android-clang -I../../include/forkfd +QTCORE_INCLUDES_X64_PLAT = -I../../include/qt/mkspecs/android-clang -I../../include/forkfd +QTDBUS_INCLUDES_X86_PLAT = -I../../include/qt/mkspecs/android-clang +QTDBUS_INCLUDES_X64_PLAT = -I../../include/qt/mkspecs/android-clang +QTEVENTDISPATCHERS_INCLUDES_X86_PLAT = -I../../include/qt/mkspecs/android-clang +QTEVENTDISPATCHERS_INCLUDES_X64_PLAT = -I../../include/qt/mkspecs/android-clang +QTFONTDATABASES_INCLUDES_X86_PLAT = -I../../include/qt/mkspecs/android-clang +QTFONTDATABASES_INCLUDES_X64_PLAT = -I../../include/qt/mkspecs/android-clang +QTGAMEPAD_INCLUDES_X86_PLAT = -I../../include/qt/mkspecs/android-clang +QTGAMEPAD_INCLUDES_X64_PLAT = -I../../include/qt/mkspecs/android-clang +QTGUI_INCLUDES_X86_PLAT = -I../../include/qt/mkspecs/android-clang +QTGUI_INCLUDES_X64_PLAT = -I../../include/qt/mkspecs/android-clang +QTMULTIMEDIA_INCLUDES_X86_PLAT = -I../../include/qt/mkspecs/android-clang +QTMULTIMEDIA_INCLUDES_X64_PLAT = -I../../include/qt/mkspecs/android-clang +QTMULTIMEDIAWIDGETS_INCLUDES_X86_PLAT= -I../../include/qt/mkspecs/android-clang +QTMULTIMEDIAWIDGETS_INCLUDES_X64_PLAT= -I../../include/qt/mkspecs/android-clang +QTNETWORK_INCLUDES_X86_PLAT = -I../../include/qt/mkspecs/android-clang +QTNETWORK_INCLUDES_X64_PLAT = -I../../include/qt/mkspecs/android-clang +QTOPENGL_INCLUDES_X86_PLAT = -I../../include/qt/mkspecs/android-clang +QTOPENGL_INCLUDES_X64_PLAT = -I../../include/qt/mkspecs/android-clang +QTPLATFORMWINDOWS_INCLUDES_X86_PLAT = -I../../include/qt/mkspecs/android-clang +QTPLATFORMWINDOWS_INCLUDES_X64_PLAT = -I../../include/qt/mkspecs/android-clang +QTPLATFORMXCB_INCLUDES_X86_PLAT = -I../../include/qt/mkspecs/android-clang +QTPLATFORMXCB_INCLUDES_X64_PLAT = -I../../include/qt/mkspecs/android-clang +QTPLATFORMCOCOA_INCLUDES_X86_PLAT = -I../../include/qt/mkspecs/android-clang +QTPLATFORMCOCOA_INCLUDES_X64_PLAT = -I../../include/qt/mkspecs/android-clang +QTPRINTSUPPORT_INCLUDES_X86_PLAT = -I../../include/qt/mkspecs/android-clang +QTPRINTSUPPORT_INCLUDES_X64_PLAT = -I../../include/qt/mkspecs/android-clang +QTSERIALPORT_INCLUDES_X86_PLAT = -I../../include/qt/mkspecs/android-clang +QTSERIALPORT_INCLUDES_X64_PLAT = -I../../include/qt/mkspecs/android-clang +QTWIDGETS_INCLUDES_X86_PLAT = -I../../include/qt/mkspecs/android-clang +QTWIDGETS_INCLUDES_X64_PLAT = -I../../include/qt/mkspecs/android-clang +QTXML_INCLUDES_X86_PLAT = -I../../include/qt/mkspecs/android-clang +QTXML_INCLUDES_X64_PLAT = -I../../include/qt/mkspecs/android-clang +SINGLEAPPLICATION_INCLUDES_X86_PLAT = -I../../include/qt/mkspecs/android-clang +SINGLEAPPLICATION_INCLUDES_X64_PLAT = -I../../include/qt/mkspecs/android-clang + +##################################################################################### +# Include Common Makefile +include Makefile.common + +##################################################################################### +# Platform Specific additional objects to build +##################################################################################### + +# Small libraries +ZLIB_OBJS = $(ZLIB_OBJS_ALL) +LIBCRYPTO_OBJS = $(LIBCRYPTO_OBJS_ALL) +LIBSSL_OBJS = $(LIBSSL_OBJS_ALL) +LIBPNG_OBJS = $(LIBPNG_OBJS_ALL) +LIBJPEG_OBJS = $(LIBJPEG_OBJS_ALL) +PCRE2_OBJS = $(PCRE2_OBJS_ALL) +DOUBLECONV_OBJS = $(DOUBLECONV_OBJS_ALL) +EDFLIB_OBJS = $(EDFLIB_OBJS_ALL) +FONTCONFIG_OBJS = $(FONTCONFIG_OBJS_ALL) \ + fcarch.o fcatomic.o fccache.o fccfg.o fccharset.o fccompat.o \ + fcdbg.o fcdefault.o fcdir.o fcformat.o fcfreetype.o fcfs.o \ + fchash.o fcinit.o fclang.o fclist.o fcmatch.o fcmatrix.o \ + fcname.o fcobjs.o fcpat.o fcptrlist.o fcrange.o fcserialize.o \ + fcstat.o fcstr.o fcweight.o fcxml.o ftglue.o +FREETYPE_OBJS = $(FREETYPE_OBJS_ALL) +HARFBUZZ_OBJS_C = $(HARFBUZZ_OBJS_ALL_C) +HARFBUZZ_OBJS_CXX = $(HARFBUZZ_OBJS_ALL_CXX) +HARFBUZZNG_OBJS = $(HARFBUZZNG_OBJS_ALL) +KISSFFT_OBJS = $(KISSFFT_OBJS_ALL) +MINIZIP_OBJS = $(MINIZIP_OBJS_ALL) +OPENCVCORE_OBJS = $(OPENCVCORE_OBJS_ALL) +OPENCVIMGCODECS_OBJS = $(OPENCVIMGCODECS_OBJS_ALL) +OPENCVIMGPROC_OBJS = $(OPENCVIMGPROC_OBJS_ALL) +OPENCVVIDEOIO_OBJS = $(OPENCVVIDEOIO_OBJS_ALL) \ + cap_v4l.o +OSCPACK_OBJS = $(OSCPACK_OBJS_ALL) +TINYAES_OBJS = $(TINYAES_OBJS_ALL) +TINYOBJLOADER_OBJS = $(TINYOBJLOADER_OBJS_ALL) +TINYXML_OBJS = $(TINYXML_OBJS_ALL) + +# Qt Bootstrap +QTBOOTSTRAP_OBJS = $(QTBOOTSTRAP_OBJS_ALL) \ + qt-core/io/qfilesystemengine_unix.o \ + qt-core/io/qfilesystemiterator_unix.o \ + qt-core/io/qfsfileengine_unix.o \ + qt-core/io/qstandardpaths_unix.o \ + qt-core/kernel/qcore_unix.o + +# Qt Tools +QTMOC_OBJS = $(QTMOC_OBJS_ALL) +QTMOC_LIBS_X86 = $(LIBDIR_X86)/qt-bootstrap.a $(LIBDIR_X86)/zlib.a +QTMOC_LIBS_X64 = $(LIBDIR_X64)/qt-bootstrap.a $(LIBDIR_X64)/zlib.a +QTRCC_OBJS = $(QTRCC_OBJS_ALL) +QTRCC_LIBS_X86 = $(LIBDIR_X86)/qt-bootstrap.a $(LIBDIR_X86)/zlib.a +QTRCC_LIBS_X64 = $(LIBDIR_X64)/qt-bootstrap.a $(LIBDIR_X64)/zlib.a +QTUIC_OBJS = $(QTUIC_OBJS_ALL) +QTUIC_LIBS_X86 = $(LIBDIR_X86)/qt-bootstrap.a $(LIBDIR_X86)/zlib.a +QTUIC_LIBS_X64 = $(LIBDIR_X64)/qt-bootstrap.a $(LIBDIR_X64)/zlib.a + +# Qt Libraries +QTBLUETOOTH_MOCH = $(QTBLUETOOTH_MOCH_ALL) \ + private/qbluetoothsocket_android_p.cpp \ + private/qlowenergycontroller_p.cpp \ + private/qlowenergycontroller_android_p.cpp \ + private/qlowenergyserviceprivate_p.cpp \ + private/android/androidbroadcastreceiver_p.cpp \ + private/android/devicediscoverybroadcastreceiver_p.cpp \ + private/android/inputstreamthread_p.cpp \ + private/android/jni_android_p.cpp \ + private/android/localdevicebroadcastreceiver_p.cpp \ + private/android/lowenergynotificationhub_p.cpp \ + private/android/serveracceptancethread_p.cpp \ + private/android/servicediscoverybroadcastreceiver_p.cpp +QTBLUETOOTH_MOCC = $(QTBLUETOOTH_MOCC_ALL) \ + qbluetoothsocket_android.moc +QTBLUETOOTH_OBJS = $(QTBLUETOOTH_OBJS_ALL) \ + qbluetoothdevicediscoveryagent.o \ + qbluetoothdevicediscoveryagent_android.o \ + qbluetoothlocaldevice_android.o \ + qbluetoothserver.o \ + qbluetoothserver_android.o \ + qbluetoothservicediscoveryagent.o \ + qbluetoothservicediscoveryagent_android.o \ + qbluetoothserviceinfo.o \ + qbluetoothserviceinfo_android.o \ + qbluetoothsocket.o \ + qbluetoothsocket_android.o \ + qbluetoothsocketbase.o \ + qlowenergycontroller.o \ + qlowenergycontroller_android.o \ + qlowenergycontrollerbase.o \ + qlowenergyservice.o +QTBLUETOOTH_OBJS_MOC = $(QTBLUETOOTH_OBJS_MOC_ALL) \ + androidbroadcastreceiver_p.omoc \ + devicediscoverybroadcastreceiver_p.omoc \ + inputstreamthread_p.omoc \ + jni_android_p.omoc \ + localdevicebroadcastreceiver_p.omoc \ + lowenergynotificationhub_p.omoc \ + serveracceptancethread_p.omoc \ + servicediscoverybroadcastreceiver_p.omoc \ + qbluetoothsocket_android_p.omoc \ + qlowenergycontroller_p.omoc \ + qlowenergycontroller_android_p.omoc \ + qlowenergyserviceprivate_p.omoc +QTCONCURRENT_OBJS = $(QTCONCURRENT_OBJS_ALL) +QTCORE_MOCH = $(QTCORE_MOCH_ALL) \ + private/qeventdispatcher_unix_p.cpp \ + private/qfilesystemwatcher_kqueue_p.cpp \ + private/qfilesystemwatcher_inotify_p.cpp +QTCORE_MOCC = $(QTCORE_MOCC_ALL) +QTCORE_UICH = $(QTCORE_UICH_ALL) +QTCORE_RCCH = $(QTCORE_RCCH_ALL) +QTCORE_OBJS = $(QTCORE_OBJS_ALL) \ + io/forkfd_qt.o \ + io/qfilesystemengine_unix.o \ + io/qfilesystemiterator_unix.o \ + io/qfilesystemwatcher_inotify.o \ + io/qfsfileengine_unix.o \ + io/qlockfile_unix.o \ + io/qprocess_unix.o \ + io/qstandardpaths_unix.o \ + io/qstorageinfo_unix.o \ + kernel/qcore_unix.o \ + kernel/qelapsedtimer_unix.o \ + kernel/qeventdispatcher_unix.o \ + kernel/qpoll.o \ + kernel/qsharedmemory_android.o \ + kernel/qsharedmemory_unix.o \ + kernel/qsystemsemaphore_android.o \ + kernel/qsystemsemaphore_unix.o \ + kernel/qtimerinfo_unix.o \ + plugin/qelfparser_p.o \ + plugin/qlibrary_unix.o \ + thread/qthread_unix.o \ + thread/qwaitcondition_unix.o \ + tools/qcollator_posix.o \ + tools/qlocale_unix.o \ + tools/qtimezoneprivate_android.o +QTCORE_OBJS_MOC = $(QTCORE_OBJS_MOC_ALL) +QTCORE_OBJS_RCC = $(QTCORE_OBJS_RCC_ALL) +QTDBUS_MOCH = $(QTDBUS_MOCH_ALL) \ + qdbusabstractinterface.cpp \ + qdbuspendingcall.cpp \ + qdbusserver.cpp \ + qdbusservicewatcher.cpp \ + private/qdbusconnection_p.cpp \ + private/qdbusconnectionmanager_p.cpp \ + private/qdbuspendingcall_p.cpp \ + qdbusabstractadaptor.cpp \ + qdbusconnection.cpp \ + qdbusconnectioninterface.cpp \ + qdbusservicewatcher.cpp \ + qdbusvirtualobject.cpp +QTDBUS_MOCC = $(QTDBUS_MOCC_ALL) +QTDBUS_UICH = $(QTDBUS_UICH_ALL) +QTDBUS_RCCH = $(QTDBUS_RCCH_ALL) +QTDBUS_OBJS = $(QTDBUS_OBJS_ALL) \ + qdbus_symbols.o \ + qdbusabstractadaptor.o \ + qdbusabstractinterface.o \ + qdbusargument.o \ + qdbusconnection.o \ + qdbusconnectioninterface.o \ + qdbuscontext.o \ + qdbusdemarshaller.o \ + qdbuserror.o \ + qdbusextratypes.o \ + qdbusintegrator.o \ + qdbusinterface.o \ + qdbusinternalfilters.o \ + qdbusintrospection.o \ + qdbusmarshaller.o \ + qdbusmessage.o \ + qdbusmetaobject.o \ + qdbusmetatype.o \ + qdbusmisc.o \ + qdbuspendingcall.o \ + qdbuspendingreply.o \ + qdbusreply.o \ + qdbusserver.o \ + qdbusservicewatcher.o \ + qdbusunixfiledescriptor.o \ + qdbusutil.o \ + qdbusvirtualobject.o \ + qdbusxmlgenerator.o \ + qdbusxmlparser.o +QTDBUS_OBJS_MOC = $(QTDBUS_OBJS_MOC_ALL) \ + qdbusabstractadaptor.omoc \ + qdbusconnection.omoc \ + qdbusconnection_p.omoc \ + qdbusconnectioninterface.omoc \ + qdbusconnectionmanager_p.omoc \ + qdbuspendingcall_p.omoc \ + qdbusvirtualobject.omoc +QTDBUS_OBJS_RCC = $(QTDBUS_OBJS_RCC_ALL) +QTEVENTDISPATCHERS_MOCH = $(QTEVENTDISPATCHERS_MOCH_ALL) \ + private/qunixeventdispatcher_qpa_p.cpp +QTEVENTDISPATCHERS_MOCC = $(QTEVENTDISPATCHERS_MOCC_ALL) +QTEVENTDISPATCHERS_UICH = $(QTEVENTDISPATCHERS_UICH_ALL) +QTEVENTDISPATCHERS_RCCH = $(QTEVENTDISPATCHERS_RCCH_ALL) +QTEVENTDISPATCHERS_OBJS = $(QTEVENTDISPATCHERS_OBJS_ALL) \ + qunixeventdispatcher.o +QTEVENTDISPATCHERS_OBJS_MOC = $(QTEVENTDISPATCHERS_OBJS_MOC_ALL) +QTEVENTDISPATCHERS_OBJS_RCC = $(QTEVENTDISPATCHERS_OBJS_RCC_ALL) +QTFONTDATABASES_MOCH = $(QTFONTDATABASES_MOCH_ALL) +QTFONTDATABASES_MOCC = $(QTFONTDATABASES_MOCC_ALL) +QTFONTDATABASES_UICH = $(QTFONTDATABASES_UICH_ALL) +QTFONTDATABASES_RCCH = $(QTFONTDATABASES_RCCH_ALL) +QTFONTDATABASES_OBJS = $(QTFONTDATABASES_OBJS_ALL) \ + fontconfig/qfontconfigdatabase.o \ + fontconfig/qfontenginemultifontconfig.o +QTFONTDATABASES_OBJS_MOC = $(QTFONTDATABASES_OBJS_MOC_ALL) +QTFONTDATABASES_OBJS_RCC = $(QTFONTDATABASES_OBJS_RCC_ALL) +QTGAMEPAD_MOCH = $(QTGAMEPAD_MOCH_ALL) +QTGAMEPAD_MOCC = $(QTGAMEPAD_MOCC_ALL) +QTGAMEPAD_OBJS = $(QTGAMEPAD_OBJS_ALL) +QTGAMEPAD_OBJS_MOC = $(QTGAMEPAD_OBJS_MOC_ALL) +QTGUI_MOCH = $(QTGUI_MOCH_ALL) +QTGUI_MOCC = $(QTGUI_MOCC_ALL) +QTGUI_UICH = $(QTGUI_UICH_ALL) +QTGUI_RCCH = $(QTGUI_RCCH_ALL) +QTGUI_OBJS = $(QTGUI_OBJS_ALL) \ + opengl/qopenglfunctions_es2.o +QTGUI_OBJS_C = $(QTGUI_OBJS_C_ALL) +QTGUI_OBJS_MOC = $(QTGUI_OBJS_MOC_ALL) +QTGUI_OBJS_RCC = $(QTGUI_OBJS_RCC_ALL) +QTMULTIMEDIA_MOCH = $(QTMULTIMEDIA_MOCH_ALL) +QTMULTIMEDIA_MOCC = $(QTMULTIMEDIA_MOCC_ALL) +QTMULTIMEDIA_UICH = $(QTMULTIMEDIA_UICH_ALL) +QTMULTIMEDIA_RCCH = $(QTMULTIMEDIA_RCCH_ALL) +QTMULTIMEDIA_OBJS = $(QTMULTIMEDIA_OBJS_ALL) +QTMULTIMEDIA_OBJS_MOC = $(QTMULTIMEDIA_OBJS_MOC_ALL) +QTMULTIMEDIA_OBJS_RCC = $(QTMULTIMEDIA_OBJS_RCC_ALL) +QTMULTIMEDIAWIDGETS_MOCH = $(QTMULTIMEDIAWIDGETS_MOCH_ALL) +QTMULTIMEDIAWIDGETS_MOCC = $(QTMULTIMEDIAWIDGETS_MOCC_ALL) +QTMULTIMEDIAWIDGETS_UICH = $(QTMULTIMEDIAWIDGETS_UICH_ALL) +QTMULTIMEDIAWIDGETS_RCCH = $(QTMULTIMEDIAWIDGETS_RCCH_ALL) +QTMULTIMEDIAWIDGETS_OBJS = $(QTMULTIMEDIAWIDGETS_OBJS_ALL) +QTMULTIMEDIAWIDGETS_OBJS_MOC= $(QTMULTIMEDIAWIDGETS_OBJS_MOC_ALL) +QTMULTIMEDIAWIDGETS_OBJS_RCC= $(QTMULTIMEDIAWIDGETS_OBJS_RCC_ALL) +QTNETWORK_MOCH = $(QTNETWORK_MOCH_ALL) +QTNETWORK_MOCC = $(QTNETWORK_MOCC_ALL) +QTNETWORK_UICH = $(QTNETWORK_UICH_ALL) +QTNETWORK_RCCH = $(QTNETWORK_RCCH_ALL) +QTNETWORK_OBJS = $(QTNETWORK_OBJS_ALL) \ + kernel/qdnslookup_android.o \ + kernel/qhostinfo_unix.o \ + kernel/qnetworkinterface_unix.o \ + kernel/qnetworkproxy_generic.o \ + socket/qlocalserver_unix.o \ + socket/qlocalsocket_unix.o \ + socket/qnativesocketengine_unix.o +QTNETWORK_OBJS_MOC = $(QTNETWORK_OBJS_MOC_ALL) +QTNETWORK_OBJS_RCC = $(QTNETWORK_OBJS_RCC_ALL) +QTOPENGL_OBJS = $(QTOPENGL_OBJS_ALL) +QTPLATFORMWINDOWS_MOCH = $(QTPLATFORMWINDOWS_MOCH_ALL) +QTPLATFORMWINDOWS_MOCC = $(QTPLATFORMWINDOWS_MOCC_ALL) +QTPLATFORMWINDOWS_UICH = $(QTPLATFORMWINDOWS_UICH_ALL) +QTPLATFORMWINDOWS_RCCH = $(QTPLATFORMWINDOWS_RCCH_ALL) +QTPLATFORMWINDOWS_OBJS = $(QTPLATFORMWINDOWS_OBJS_ALL) +QTPLATFORMWINDOWS_OBJS_MOC = $(QTPLATFORMWINDOWS_OBJS_MOC_ALL) +QTPLATFORMWINDOWS_OBJS_RCC = $(QTPLATFORMWINDOWS_OBJS_RCC_ALL) +QTPLATFORMXCB_MOCH = $(QTPLATFORMXCB_MOCH_ALL) \ + dbusmenu/qdbusmenuadaptor_p.cpp \ + dbusmenu/qdbusmenubar_p.cpp \ + dbusmenu/qdbusmenuconnection_p.cpp \ + dbusmenu/qdbusmenuregistrarproxy_p.cpp \ + dbusmenu/qdbusplatformmenu_p.cpp \ + dbustray/qdbustrayicon_p.cpp \ + dbustray/qstatusnotifieritemadaptor_p.cpp \ + dbustray/qxdgnotificationproxy_p.cpp \ + gl_integrations/qxcbglintegrationplugin.cpp \ + qxcbclipboard.cpp \ + qxcbconnection.cpp \ + qxcbconnection_basic.cpp \ + qxcbeventdispatcher.cpp \ + qxcbeventqueue.cpp \ + qxcbmime.cpp \ + qxcbnativeinterface.cpp \ + qxcbsystemtraytracker.cpp +QTPLATFORMXCB_MOCC = $(QTPLATFORMXCB_MOCC_ALL) \ + gl_integrations/xcb_egl/qxcbeglmain.moc \ + gl_integrations/xcb_glx/qxcbglxmain.moc \ + qxcbclipboard.moc \ + qxcbmain.moc \ + qxcbsessionmanager.moc +QTPLATFORMXCB_UICH = $(QTPLATFORMXCB_UICH_ALL) +QTPLATFORMXCB_RCCH = $(QTPLATFORMXCB_RCCH_ALL) +QTPLATFORMXCB_OBJS = $(QTPLATFORMXCB_OBJS_ALL) \ + dbusmenu/qdbusmenuadaptor.o \ + dbusmenu/qdbusmenubar.o \ + dbusmenu/qdbusmenuconnection.o \ + dbusmenu/qdbusmenuregistrarproxy.o \ + dbusmenu/qdbusmenutypes.o \ + dbusmenu/qdbusplatformmenu.o \ + dbustray/qdbustrayicon.o \ + dbustray/qdbustraytypes.o \ + dbustray/qstatusnotifieritemadaptor.o \ + dbustray/qxdgnotificationproxy.o \ + gl_integrations/xcb_egl/qxcbeglintegration.o \ + gl_integrations/xcb_egl/qxcbeglmain.o \ + gl_integrations/xcb_egl/qxcbeglnativeinterfacehandler.o \ + gl_integrations/xcb_egl/qxcbeglwindow.o \ + gl_integrations/xcb_glx/qglxconvenience.o \ + gl_integrations/xcb_glx/qglxintegration.o \ + gl_integrations/xcb_glx/qxcbglxintegration.o \ + gl_integrations/xcb_glx/qxcbglxmain.o \ + gl_integrations/xcb_glx/qxcbglxnativeinterfacehandler.o \ + gl_integrations/xcb_glx/qxcbglxwindow.o \ + gl_integrations/qxcbglintegration.o \ + gl_integrations/qxcbglintegrationfactory.o \ + gl_integrations/qxcbnativeinterfacehandler.o \ + qedidparser.o \ + qgenericunixservices.o \ + qgenericunixthemes.o \ + qxcbatom.o \ + qxcbbackingstore.o \ + qxcbclipboard.o \ + qxcbconnection.o \ + qxcbconnection_basic.o \ + qxcbconnection_screens.o \ + qxcbcursor.o \ + qxcbdrag.o \ + qxcbeventdispatcher.o \ + qxcbeventqueue.o \ + qxcbimage.o \ + qxcbintegration.o \ + qxcbkeyboard.o \ + qxcbmain.o \ + qxcbmime.o \ + qxcbnativeinterface.o \ + qxcbscreen.o \ + qxcbsessionmanager.o \ + qxcbsystemtraytracker.o \ + qxcbwindow.o \ + qxcbwmsupport.o \ + qxcbxsettings.o +QTPLATFORMXCB_OBJS_MOC = $(QTPLATFORMXCB_OBJS_MOC_ALL) \ + qdbusmenuadaptor_p.omoc \ + qdbusmenubar_p.omoc \ + qdbusmenuconnection_p.omoc \ + qdbusmenuregistrarproxy_p.omoc \ + qdbusplatformmenu_p.omoc \ + qdbustrayicon_p.omoc \ + qstatusnotifieritemadaptor_p.omoc \ + qxdgnotificationproxy_p.omoc \ + qxcbglintegrationplugin.omoc \ + qxcbclipboard.omoc \ + qxcbconnection.omoc \ + qxcbconnection_basic.omoc \ + qxcbeventdispatcher.omoc \ + qxcbeventqueue.omoc \ + qxcbmime.omoc \ + qxcbnativeinterface.omoc \ + qxcbsystemtraytracker.omoc +QTPLATFORMXCB_OBJS_RCC = $(QTPLATFORMXCB_OBJS_RCC_ALL) +QTPLATFORMCOCOA_MOCH = $(QTPLATFORMCOCOA_MOCH_ALL) +QTPLATFORMCOCOA_MOCC = $(QTPLATFORMCOCOA_MOCC_ALL) +QTPLATFORMCOCOA_UICH = $(QTPLATFORMCOCOA_UICH_ALL) +QTPLATFORMCOCOA_RCCH = $(QTPLATFORMCOCOA_RCCH_ALL) +QTPLATFORMCOCOA_OBJS = $(QTPLATFORMCOCOA_OBJS_ALL) +QTPLATFORMCOCOA_OBJS_MOC = $(QTPLATFORMCOCOA_OBJS_MOC_ALL) +QTPLATFORMCOCOA_OBJS_RCC = $(QTPLATFORMCOCOA_OBJS_RCC_ALL) +QTPRINTSUPPORT_MOCH = $(QTPRINTSUPPORT_MOCH_ALL) +QTPRINTSUPPORT_MOCC = $(QTPRINTSUPPORT_MOCC_ALL) \ + dialogs/qprintdialog_unix.moc +QTPRINTSUPPORT_UICH = $(QTPRINTSUPPORT_UICH_ALL) +QTPRINTSUPPORT_RCCH = $(QTPRINTSUPPORT_RCCH_ALL) +QTPRINTSUPPORT_OBJS = $(QTPRINTSUPPORT_OBJS_ALL) \ + dialogs/qpagesetupdialog_unix.o \ + dialogs/qprintdialog_unix.o +QTPRINTSUPPORT_OBJS_MOC = $(QTPRINTSUPPORT_OBJS_MOC_ALL) +QTPRINTSUPPORT_OBJS_RCC = $(QTPRINTSUPPORT_OBJS_RCC_ALL) +QTSERIALPORT_MOCH = $(QTSERIALPORT_MOCH_ALL) +QTSERIALPORT_MOCC = $(QTSERIALPORT_MOCC_ALL) +QTSERIALPORT_OBJS = $(QTSERIALPORT_OBJS_ALL) \ + qserialport_unix.o \ + qserialportinfo_unix.o +QTSERIALPORT_OBJS_MOC = $(QTSERIALPORT_OBJS_MOC_ALL) +QTWIDGETS_MOCH = $(QTWIDGETS_MOCH_ALL) +QTWIDGETS_MOCC = $(QTWIDGETS_MOCC_ALL) +QTWIDGETS_UICH = $(QTWIDGETS_UICH_ALL) +QTWIDGETS_RCCH = $(QTWIDGETS_RCCH_ALL) +QTWIDGETS_OBJS = $(QTWIDGETS_OBJS_ALL) \ + util/qsystemtrayicon_x11.o +QTWIDGETS_OBJS_MOC = $(QTWIDGETS_OBJS_MOC_ALL) +QTWIDGETS_OBJS_RCC = $(QTWIDGETS_OBJS_RCC_ALL) +QTXML_OBJS = $(QTXML_OBJS_ALL) +SINGLEAPPLICATION_MOCH = $(SINGLEAPPLICATION_MOCH_ALL) +SINGLEAPPLICATION_MOCC = $(SINGLEAPPLICATION_MOCC_ALL) +SINGLEAPPLICATION_UICH = $(SINGLEAPPLICATION_UICH_ALL) +SINGLEAPPLICATION_RCCH = $(SINGLEAPPLICATION_RCCH_ALL) +SINGLEAPPLICATION_OBJS = $(SINGLEAPPLICATION_OBJS_ALL) +SINGLEAPPLICATION_OBJS_MOC = $(SINGLEAPPLICATION_OBJS_MOC_ALL) +SINGLEAPPLICATION_OBJS_RCC = $(SINGLEAPPLICATION_OBJS_RCC_ALL) + +##################################################################################### +# Project Dependencies + +QTBLUETOOTH_DEPS_X86 = +QTBLUETOOTH_DEPS_X64 = +QTCORE_DEPS_X86 = +QTCORE_DEPS_X64 = +QTDBUS_DEPS_X86 = +QTDBUS_DEPS_X64 = +QTEVENTDISPATCHERS_DEPS_X86 = +QTEVENTDISPATCHERS_DEPS_X64 = +QTFONTDATABASES_DEPS_X86 = +QTFONTDATABASES_DEPS_X64 = +QTGAMEPAD_DEPS_X86 = +QTGAMEPAD_DEPS_X64 = +QTGUI_DEPS_X86 = +QTGUI_DEPS_X64 = +QTMULTIMEDIA_DEPS_X86 = +QTMULTIMEDIA_DEPS_X64 = +QTMULTIMEDIAWIDGETS_DEPS_X86 = +QTMULTIMEDIAWIDGETS_DEPS_X64 = +QTNETWORK_DEPS_X86 = +QTNETWORK_DEPS_X64 = +QTPLATFORMWINDOWS_DEPS_X86 = +QTPLATFORMWINDOWS_DEPS_X64 = +QTPLATFORMXCB_DEPS_X86 = +QTPLATFORMXCB_DEPS_X64 = +QTPLATFORMCOCOA_DEPS_X86 = +QTPLATFORMCOCOA_DEPS_X64 = +QTPRINTSUPPORT_DEPS_X86 = +QTPRINTSUPPORT_DEPS_X64 = +QTSERIALPORT_DEPS_X86 = +QTSERIALPORT_DEPS_X64 = +QTWIDGETS_DEPS_X86 = +QTWIDGETS_DEPS_X64 = +SINGLEAPPLICATION_DEPS_X86 = +SINGLEAPPLICATION_DEPS_X64 = + +##################################################################################### +# Include Targets + + +include Makefile.targets + +all-x86: all-common-x86 + +all-x64: all-common-x64 + +all: all-x86 all-x64 diff --git a/deps/build/make/Makefile.android-win b/deps/build/make/Makefile.android-win new file mode 100644 index 000000000..e60531f3f --- /dev/null +++ b/deps/build/make/Makefile.android-win @@ -0,0 +1,158 @@ +# +# ANDROID CLANG MAKEFILE FOR WINDOWS +# + +# REQUIRED ENVIRONMENT ARGS: +# ANDROID_NDK_HOME Location of Android NDK +# JAVA_HOME Location of Java JDK + +# android ndk, toolchain and api version +TOOLCHAIN = $(ANDROID_NDK_HOME)/toolchains/llvm/prebuilt/windows-x86_64 +API = 21 + +######################################################################################### +# target platforms +# builds for ARM by default +# for x86/x64 use: make [..] ANDROID_TARGET=x86 + +ifeq ($(ANDROID_TARGET),x86) + TARGET_X86 = i686-linux-android + TARGET_X64 = x86_64-linux-android + TARGET_AR_X86 = i686-linux-android + TARGET_AR_X64 = x86_64-linux-android + SYSROOT_X86 = $(ANDROID_NDK_HOME)/platforms/android-$(API)/arch-x86 + SYSROOT_X64 = $(ANDROID_NDK_HOME)/platforms/android-$(API)/arch-x86_64 + ARCHFLAGS_X86 = -msse -msse2 -msse3 + ARCHFLAGS_X64 = -msse -msse2 -msse3 +else + TARGET_X86 = armv7a-linux-androideabi + TARGET_X64 = aarch64-linux-android + TARGET_AR_X86 = arm-linux-androideabi + TARGET_AR_X64 = aarch64-linux-android + SYSROOT_X86 = $(ANDROID_NDK_HOME)/platforms/android-$(API)/arch-arm + SYSROOT_X64 = $(ANDROID_NDK_HOME)/platforms/android-$(API)/arch-arm64 + ARCHFLAGS_X86 = -DANDROID_ARM_NEON=ON -march=armv7-a -mfloat-abi=softfp -mfpu=neon-fp16 + ARCHFLAGS_X64 = -DANDROID_ARM_NEON=ON -march=armv8-a +endif + +######################################################################################### + +# flags shared between all +FLAGS = -O3 \ + -fpic \ + -static \ + -DANDROID \ + -D__ANDROID_API__=$(API) \ + -D_SILENCE_CXX17_OLD_ALLOCATOR_MEMBERS_DEPRECATION_WARNING \ + -Wno-deprecated-declarations \ + -Wno-incompatible-pointer-types \ + -Wno-implicit-function-declaration \ + -Wno-implicit-int \ + -Wno-int-conversion + +# C Compiler +CC_X86 = $(TOOLCHAIN)/bin/$(TARGET_X86)$(API)-clang.cmd +CC_X64 = $(TOOLCHAIN)/bin/$(TARGET_X64)$(API)-clang.cmd +CFLAGS_X86 = -m32 --target=$(TARGET_X86) -isystem $(ANDROID_NDK_HOME)/sysroot/usr/include/$(TARGET_AR_X86) $(ARCHFLAGS_X86) $(FLAGS) +CFLAGS_X64 = -m64 --target=$(TARGET_X64) -isystem $(ANDROID_NDK_HOME)/sysroot/usr/include/$(TARGET_AR_X64) $(ARCHFLAGS_X64) $(FLAGS) + +# C++ Compiler +CXX_X86 = $(TOOLCHAIN)/bin/$(TARGET_X86)$(API)-clang++.cmd +CXX_X64 = $(TOOLCHAIN)/bin/$(TARGET_X64)$(API)-clang++.cmd +CXXFLAGS_ALL = -Xclang -flto-visibility-public-std $(FLAGS) +CXXFLAGS_A_X86 = -m32 -target $(TARGET_X86) -isystem $(ANDROID_NDK_HOME)/sysroot/usr/include/$(TARGET_AR_X86) $(ARCHFLAGS_X86) $(CXXFLAGS_ALL) +CXXFLAGS_A_X64 = -m64 -target $(TARGET_X64) -isystem $(ANDROID_NDK_HOME)/sysroot/usr/include/$(TARGET_AR_X64) $(ARCHFLAGS_X64) $(CXXFLAGS_ALL) +CXXFLAGS_X86 = $(CXXFLAGS_A_X86) -std=c++17 +CXXFLAGS_X64 = $(CXXFLAGS_A_X64) -std=c++17 +CXX14FLAGS_X86 = $(CXXFLAGS_A_X86) -std=c++14 +CXX14FLAGS_X64 = $(CXXFLAGS_A_X64) -std=c++14 + +# File Operations +define deletefilepattern + del /s /q $(subst /,\,$(1))\$(2) +endef + +# AR +LIB_X86 = $(TOOLCHAIN)/bin/$(TARGET_AR_X86)-ar.exe +LIB_X64 = $(TOOLCHAIN)/bin/$(TARGET_AR_X64)-ar.exe +LIBFLAGS_X86 = rcs +LIBFLAGS_X64 = rcs + +# AR Functions +define createlib32 + $(LIB_X86) $(LIBFLAGS_X86) $(LIBDIR_X86)/$(1).a $(2) +endef +define createlib64 + $(LIB_X64) $(LIBFLAGS_X64) $(LIBDIR_X64)/$(1).a $(2) +endef + +# Linker +LINK_X86 = $(CXX_X86) +LINK_X64 = $(CXX_X64) +LINKFLAGS_X86 = --sysroot=$(SYSROOT_X86) $(CXXFLAGS_X86) +LINKFLAGS_X64 = --sysroot=$(SYSROOT_X64) $(CXXFLAGS_X64) + +# Linker Library Path +LINKPATH_X86 = \ + -L./lib/x86 \ + -L$(SYSROOT_X86)/usr/lib/ \ + -L$(TOOLCHAIN)/sysroot/usr/lib/$(TARGET_AR_X86)/$(API) \ + -L$(TOOLCHAIN)/sysroot/usr/lib/$(TARGET_AR_X86) + +LINKPATH_X64 = \ + -L./lib/x64 \ + -L$(SYSROOT_X64)/usr/lib/ \ + -L$(TOOLCHAIN)/sysroot/usr/lib/$(TARGET_AR_X64)/$(API) \ + -L$(TOOLCHAIN)/sysroot/usr/lib/$(TARGET_AR_X64) + +# Libraries for X86 and X64 +LINKLIBS_ALL = + +# Libraries for X86 or X64 +LINKLIBS_X86 = $(LINKLIBS_ALL) +LINKLIBS_X64 = $(LINKLIBS_ALL) + +# Linker Functions +define createbin32 + $(LINK_X86) $(LINKFLAGS_X86) $(LINKPATH_X86) $(2) $(3) $(LINKLIBS_X86) -o $(BINDIR_X86)/$(1) +endef +define createbin64 + $(LINK_X64) $(LINKFLAGS_X64) $(LINKPATH_X64) $(2) $(3) $(LINKLIBS_X64) -o $(BINDIR_X64)/$(1) +endef + +# Qt MOC+RCC+UIC +MOC_X86 = "../../prebuilt/win/x86/qt-moc.exe" +MOC_X64 = "../../prebuilt/win/x64/qt-moc.exe" +ifneq (,$(findstring x86,$(MAKECMDGOALS))) + MOC = $(MOC_X86) +endif +ifneq (,$(findstring x64,$(MAKECMDGOALS))) + MOC = $(MOC_X64) +endif + +RCC_X86 = "../../prebuilt/win/x86/qt-rcc.exe" +RCC_X64 = "../../prebuilt/win/x64/qt-rcc.exe" +ifneq (,$(findstring x86,$(MAKECMDGOALS))) + RCC = $(RCC_X86) +endif +ifneq (,$(findstring x64,$(MAKECMDGOALS))) + RCC = $(RCC_X64) +endif + +UIC_X86 = "../../prebuilt/win/x86/qt-uic.exe" +UIC_X64 = "../../prebuilt/win/x64/qt-uic.exe" +ifneq (,$(findstring x86,$(MAKECMDGOALS))) + UIC = $(UIC_X86) +endif +ifneq (,$(findstring x64,$(MAKECMDGOALS))) + UIC = $(UIC_X64) +endif + +# Platform specific bash file exists check +QTCORE_MOC_CMD_X86 = if exist $(@:$(QTCORE_MOCDIR_X86)/%.moc=$(QTCORE_SRCDIR)/%.cpp) ( $(QTCORE_MOC_C_X86) ) else ( $(QTCORE_MOC_MM_X86) ) +QTCORE_MOC_CMD_X64 = if exist $(@:$(QTCORE_MOCDIR_X64)/%.moc=$(QTCORE_SRCDIR)/%.cpp) ( $(QTCORE_MOC_C_X64) ) else ( $(QTCORE_MOC_MM_X64) ) + +##################################################################################### + +# Include Common Parts +include Makefile.android-shared diff --git a/deps/build/make/Makefile.common b/deps/build/make/Makefile.common index 213172dce..272884890 100644 --- a/deps/build/make/Makefile.common +++ b/deps/build/make/Makefile.common @@ -21,8 +21,8 @@ ZLIB_SRCDIR = $(SRCDIR)/zlib ZLIB_OBJDIR_X86 = $(OBJDIR_X86)/zlib ZLIB_OBJDIR_X64 = $(OBJDIR_X64)/zlib ZLIB_INCLUDES = -I$(ZLIB_INCDIR) -ZLIB_BUILD_X86 = $(CC) $(CFLAGS_X86) $(ZLIB_INCLUDES) -c $(@:$(ZLIB_OBJDIR_X86)%.o=$(ZLIB_SRCDIR)%.c) -o $@ -ZLIB_BUILD_X64 = $(CC) $(CFLAGS_X64) $(ZLIB_INCLUDES) -c $(@:$(ZLIB_OBJDIR_X64)%.o=$(ZLIB_SRCDIR)%.c) -o $@ +ZLIB_BUILD_X86 = $(CC_X86) $(CFLAGS_X86) $(ZLIB_INCLUDES) -c $(@:$(ZLIB_OBJDIR_X86)%.o=$(ZLIB_SRCDIR)%.c) -o $@ +ZLIB_BUILD_X64 = $(CC_X64) $(CFLAGS_X64) $(ZLIB_INCLUDES) -c $(@:$(ZLIB_OBJDIR_X64)%.o=$(ZLIB_SRCDIR)%.c) -o $@ ZLIB_OBJS_ALL = adler32.o compress.o crc32.o deflate.o gzclose.o gzclose.o gzlib.o gzread.o gzwrite.o \ infback.o inffast.o inflate.o inftrees.o trees.o uncompr.o zutil.o @@ -40,12 +40,12 @@ LIBCRYPTO_OBJDIR_X86 = $(OBJDIR_X86)/libcrypto LIBCRYPTO_OBJDIR_X64 = $(OBJDIR_X64)/libcrypto LIBCRYPTO_INCLUDES = -I$(INCDIR) -I$(LIBCRYPTO_INCDIR) -I$(LIBCRYPTO_SRCDIR)/modes -I$(SRCDIR)/openssl LIBCRYPTO_DEFINES = -DHAVE_CONFIG_H -DOPENSSL_STATIC -DOPENSSL_NO_DYNAMIC_ENGINE -DOPENSSL_THREADS \ - -DOPENSSL_PIC -DOPENSSL_IA32_SSE2 -DOPENSSL_USE_APPLINK \ + -DOPENSSL_PIC -DOPENSSL_USE_APPLINK \ -DL_ENDIAN LIBCRYPTO_DEFINES_X86= $(LIBCRYPTO_DEFINES) $(LIBCRYPTO_DEFINES_X86_PLAT) LIBCRYPTO_DEFINES_X64= $(LIBCRYPTO_DEFINES) $(LIBCRYPTO_DEFINES_X64_PLAT) -LIBCRYPTO_BUILD_X86 = $(CC) $(CFLAGS_X86) $(LIBCRYPTO_DEFINES_X86) $(LIBCRYPTO_INCLUDES) -c $(@:$(LIBCRYPTO_OBJDIR_X86)%.o=$(LIBCRYPTO_SRCDIR)%.c) -o $@ -LIBCRYPTO_BUILD_X64 = $(CC) $(CFLAGS_X64) $(LIBCRYPTO_DEFINES_X64) $(LIBCRYPTO_INCLUDES) -c $(@:$(LIBCRYPTO_OBJDIR_X64)%.o=$(LIBCRYPTO_SRCDIR)%.c) -o $@ +LIBCRYPTO_BUILD_X86 = $(CC_X86) $(CFLAGS_X86) $(LIBCRYPTO_DEFINES_X86) $(LIBCRYPTO_INCLUDES) -c $(@:$(LIBCRYPTO_OBJDIR_X86)%.o=$(LIBCRYPTO_SRCDIR)%.c) -o $@ +LIBCRYPTO_BUILD_X64 = $(CC_X64) $(CFLAGS_X64) $(LIBCRYPTO_DEFINES_X64) $(LIBCRYPTO_INCLUDES) -c $(@:$(LIBCRYPTO_OBJDIR_X64)%.o=$(LIBCRYPTO_SRCDIR)%.c) -o $@ LIBCRYPTO_OBJS_ALL = aes/aes_cbc.o aes/aes_cfb.o aes/aes_ecb.o aes/aes_ige.o aes/aes_misc.o aes/aes_ofb.o \ aes/aes_wrap.o aes/aes_x86core.o asn1/a_bitstr.o asn1/a_d2i_fp.o asn1/a_digest.o \ asn1/a_dup.o asn1/a_gentm.o asn1/a_i2d_fp.o asn1/a_int.o asn1/a_mbstr.o asn1/a_object.o \ @@ -162,12 +162,12 @@ LIBSSL_OBJDIR_X86 = $(OBJDIR_X86)/libssl LIBSSL_OBJDIR_X64 = $(OBJDIR_X64)/libssl LIBSSL_INCLUDES = -I$(INCDIR) -I$(LIBSSL_INCDIR) -I$(LIBSSL_SRCDIR)/modes -I$(SRCDIR)/openssl LIBSSL_DEFINES = -DHAVE_CONFIG_H -DOPENSSL_STATIC -DOPENSSL_NO_DYNAMIC_ENGINE -DOPENSSL_THREADS \ - -DOPENSSL_PIC -DOPENSSL_IA32_SSE2 \ + -DOPENSSL_PIC \ -DL_ENDIAN LIBSSL_DEFINES_X86= $(LIBSSL_DEFINES) $(LIBSSL_DEFINES_X86_PLAT) LIBSSL_DEFINES_X64= $(LIBSSL_DEFINES) $(LIBSSL_DEFINES_X64_PLAT) -LIBSSL_BUILD_X86 = $(CC) $(CFLAGS_X86) $(LIBSSL_DEFINES_X86) $(LIBSSL_INCLUDES) -c $(@:$(LIBSSL_OBJDIR_X86)%.o=$(LIBSSL_SRCDIR)%.c) -o $@ -LIBSSL_BUILD_X64 = $(CC) $(CFLAGS_X64) $(LIBSSL_DEFINES_X64) $(LIBSSL_INCLUDES) -c $(@:$(LIBSSL_OBJDIR_X64)%.o=$(LIBSSL_SRCDIR)%.c) -o $@ +LIBSSL_BUILD_X86 = $(CC_X86) $(CFLAGS_X86) $(LIBSSL_DEFINES_X86) $(LIBSSL_INCLUDES) -c $(@:$(LIBSSL_OBJDIR_X86)%.o=$(LIBSSL_SRCDIR)%.c) -o $@ +LIBSSL_BUILD_X64 = $(CC_X64) $(CFLAGS_X64) $(LIBSSL_DEFINES_X64) $(LIBSSL_INCLUDES) -c $(@:$(LIBSSL_OBJDIR_X64)%.o=$(LIBSSL_SRCDIR)%.c) -o $@ LIBSSL_OBJS_ALL = engines/e_capi.o engines/e_padlock.o ssl/record/dtls1_bitmap.o ssl/record/rec_layer_d1.o \ ssl/record/rec_layer_s3.o ssl/record/ssl3_buffer.o ssl/record/ssl3_record.o \ ssl/statem/statem.o ssl/statem/statem_clnt.o ssl/statem/statem_dtls.o \ @@ -190,8 +190,8 @@ LIBPNG_SRCDIR = $(SRCDIR)/libpng LIBPNG_OBJDIR_X86 = $(OBJDIR_X86)/libpng LIBPNG_OBJDIR_X64 = $(OBJDIR_X64)/libpng LIBPNG_INCLUDES = -I$(LIBPNG_INCDIR) -I$(ZLIB_INCDIR) -LIBPNG_BUILD_X86 = $(CC) $(CFLAGS_X86) $(LIBPNG_INCLUDES) -c $(@:$(LIBPNG_OBJDIR_X86)%.o=$(LIBPNG_SRCDIR)%.c) -o $@ -LIBPNG_BUILD_X64 = $(CC) $(CFLAGS_X64) $(LIBPNG_INCLUDES) -c $(@:$(LIBPNG_OBJDIR_X64)%.o=$(LIBPNG_SRCDIR)%.c) -o $@ +LIBPNG_BUILD_X86 = $(CC_X86) $(CFLAGS_X86) $(LIBPNG_INCLUDES) -c $(@:$(LIBPNG_OBJDIR_X86)%.o=$(LIBPNG_SRCDIR)%.c) -o $@ +LIBPNG_BUILD_X64 = $(CC_X64) $(CFLAGS_X64) $(LIBPNG_INCLUDES) -c $(@:$(LIBPNG_OBJDIR_X64)%.o=$(LIBPNG_SRCDIR)%.c) -o $@ LIBPNG_OBJS_ALL = png.o pngerror.o pngget.o pngmem.o pngpread.o pngread.o pngrio.o pngrtran.o pngrutil.o \ pngset.o pngtrans.o pngwio.o pngwrite.o pngwtran.o pngwutil.o @@ -208,8 +208,8 @@ LIBJPEG_SRCDIR = $(SRCDIR)/libjpeg LIBJPEG_OBJDIR_X86 = $(OBJDIR_X86)/libjpeg LIBJPEG_OBJDIR_X64 = $(OBJDIR_X64)/libjpeg LIBJPEG_INCLUDES = -I$(LIBJPEG_INCDIR) -LIBJPEG_BUILD_X86 = $(CC) $(CFLAGS_X86) $(LIBJPEG_INCLUDES) -c $(@:$(LIBJPEG_OBJDIR_X86)%.o=$(LIBJPEG_SRCDIR)%.c) -o $@ -LIBJPEG_BUILD_X64 = $(CC) $(CFLAGS_X64) $(LIBJPEG_INCLUDES) -c $(@:$(LIBJPEG_OBJDIR_X64)%.o=$(LIBJPEG_SRCDIR)%.c) -o $@ +LIBJPEG_BUILD_X86 = $(CC_X86) $(CFLAGS_X86) $(LIBJPEG_INCLUDES) -c $(@:$(LIBJPEG_OBJDIR_X86)%.o=$(LIBJPEG_SRCDIR)%.c) -o $@ +LIBJPEG_BUILD_X64 = $(CC_X64) $(CFLAGS_X64) $(LIBJPEG_INCLUDES) -c $(@:$(LIBJPEG_OBJDIR_X64)%.o=$(LIBJPEG_SRCDIR)%.c) -o $@ LIBJPEG_OBJS_ALL = jaricom.o jcapimin.o jcarith.o jccoefct.o jccolor.o jcdctmgr.o jchuff.o jcinit.o jcmainct.o \ jcmarker.o jcmaster.o jcomapi.o jcparam.o jcprepct.o jcsample.o jctrans.o jdapimin.o jdapistd.o \ jdarith.o jdatadst.o jdatasrc.o jdcoefct.o jdcolor.o jddctmgr.o jdhuff.o jdinput.o jdmainct.o \ @@ -230,8 +230,8 @@ PCRE2_OBJDIR_X86 = $(OBJDIR_X86)/pcre2 PCRE2_OBJDIR_X64 = $(OBJDIR_X64)/pcre2 PCRE2_INCLUDES = -I$(PCRE2_INCDIR) PCRE2_DEFINES = -DPCRE2_STATIC -DPCRE2_CODE_UNIT_WIDTH=16 -DHAVE_CONFIG_H -PCRE2_BUILD_X86 = $(CC) $(CFLAGS_X86) $(PCRE2_DEFINES) $(PCRE2_INCLUDES) -c $(@:$(PCRE2_OBJDIR_X86)%.o=$(PCRE2_SRCDIR)%.c) -o $@ -PCRE2_BUILD_X64 = $(CC) $(CFLAGS_X64) $(PCRE2_DEFINES) $(PCRE2_INCLUDES) -c $(@:$(PCRE2_OBJDIR_X64)%.o=$(PCRE2_SRCDIR)%.c) -o $@ +PCRE2_BUILD_X86 = $(CC_X86) $(CFLAGS_X86) $(PCRE2_DEFINES) $(PCRE2_INCLUDES) -c $(@:$(PCRE2_OBJDIR_X86)%.o=$(PCRE2_SRCDIR)%.c) -o $@ +PCRE2_BUILD_X64 = $(CC_X64) $(CFLAGS_X64) $(PCRE2_DEFINES) $(PCRE2_INCLUDES) -c $(@:$(PCRE2_OBJDIR_X64)%.o=$(PCRE2_SRCDIR)%.c) -o $@ PCRE2_OBJS_ALL = pcre2_auto_possess.o pcre2_chartables.o pcre2_compile.o pcre2_compile.o pcre2_config.o \ pcre2_context.o pcre2_dfa_match.o pcre2_error.o pcre2_extuni.o pcre2_find_bracket.o \ pcre2_jit_compile.o pcre2_maketables.o pcre2_match.o pcre2_match_data.o pcre2_newline.o \ @@ -252,8 +252,8 @@ DOUBLECONV_SRCDIR = $(SRCDIR)/double-conversion DOUBLECONV_OBJDIR_X86 = $(OBJDIR_X86)/double-conversion DOUBLECONV_OBJDIR_X64 = $(OBJDIR_X64)/double-conversion DOUBLECONV_INCLUDES = -I$(INCDIR) -I$(DOUBLECONV_INCDIR) -DOUBLECONV_BUILD_X86 = $(CXX) $(CXXFLAGS_X86) $(DOUBLECONV_INCLUDES) -c $(@:$(DOUBLECONV_OBJDIR_X86)%.o=$(DOUBLECONV_SRCDIR)%.cc) -o $@ -DOUBLECONV_BUILD_X64 = $(CXX) $(CXXFLAGS_X64) $(DOUBLECONV_INCLUDES) -c $(@:$(DOUBLECONV_OBJDIR_X64)%.o=$(DOUBLECONV_SRCDIR)%.cc) -o $@ +DOUBLECONV_BUILD_X86 = $(CXX_X86) $(CXXFLAGS_X86) $(DOUBLECONV_INCLUDES) -c $(@:$(DOUBLECONV_OBJDIR_X86)%.o=$(DOUBLECONV_SRCDIR)%.cc) -o $@ +DOUBLECONV_BUILD_X64 = $(CXX_X64) $(CXXFLAGS_X64) $(DOUBLECONV_INCLUDES) -c $(@:$(DOUBLECONV_OBJDIR_X64)%.o=$(DOUBLECONV_SRCDIR)%.cc) -o $@ DOUBLECONV_OBJS_ALL = bignum.o bignum-dtoa.o cached-powers.o diy-fp.o double-conversion.o fast-dtoa.o fixed-dtoa.o strtod.o $(DOUBLECONV_OBJDIR_X86)/%.o: @@ -269,8 +269,8 @@ EDFLIB_SRCDIR = $(SRCDIR)/edflib EDFLIB_OBJDIR_X86 = $(OBJDIR_X86)/edflib EDFLIB_OBJDIR_X64 = $(OBJDIR_X64)/edflib EDFLIB_INCLUDES = -I$(EDFLIB_INCDIR) -EDFLIB_BUILD_X86 = $(CC) $(CFLAGS_X86) $(EDFLIB_INCLUDES) -c $(@:$(EDFLIB_OBJDIR_X86)%.o=$(EDFLIB_SRCDIR)%.c) -o $@ -EDFLIB_BUILD_X64 = $(CC) $(CFLAGS_X64) $(EDFLIB_INCLUDES) -c $(@:$(EDFLIB_OBJDIR_X64)%.o=$(EDFLIB_SRCDIR)%.c) -o $@ +EDFLIB_BUILD_X86 = $(CC_X86) $(CFLAGS_X86) $(EDFLIB_INCLUDES) -c $(@:$(EDFLIB_OBJDIR_X86)%.o=$(EDFLIB_SRCDIR)%.c) -o $@ +EDFLIB_BUILD_X64 = $(CC_X64) $(CFLAGS_X64) $(EDFLIB_INCLUDES) -c $(@:$(EDFLIB_OBJDIR_X64)%.o=$(EDFLIB_SRCDIR)%.c) -o $@ EDFLIB_OBJS_ALL = edflib.o $(EDFLIB_OBJDIR_X86)/%.o: @@ -289,8 +289,8 @@ FONTCONFIG_INCLUDES = -I$(INCDIR) -I$(FONTCONFIG_INCDIR) -I$(FONTCONFIG_SRCDIR FONTCONFIG_DEFINES = -DHAVE_CONFIG_H FONTCONFIG_DEFINES_X86= $(FONTCONFIG_DEFINES) $(FONTCONFIG_DEFINES_X86_PLAT) FONTCONFIG_DEFINES_X64= $(FONTCONFIG_DEFINES) $(FONTCONFIG_DEFINES_X64_PLAT) -FONTCONFIG_BUILD_X86 = $(CC) $(CFLAGS_X86) $(FONTCONFIG_DEFINES_X86) $(FONTCONFIG_INCLUDES) -c $(@:$(FONTCONFIG_OBJDIR_X86)%.o=$(FONTCONFIG_SRCDIR)%.c) -o $@ -FONTCONFIG_BUILD_X64 = $(CC) $(CFLAGS_X64) $(FONTCONFIG_DEFINES_X64) $(FONTCONFIG_INCLUDES) -c $(@:$(FONTCONFIG_OBJDIR_X64)%.o=$(FONTCONFIG_SRCDIR)%.c) -o $@ +FONTCONFIG_BUILD_X86 = $(CC_X86) $(CFLAGS_X86) $(FONTCONFIG_DEFINES_X86) $(FONTCONFIG_INCLUDES) -c $(@:$(FONTCONFIG_OBJDIR_X86)%.o=$(FONTCONFIG_SRCDIR)%.c) -o $@ +FONTCONFIG_BUILD_X64 = $(CC_X64) $(CFLAGS_X64) $(FONTCONFIG_DEFINES_X64) $(FONTCONFIG_INCLUDES) -c $(@:$(FONTCONFIG_OBJDIR_X64)%.o=$(FONTCONFIG_SRCDIR)%.c) -o $@ FONTCONFIG_OBJS_ALL = $(FONTCONFIG_OBJDIR_X86)/%.o: @@ -307,8 +307,8 @@ FREETYPE_OBJDIR_X86 = $(OBJDIR_X86)/freetype FREETYPE_OBJDIR_X64 = $(OBJDIR_X64)/freetype FREETYPE_INCLUDES = -I$(INCDIR) -I$(FREETYPE_INCDIR) -I$(ZLIB_INCDIR) -I$(LIBPNG_INCDIR) FREETYPE_DEFINES = -DHAVE_CONFIG_H -DHAVE_OPENSSL -DFT2_BUILD_LIBRARY -DFT_CONFIG_OPTION_USE_PNG -DFT_CONFIG_OPTION_SYSTEM_ZLIB -FREETYPE_BUILD_X86 = $(CC) $(CFLAGS_X86) $(FREETYPE_DEFINES) $(FREETYPE_INCLUDES) -c $(@:$(FREETYPE_OBJDIR_X86)%.o=$(FREETYPE_SRCDIR)%.c) -o $@ -FREETYPE_BUILD_X64 = $(CC) $(CFLAGS_X64) $(FREETYPE_DEFINES) $(FREETYPE_INCLUDES) -c $(@:$(FREETYPE_OBJDIR_X64)%.o=$(FREETYPE_SRCDIR)%.c) -o $@ +FREETYPE_BUILD_X86 = $(CC_X86) $(CFLAGS_X86) $(FREETYPE_DEFINES) $(FREETYPE_INCLUDES) -c $(@:$(FREETYPE_OBJDIR_X86)%.o=$(FREETYPE_SRCDIR)%.c) -o $@ +FREETYPE_BUILD_X64 = $(CC_X64) $(CFLAGS_X64) $(FREETYPE_DEFINES) $(FREETYPE_INCLUDES) -c $(@:$(FREETYPE_OBJDIR_X64)%.o=$(FREETYPE_SRCDIR)%.c) -o $@ FREETYPE_OBJS_ALL = autofit/autofit.o base/ftbase.o base/ftbbox.o base/ftbdf.o base/ftbitmap.o base/ftcid.o base/ftdebug.o base/ftfstype.o \ base/ftgasp.o base/ftglyph.o base/ftgxval.o base/ftinit.o base/ftmm.o base/ftotval.o base/ftpatent.o base/ftpfr.o \ base/ftstroke.o base/ftsynth.o base/ftsystem.o base/fttype1.o base/ftwinfnt.o base/md5.o bdf/bdf.o bzip2/ftbzip2.o \ @@ -329,10 +329,10 @@ HARFBUZZ_SRCDIR = $(SRCDIR)/harfbuzz HARFBUZZ_OBJDIR_X86 = $(OBJDIR_X86)/harfbuzz HARFBUZZ_OBJDIR_X64 = $(OBJDIR_X64)/harfbuzz HARFBUZZ_INCLUDES = -I$(HARFBUZZ_INCDIR) -HARFBUZZ_BUILD_X86_C = $(CC) $(CFLAGS_X86) $(HARFBUZZ_INCLUDES) -c $(@:$(HARFBUZZ_OBJDIR_X86)%.o=$(HARFBUZZ_SRCDIR)%.c) -o $@ -HARFBUZZ_BUILD_X64_C = $(CC) $(CFLAGS_X64) $(HARFBUZZ_INCLUDES) -c $(@:$(HARFBUZZ_OBJDIR_X64)%.o=$(HARFBUZZ_SRCDIR)%.c) -o $@ -HARFBUZZ_BUILD_X86_CXX = $(CXX) $(CXXFLAGS_X86) $(HARFBUZZ_INCLUDES) -c $(@:$(HARFBUZZ_OBJDIR_X86)%.opp=$(HARFBUZZ_SRCDIR)%.cpp) -o $@ -HARFBUZZ_BUILD_X64_CXX = $(CXX) $(CXXFLAGS_X64) $(HARFBUZZ_INCLUDES) -c $(@:$(HARFBUZZ_OBJDIR_X64)%.opp=$(HARFBUZZ_SRCDIR)%.cpp) -o $@ +HARFBUZZ_BUILD_X86_C = $(CC_X86) $(CFLAGS_X86) $(HARFBUZZ_INCLUDES) -c $(@:$(HARFBUZZ_OBJDIR_X86)%.o=$(HARFBUZZ_SRCDIR)%.c) -o $@ +HARFBUZZ_BUILD_X64_C = $(CC_X64) $(CFLAGS_X64) $(HARFBUZZ_INCLUDES) -c $(@:$(HARFBUZZ_OBJDIR_X64)%.o=$(HARFBUZZ_SRCDIR)%.c) -o $@ +HARFBUZZ_BUILD_X86_CXX = $(CXX_X86) $(CXXFLAGS_X86) $(HARFBUZZ_INCLUDES) -c $(@:$(HARFBUZZ_OBJDIR_X86)%.opp=$(HARFBUZZ_SRCDIR)%.cpp) -o $@ +HARFBUZZ_BUILD_X64_CXX = $(CXX_X64) $(CXXFLAGS_X64) $(HARFBUZZ_INCLUDES) -c $(@:$(HARFBUZZ_OBJDIR_X64)%.opp=$(HARFBUZZ_SRCDIR)%.cpp) -o $@ HARFBUZZ_OBJS_ALL_C = harfbuzz.o harfbuzz-impl.o harfbuzz-stream.o HARFBUZZ_OBJS_ALL_CXX = harfbuzz-shaper-all.opp @@ -357,8 +357,8 @@ HARFBUZZNG_OBJDIR_X64 = $(OBJDIR_X64)/harfbuzz-ng HARFBUZZNG_INCLUDES = -I$(HARFBUZZNG_INCDIR) -I$(INCDIR)/qt HARFBUZZNG_DEFINES = -DHAVE_CONFIG_H -DHAVE_OT -DHB_NO_UNICODE_FUNCS -DHB_DISABLE_DEPRECATED -DHB_EXTERN= -DHB_NO_WIN1256 \ -DQT_NO_VERSION_TAGGING -DQT_NO_DYNAMIC_CAST -DQT_NO_EXCEPTIONS -HARFBUZZNG_BUILD_X86 = $(CXX) $(CXXFLAGS_X86) $(HARFBUZZNG_DEFINES) $(HARFBUZZNG_INCLUDES) -c $(@:$(HARFBUZZNG_OBJDIR_X86)%.o=$(HARFBUZZNG_SRCDIR)%.cc) -o $@ -HARFBUZZNG_BUILD_X64 = $(CXX) $(CXXFLAGS_X64) $(HARFBUZZNG_DEFINES) $(HARFBUZZNG_INCLUDES) -c $(@:$(HARFBUZZNG_OBJDIR_X64)%.o=$(HARFBUZZNG_SRCDIR)%.cc) -o $@ +HARFBUZZNG_BUILD_X86 = $(CXX_X86) $(CXXFLAGS_X86) $(HARFBUZZNG_DEFINES) $(HARFBUZZNG_INCLUDES) -c $(@:$(HARFBUZZNG_OBJDIR_X86)%.o=$(HARFBUZZNG_SRCDIR)%.cc) -o $@ +HARFBUZZNG_BUILD_X64 = $(CXX_X64) $(CXXFLAGS_X64) $(HARFBUZZNG_DEFINES) $(HARFBUZZNG_INCLUDES) -c $(@:$(HARFBUZZNG_OBJDIR_X64)%.o=$(HARFBUZZNG_SRCDIR)%.cc) -o $@ HARFBUZZNG_OBJS_ALL = hb-blob.o hb-buffer.o hb-buffer-serialize.o hb-common.o hb-face.o hb-font.o hb-ot-font.o hb-ot-layout.o \ hb-ot-map.o hb-ot-math.o hb-ot-shape.o hb-ot-shape-complex-arabic.o hb-ot-shape-complex-default.o \ hb-ot-shape-complex-hangul.o hb-ot-shape-complex-hebrew.o hb-ot-shape-complex-indic.o \ @@ -380,8 +380,8 @@ KISSFFT_SRCDIR = $(SRCDIR)/kissfft KISSFFT_OBJDIR_X86 = $(OBJDIR_X86)/kissfft KISSFFT_OBJDIR_X64 = $(OBJDIR_X64)/kissfft KISSFFT_INCLUDES = -I$(KISSFFT_INCDIR) -KISSFFT_BUILD_X86 = $(CC) $(CFLAGS_X86) $(KISSFFT_INCLUDES) -c $(@:$(KISSFFT_OBJDIR_X86)%.o=$(KISSFFT_SRCDIR)%.c) -o $@ -KISSFFT_BUILD_X64 = $(CC) $(CFLAGS_X64) $(KISSFFT_INCLUDES) -c $(@:$(KISSFFT_OBJDIR_X64)%.o=$(KISSFFT_SRCDIR)%.c) -o $@ +KISSFFT_BUILD_X86 = $(CC_X86) $(CFLAGS_X86) $(KISSFFT_INCLUDES) -c $(@:$(KISSFFT_OBJDIR_X86)%.o=$(KISSFFT_SRCDIR)%.c) -o $@ +KISSFFT_BUILD_X64 = $(CC_X64) $(CFLAGS_X64) $(KISSFFT_INCLUDES) -c $(@:$(KISSFFT_OBJDIR_X64)%.o=$(KISSFFT_SRCDIR)%.c) -o $@ KISSFFT_OBJS_ALL = kiss_fft.o $(KISSFFT_OBJDIR_X86)/%.o: @@ -397,8 +397,8 @@ MINIZIP_SRCDIR = $(SRCDIR)/minizip MINIZIP_OBJDIR_X86 = $(OBJDIR_X86)/minizip MINIZIP_OBJDIR_X64 = $(OBJDIR_X64)/minizip MINIZIP_INCLUDES = -I$(MINIZIP_INCDIR) -I$(ZLIB_INCDIR) -MINIZIP_BUILD_X86 = $(CC) $(CFLAGS_X86) $(MINIZIP_INCLUDES) -c $(@:$(MINIZIP_OBJDIR_X86)%.o=$(MINIZIP_SRCDIR)%.c) -o $@ -MINIZIP_BUILD_X64 = $(CC) $(CFLAGS_X64) $(MINIZIP_INCLUDES) -c $(@:$(MINIZIP_OBJDIR_X64)%.o=$(MINIZIP_SRCDIR)%.c) -o $@ +MINIZIP_BUILD_X86 = $(CC_X86) $(CFLAGS_X86) $(MINIZIP_INCLUDES) -c $(@:$(MINIZIP_OBJDIR_X86)%.o=$(MINIZIP_SRCDIR)%.c) -o $@ +MINIZIP_BUILD_X64 = $(CC_X64) $(CFLAGS_X64) $(MINIZIP_INCLUDES) -c $(@:$(MINIZIP_OBJDIR_X64)%.o=$(MINIZIP_SRCDIR)%.c) -o $@ MINIZIP_OBJS_ALL = ioapi.o mztools.o unzip.o zip.o $(MINIZIP_OBJDIR_X86)/%.o: @@ -423,9 +423,9 @@ OPENCVCORE_DEFINES = -DHAVE_CONFIG_H \ -Wno-invalid-noreturn OPENCVCORE_DEFINES_X86 = $(OPENCVCORE_DEFINES) $(OPENCVCORE_DEFINES_X86_PLAT) OPENCVCORE_DEFINES_X64 = $(OPENCVCORE_DEFINES) $(OPENCVCORE_DEFINES_X64_PLAT) -OPENCVCORE_BUILD_X86 = $(CXX) $(CXX14FLAGS_X86) $(OPENCVCORE_DEFINES_X86) $(OPENCVCORE_INCLUDES_X86) \ +OPENCVCORE_BUILD_X86 = $(CXX_X86) $(CXX14FLAGS_X86) $(OPENCVCORE_DEFINES_X86) $(OPENCVCORE_INCLUDES_X86) \ -c $(@:$(OPENCVCORE_OBJDIR_X86)%.o=$(OPENCVCORE_SRCDIR)%.cpp) -o $@ -OPENCVCORE_BUILD_X64 = $(CXX) $(CXX14FLAGS_X64) $(OPENCVCORE_DEFINES_X64) $(OPENCVCORE_INCLUDES_X64) \ +OPENCVCORE_BUILD_X64 = $(CXX_X64) $(CXX14FLAGS_X64) $(OPENCVCORE_DEFINES_X64) $(OPENCVCORE_INCLUDES_X64) \ -c $(@:$(OPENCVCORE_OBJDIR_X64)%.o=$(OPENCVCORE_SRCDIR)%.cpp) -o $@ OPENCVCORE_OBJS_ALL = algorithm.o \ alloc.o \ @@ -503,9 +503,9 @@ OPENCVIMGCODECS_DEFINES = -DHAVE_CONFIG_H \ -Wno-invalid-noreturn OPENCVIMGCODECS_DEFINES_X86 = $(OPENCVIMGCODECS_DEFINES) $(OPENCVIMGCODECS_DEFINES_X86_PLAT) OPENCVIMGCODECS_DEFINES_X64 = $(OPENCVIMGCODECS_DEFINES) $(OPENCVIMGCODECS_DEFINES_X64_PLAT) -OPENCVIMGCODECS_BUILD_X86 = $(CXX) $(CXX14FLAGS_X86) $(OPENCVIMGCODECS_DEFINES_X86) $(OPENCVIMGCODECS_INCLUDES_X86) \ +OPENCVIMGCODECS_BUILD_X86 = $(CXX_X86) $(CXX14FLAGS_X86) $(OPENCVIMGCODECS_DEFINES_X86) $(OPENCVIMGCODECS_INCLUDES_X86) \ -c $(@:$(OPENCVIMGCODECS_OBJDIR_X86)%.o=$(OPENCVIMGCODECS_SRCDIR)%.cpp) -o $@ -OPENCVIMGCODECS_BUILD_X64 = $(CXX) $(CXX14FLAGS_X64) $(OPENCVIMGCODECS_DEFINES_X64) $(OPENCVIMGCODECS_INCLUDES_X64) \ +OPENCVIMGCODECS_BUILD_X64 = $(CXX_X64) $(CXX14FLAGS_X64) $(OPENCVIMGCODECS_DEFINES_X64) $(OPENCVIMGCODECS_INCLUDES_X64) \ -c $(@:$(OPENCVIMGCODECS_OBJDIR_X64)%.o=$(OPENCVIMGCODECS_SRCDIR)%.cpp) -o $@ OPENCVIMGCODECS_OBJS_ALL = bitstrm.o grfmt_base.o grfmt_bmp.o grfmt_hdr.o grfmt_png.o grfmt_pxm.o \ grfmt_sunras.o grfmt_tiff.o jpeg_exif.o loadsave.o rgbe.o utils.o @@ -533,9 +533,9 @@ OPENCVIMGPROC_DEFINES = -DHAVE_CONFIG_H \ -Wno-invalid-noreturn OPENCVIMGPROC_DEFINES_X86 = $(OPENCVIMGPROC_DEFINES) $(OPENCVIMGPROC_DEFINES_X86_PLAT) OPENCVIMGPROC_DEFINES_X64 = $(OPENCVIMGPROC_DEFINES) $(OPENCVIMGPROC_DEFINES_X64_PLAT) -OPENCVIMGPROC_BUILD_X86 = $(CXX) $(CXX14FLAGS_X86) $(OPENCVIMGPROC_DEFINES_X86) $(OPENCVIMGPROC_INCLUDES_X86) \ +OPENCVIMGPROC_BUILD_X86 = $(CXX_X86) $(CXX14FLAGS_X86) $(OPENCVIMGPROC_DEFINES_X86) $(OPENCVIMGPROC_INCLUDES_X86) \ -c $(@:$(OPENCVIMGPROC_OBJDIR_X86)%.o=$(OPENCVIMGPROC_SRCDIR)%.cpp) -o $@ -OPENCVIMGPROC_BUILD_X64 = $(CXX) $(CXX14FLAGS_X64) $(OPENCVIMGPROC_DEFINES_X64) $(OPENCVIMGPROC_INCLUDES_X64) \ +OPENCVIMGPROC_BUILD_X64 = $(CXX_X64) $(CXX14FLAGS_X64) $(OPENCVIMGPROC_DEFINES_X64) $(OPENCVIMGPROC_INCLUDES_X64) \ -c $(@:$(OPENCVIMGPROC_OBJDIR_X64)%.o=$(OPENCVIMGPROC_SRCDIR)%.cpp) -o $@ OPENCVIMGPROC_OBJS_ALL = accum.o \ approx.o \ @@ -610,9 +610,9 @@ OPENCVVIDEOIO_DEFINES = -DHAVE_CONFIG_H \ -Wno-invalid-noreturn OPENCVVIDEOIO_DEFINES_X86 = $(OPENCVVIDEOIO_DEFINES) $(OPENCVVIDEOIO_DEFINES_X86_PLAT) OPENCVVIDEOIO_DEFINES_X64 = $(OPENCVVIDEOIO_DEFINES) $(OPENCVVIDEOIO_DEFINES_X64_PLAT) -OPENCVVIDEOIO_BUILD_X86 = $(CXX) $(CXX14FLAGS_X86) $(OPENCVVIDEOIO_DEFINES_X86) $(OPENCVVIDEOIO_INCLUDES_X86) \ +OPENCVVIDEOIO_BUILD_X86 = $(CXX_X86) $(CXX14FLAGS_X86) $(OPENCVVIDEOIO_DEFINES_X86) $(OPENCVVIDEOIO_INCLUDES_X86) \ -c $(@:$(OPENCVVIDEOIO_OBJDIR_X86)%.o=$(OPENCVVIDEOIO_SRCDIR)%.cpp) -o $@ -OPENCVVIDEOIO_BUILD_X64 = $(CXX) $(CXX14FLAGS_X64) $(OPENCVVIDEOIO_DEFINES_X64) $(OPENCVVIDEOIO_INCLUDES_X64) \ +OPENCVVIDEOIO_BUILD_X64 = $(CXX_X64) $(CXX14FLAGS_X64) $(OPENCVVIDEOIO_DEFINES_X64) $(OPENCVVIDEOIO_INCLUDES_X64) \ -c $(@:$(OPENCVVIDEOIO_OBJDIR_X64)%.o=$(OPENCVVIDEOIO_SRCDIR)%.cpp) -o $@ OPENCVVIDEOIO_OBJS_ALL = cap.o cap_ffmpeg.o cap_images.o cap_mjpeg_decoder.o cap_mjpeg_encoder.o @@ -629,8 +629,8 @@ OSCPACK_SRCDIR = $(SRCDIR)/oscpack OSCPACK_OBJDIR_X86 = $(OBJDIR_X86)/oscpack OSCPACK_OBJDIR_X64 = $(OBJDIR_X64)/oscpack OSCPACK_INCLUDES = -I$(OSCPACK_INCDIR) -OSCPACK_BUILD_X86 = $(CXX) $(CXXFLAGS_X86) $(OSCPACK_INCLUDES) -c $(@:$(OSCPACK_OBJDIR_X86)%.o=$(OSCPACK_SRCDIR)%.cpp) -o $@ -OSCPACK_BUILD_X64 = $(CXX) $(CXXFLAGS_X64) $(OSCPACK_INCLUDES) -c $(@:$(OSCPACK_OBJDIR_X64)%.o=$(OSCPACK_SRCDIR)%.cpp) -o $@ +OSCPACK_BUILD_X86 = $(CXX_X86) $(CXXFLAGS_X86) $(OSCPACK_INCLUDES) -c $(@:$(OSCPACK_OBJDIR_X86)%.o=$(OSCPACK_SRCDIR)%.cpp) -o $@ +OSCPACK_BUILD_X64 = $(CXX_X64) $(CXXFLAGS_X64) $(OSCPACK_INCLUDES) -c $(@:$(OSCPACK_OBJDIR_X64)%.o=$(OSCPACK_SRCDIR)%.cpp) -o $@ OSCPACK_OBJS_ALL = OscOutboundPacketStream.o OscPrintReceivedElements.o OscReceivedElements.o OscTypes.o $(OSCPACK_OBJDIR_X86)/%.o: @@ -646,8 +646,8 @@ TINYAES_SRCDIR = $(SRCDIR)/tinyaes TINYAES_OBJDIR_X86 = $(OBJDIR_X86)/tinyaes TINYAES_OBJDIR_X64 = $(OBJDIR_X64)/tinyaes TINYAES_INCLUDES = -I$(TINYAES_INCDIR) -TINYAES_BUILD_X86 = $(CC) $(CFLAGS_X86) $(TINYAES_INCLUDES) -c $(@:$(TINYAES_OBJDIR_X86)%.o=$(TINYAES_SRCDIR)%.c) -o $@ -TINYAES_BUILD_X64 = $(CC) $(CFLAGS_X64) $(TINYAES_INCLUDES) -c $(@:$(TINYAES_OBJDIR_X64)%.o=$(TINYAES_SRCDIR)%.c) -o $@ +TINYAES_BUILD_X86 = $(CC_X86) $(CFLAGS_X86) $(TINYAES_INCLUDES) -c $(@:$(TINYAES_OBJDIR_X86)%.o=$(TINYAES_SRCDIR)%.c) -o $@ +TINYAES_BUILD_X64 = $(CC_X64) $(CFLAGS_X64) $(TINYAES_INCLUDES) -c $(@:$(TINYAES_OBJDIR_X64)%.o=$(TINYAES_SRCDIR)%.c) -o $@ TINYAES_OBJS_ALL = aes.o $(TINYAES_OBJDIR_X86)/%.o: @@ -663,8 +663,8 @@ TINYOBJLOADER_SRCDIR = $(SRCDIR)/tinyobjloader TINYOBJLOADER_OBJDIR_X86 = $(OBJDIR_X86)/tinyobjloader TINYOBJLOADER_OBJDIR_X64 = $(OBJDIR_X64)/tinyobjloader TINYOBJLOADER_INCLUDES = -I$(TINYOBJLOADER_INCDIR) -TINYOBJLOADER_BUILD_X86 = $(CXX) $(CXXFLAGS_X86) $(TINYOBJLOADER_INCLUDES) -c $(@:$(TINYOBJLOADER_OBJDIR_X86)%.o=$(TINYOBJLOADER_SRCDIR)%.cc) -o $@ -TINYOBJLOADER_BUILD_X64 = $(CXX) $(CXXFLAGS_X64) $(TINYOBJLOADER_INCLUDES) -c $(@:$(TINYOBJLOADER_OBJDIR_X64)%.o=$(TINYOBJLOADER_SRCDIR)%.cc) -o $@ +TINYOBJLOADER_BUILD_X86 = $(CXX_X86) $(CXXFLAGS_X86) $(TINYOBJLOADER_INCLUDES) -c $(@:$(TINYOBJLOADER_OBJDIR_X86)%.o=$(TINYOBJLOADER_SRCDIR)%.cc) -o $@ +TINYOBJLOADER_BUILD_X64 = $(CXX_X64) $(CXXFLAGS_X64) $(TINYOBJLOADER_INCLUDES) -c $(@:$(TINYOBJLOADER_OBJDIR_X64)%.o=$(TINYOBJLOADER_SRCDIR)%.cc) -o $@ TINYOBJLOADER_OBJS_ALL = tiny_obj_loader.o $(TINYOBJLOADER_OBJDIR_X86)/%.o: @@ -680,8 +680,8 @@ TINYXML_SRCDIR = $(SRCDIR)/tinyxml TINYXML_OBJDIR_X86 = $(OBJDIR_X86)/tinyxml TINYXML_OBJDIR_X64 = $(OBJDIR_X64)/tinyxml TINYXML_INCLUDES = -I$(TINYXML_INCDIR) -TINYXML_BUILD_X86 = $(CXX) $(CXXFLAGS_X86) $(TINYXML_INCLUDES) -c $(@:$(TINYXML_OBJDIR_X86)%.o=$(TINYXML_SRCDIR)%.cpp) -o $@ -TINYXML_BUILD_X64 = $(CXX) $(CXXFLAGS_X64) $(TINYXML_INCLUDES) -c $(@:$(TINYXML_OBJDIR_X64)%.o=$(TINYXML_SRCDIR)%.cpp) -o $@ +TINYXML_BUILD_X86 = $(CXX_X86) $(CXXFLAGS_X86) $(TINYXML_INCLUDES) -c $(@:$(TINYXML_OBJDIR_X86)%.o=$(TINYXML_SRCDIR)%.cpp) -o $@ +TINYXML_BUILD_X64 = $(CXX_X64) $(CXXFLAGS_X64) $(TINYXML_INCLUDES) -c $(@:$(TINYXML_OBJDIR_X64)%.o=$(TINYXML_SRCDIR)%.cpp) -o $@ TINYXML_OBJS_ALL = tinystr.o tinyxml.o tinyxmlerror.o tinyxmlparser.o $(TINYXML_OBJDIR_X86)/%.o: @@ -705,13 +705,13 @@ QTBOOTSTRAP_INCLUDES = -I$(INCDIR) -I$(SRCDIR) -I$(ZLIB_INCDIR) -I$(INCDIR)/ -I$(INCDIR)/qt/QtCore/private -I$(INCDIR)/qt/QtXml -I$(INCDIR)/qt/QtXml/private QTBOOTSTRAP_INCLUDES_X86 = $(QTBOOTSTRAP_INCLUDES) $(QTBOOTSTRAP_INCLUDES_X86_PLAT) QTBOOTSTRAP_INCLUDES_X64 = $(QTBOOTSTRAP_INCLUDES) $(QTBOOTSTRAP_INCLUDES_X64_PLAT) -QTBOOTSTRAP_BUILD_X86 = $(CXX) $(CXXFLAGS_X86) $(QTBOOTSTRAP_DEFINES_X86) $(QTBOOTSTRAP_INCLUDES_X86) \ +QTBOOTSTRAP_BUILD_X86 = $(CXX_X86) $(CXXFLAGS_X86) $(QTBOOTSTRAP_DEFINES_X86) $(QTBOOTSTRAP_INCLUDES_X86) \ -c $(@:$(QTBOOTSTRAP_OBJDIR_X86)%.o=$(QTBOOTSTRAP_SRCDIR)%.cpp) -o $@ -QTBOOTSTRAP_BUILD_X64 = $(CXX) $(CXXFLAGS_X64) $(QTBOOTSTRAP_DEFINES_X64) $(QTBOOTSTRAP_INCLUDES_X64) \ +QTBOOTSTRAP_BUILD_X64 = $(CXX_X64) $(CXXFLAGS_X64) $(QTBOOTSTRAP_DEFINES_X64) $(QTBOOTSTRAP_INCLUDES_X64) \ -c $(@:$(QTBOOTSTRAP_OBJDIR_X64)%.o=$(QTBOOTSTRAP_SRCDIR)%.cpp) -o $@ -QTBOOTSTRAP_BUILD_OMM_X86= $(CXX) $(CXXFLAGS_X86) $(QTBOOTSTRAP_DEFINES_X86) $(QTBOOTSTRAP_INCLUDES_X86) \ +QTBOOTSTRAP_BUILD_OMM_X86= $(CXX_X86) $(CXXFLAGS_X86) $(QTBOOTSTRAP_DEFINES_X86) $(QTBOOTSTRAP_INCLUDES_X86) \ -c $(@:$(QTBOOTSTRAP_OBJDIR_X86)%.omm=$(QTBOOTSTRAP_SRCDIR)%.mm) -o $@ -QTBOOTSTRAP_BUILD_OMM_X64= $(CXX) $(CXXFLAGS_X64) $(QTBOOTSTRAP_DEFINES_X64) $(QTBOOTSTRAP_INCLUDES_X64) \ +QTBOOTSTRAP_BUILD_OMM_X64= $(CXX_X64) $(CXXFLAGS_X64) $(QTBOOTSTRAP_DEFINES_X64) $(QTBOOTSTRAP_INCLUDES_X64) \ -c $(@:$(QTBOOTSTRAP_OBJDIR_X64)%.omm=$(QTBOOTSTRAP_SRCDIR)%.mm) -o $@ QTBOOTSTRAP_OBJS_ALL = qt-core/codecs/qlatincodec.o \ qt-core/codecs/qtextcodec.o \ @@ -830,9 +830,9 @@ QTMOC_DEFINES_X64 = $(QTMOC_DEFINES) $(QTMOC_DEFINES_X64_PLAT) QTMOC_INCLUDES = -I$(INCDIR)/tinycbor -I$(INCDIR)/qt -I$(INCDIR)/qt/QtCore -I$(SRCDIR) QTMOC_INCLUDES_X86 = $(QTMOC_INCLUDES) $(QTMOC_INCLUDES_X86_PLAT) QTMOC_INCLUDES_X64 = $(QTMOC_INCLUDES) $(QTMOC_INCLUDES_X64_PLAT) -QTMOC_BUILD_X86 = $(CXX) $(CXXFLAGS_X86) $(QTMOC_DEFINES_X86) $(QTMOC_INCLUDES_X86) \ +QTMOC_BUILD_X86 = $(CXX_X86) $(CXXFLAGS_X86) $(QTMOC_DEFINES_X86) $(QTMOC_INCLUDES_X86) \ -c $(@:$(QTMOC_OBJDIR_X86)%.o=$(QTMOC_SRCDIR)%.cpp) -o $@ -QTMOC_BUILD_X64 = $(CXX) $(CXXFLAGS_X64) $(QTMOC_DEFINES_X64) $(QTMOC_INCLUDES_X64) \ +QTMOC_BUILD_X64 = $(CXX_X64) $(CXXFLAGS_X64) $(QTMOC_DEFINES_X64) $(QTMOC_INCLUDES_X64) \ -c $(@:$(QTMOC_OBJDIR_X64)%.o=$(QTMOC_SRCDIR)%.cpp) -o $@ QTMOC_OBJS_ALL = generator.o main.o moc.o parser.o preprocessor.o token.o @@ -870,9 +870,9 @@ QTRCC_DEFINES_X64 = $(QTRCC_DEFINES) $(QTRCC_DEFINES_X64_PLAT) QTRCC_INCLUDES = -I$(INCDIR)/qt -I$(INCDIR)/qt/QtCore -I$(QTRCC_SRCDIR) QTRCC_INCLUDES_X86 = $(QTRCC_INCLUDES) $(QTRCC_INCLUDES_X86_PLAT) QTRCC_INCLUDES_X64 = $(QTRCC_INCLUDES) $(QTRCC_INCLUDES_X64_PLAT) -QTRCC_BUILD_X86 = $(CXX) $(CXXFLAGS_X86) $(QTRCC_DEFINES_X86) $(QTRCC_INCLUDES_X86) \ +QTRCC_BUILD_X86 = $(CXX_X86) $(CXXFLAGS_X86) $(QTRCC_DEFINES_X86) $(QTRCC_INCLUDES_X86) \ -c $(@:$(QTRCC_OBJDIR_X86)%.o=$(QTRCC_SRCDIR)%.cpp) -o $@ -QTRCC_BUILD_X64 = $(CXX) $(CXXFLAGS_X64) $(QTRCC_DEFINES_X64) $(QTRCC_INCLUDES_X64) \ +QTRCC_BUILD_X64 = $(CXX_X64) $(CXXFLAGS_X64) $(QTRCC_DEFINES_X64) $(QTRCC_INCLUDES_X64) \ -c $(@:$(QTRCC_OBJDIR_X64)%.o=$(QTRCC_SRCDIR)%.cpp) -o $@ QTRCC_OBJS_ALL = main.o rcc.o @@ -910,9 +910,9 @@ QTUIC_DEFINES_X64 = $(QTUIC_DEFINES) $(QTUIC_DEFINES_X64_PLAT) QTUIC_INCLUDES = -I$(INCDIR)/qt -I$(INCDIR)/qt/QtCore -I$(QTUIC_SRCDIR) -I$(QTUIC_SRCDIR)/cpp QTUIC_INCLUDES_X86 = $(QTUIC_INCLUDES) $(QTUIC_INCLUDES_X86_PLAT) QTUIC_INCLUDES_X64 = $(QTUIC_INCLUDES) $(QTUIC_INCLUDES_X64_PLAT) -QTUIC_BUILD_X86 = $(CXX) $(CXXFLAGS_X86) $(QTUIC_DEFINES_X86) $(QTUIC_INCLUDES_X86) \ +QTUIC_BUILD_X86 = $(CXX_X86) $(CXXFLAGS_X86) $(QTUIC_DEFINES_X86) $(QTUIC_INCLUDES_X86) \ -c $(@:$(QTUIC_OBJDIR_X86)%.o=$(QTUIC_SRCDIR)%.cpp) -o $@ -QTUIC_BUILD_X64 = $(CXX) $(CXXFLAGS_X64) $(QTUIC_DEFINES_X64) $(QTUIC_INCLUDES_X64) \ +QTUIC_BUILD_X64 = $(CXX_X64) $(CXXFLAGS_X64) $(QTUIC_DEFINES_X64) $(QTUIC_INCLUDES_X64) \ -c $(@:$(QTUIC_OBJDIR_X64)%.o=$(QTUIC_SRCDIR)%.cpp) -o $@ QTUIC_OBJS_ALL = cpp/cppwritedeclaration.o cpp/cppwriteincludes.o cpp/cppwriteinitialization.o \ customwidgetsinfo.o databaseinfo.o driver.o main.o treewalker.o ui4.o uic.o validator.o @@ -946,6 +946,7 @@ QTBLUETOOTH_INCLUDES = -I$(INCDIR)/qt \ -I$(INCDIR)/qt/QtBluetooth/private \ -I$(INCDIR)/qt/QtBluetooth/private/bluez \ -I$(INCDIR)/qt/QtDBus \ + -I$(INCDIR)/qt/QtAndroidExtras \ -I$(QTBLUETOOTH_SRCDIR) QTBLUETOOTH_INCLUDES_X86 = $(QTBLUETOOTH_INCLUDES) -I$(QTBLUETOOTH_MOCDIR_X86) $(QTBLUETOOTH_INCLUDES_X86_PLAT) QTBLUETOOTH_INCLUDES_X64 = $(QTBLUETOOTH_INCLUDES) -I$(QTBLUETOOTH_MOCDIR_X64) $(QTBLUETOOTH_INCLUDES_X64_PLAT) @@ -984,13 +985,13 @@ QTBLUETOOTH_MOC_C_X86 = $(MOC_X86) $(QTBLUETOOTH_DEFINES_X86) $(QTBLUETOOTH_ QTBLUETOOTH_MOC_C_X64 = $(MOC_X64) $(QTBLUETOOTH_DEFINES_X64) $(QTBLUETOOTH_INCLUDES_X64) \ $(@:$(QTBLUETOOTH_MOCDIR_X64)/%.moc=$(QTBLUETOOTH_SRCDIR)/%.cpp) -o $@ QTBLUETOOTH_MOCC_ALL = -QTBLUETOOTH_BUILD_X86 = $(CXX) $(CXXFLAGS_X86) $(QTBLUETOOTH_DEFINES_X86) $(QTBLUETOOTH_INCLUDES_X86) \ +QTBLUETOOTH_BUILD_X86 = $(CXX_X86) $(CXXFLAGS_X86) $(QTBLUETOOTH_DEFINES_X86) $(QTBLUETOOTH_INCLUDES_X86) \ -c $(@:$(QTBLUETOOTH_OBJDIR_X86)%.o=$(QTBLUETOOTH_SRCDIR)%.cpp) -o $@ -QTBLUETOOTH_BUILD_X64 = $(CXX) $(CXXFLAGS_X64) $(QTBLUETOOTH_DEFINES_X64) $(QTBLUETOOTH_INCLUDES_X64) \ +QTBLUETOOTH_BUILD_X64 = $(CXX_X64) $(CXXFLAGS_X64) $(QTBLUETOOTH_DEFINES_X64) $(QTBLUETOOTH_INCLUDES_X64) \ -c $(@:$(QTBLUETOOTH_OBJDIR_X64)%.o=$(QTBLUETOOTH_SRCDIR)%.cpp) -o $@ -QTBLUETOOTH_BUILD_OMM_X86 = $(CXX) $(CXXFLAGS_X86) $(QTBLUETOOTH_DEFINES_X86) $(QTBLUETOOTH_INCLUDES_X86) \ +QTBLUETOOTH_BUILD_OMM_X86 = $(CXX_X86) $(CXXFLAGS_X86) $(QTBLUETOOTH_DEFINES_X86) $(QTBLUETOOTH_INCLUDES_X86) \ -c $(@:$(QTBLUETOOTH_OBJDIR_X86)%.omm=$(QTBLUETOOTH_SRCDIR)%.mm) -o $@ -QTBLUETOOTH_BUILD_OMM_X64 = $(CXX) $(CXXFLAGS_X64) $(QTBLUETOOTH_DEFINES_X64) $(QTBLUETOOTH_INCLUDES_X64) \ +QTBLUETOOTH_BUILD_OMM_X64 = $(CXX_X64) $(CXXFLAGS_X64) $(QTBLUETOOTH_DEFINES_X64) $(QTBLUETOOTH_INCLUDES_X64) \ -c $(@:$(QTBLUETOOTH_OBJDIR_X64)%.omm=$(QTBLUETOOTH_SRCDIR)%.mm) -o $@ QTBLUETOOTH_OBJS_ALL = qbluetooth.o \ qbluetoothaddress.o \ @@ -1010,9 +1011,9 @@ QTBLUETOOTH_OBJS_ALL = qbluetooth.o \ qlowenergydescriptordata.o \ qlowenergyservicedata.o \ qlowenergyserviceprivate.o -QTBLUETOOTH_BUILD_MOC_X86 = $(CXX) $(CXXFLAGS_X86) $(QTBLUETOOTH_DEFINES_X86) $(QTBLUETOOTH_INCLUDES_X86) \ +QTBLUETOOTH_BUILD_MOC_X86 = $(CXX_X86) $(CXXFLAGS_X86) $(QTBLUETOOTH_DEFINES_X86) $(QTBLUETOOTH_INCLUDES_X86) \ -c $(@:$(QTBLUETOOTH_OBJDIR_X86)/%.omoc=$(QTBLUETOOTH_MOCDIR_X86)/moc_%.cpp) -o $@ -QTBLUETOOTH_BUILD_MOC_X64 = $(CXX) $(CXXFLAGS_X64) $(QTBLUETOOTH_DEFINES_X64) $(QTBLUETOOTH_INCLUDES_X64) \ +QTBLUETOOTH_BUILD_MOC_X64 = $(CXX_X64) $(CXXFLAGS_X64) $(QTBLUETOOTH_DEFINES_X64) $(QTBLUETOOTH_INCLUDES_X64) \ -c $(@:$(QTBLUETOOTH_OBJDIR_X64)/%.omoc=$(QTBLUETOOTH_MOCDIR_X64)/moc_%.cpp) -o $@ QTBLUETOOTH_OBJS_MOC_ALL = qbluetoothserviceinfo_p.omoc \ qbluetoothservicediscoveryagent_p.omoc \ @@ -1022,9 +1023,9 @@ QTBLUETOOTH_OBJS_MOC_ALL = qbluetoothserviceinfo_p.omoc \ qlowenergycontrollerbase_p.omoc \ qlowenergyservice.omoc \ qlowenergyserviceprivate_p.omoc -QTBLUETOOTH_BUILD_MOCMM_X86 = $(CXX) $(CXXFLAGS_X86) $(QTBLUETOOTH_DEFINES_X86) $(QTBLUETOOTH_INCLUDES_X86) \ +QTBLUETOOTH_BUILD_MOCMM_X86 = $(CXX_X86) $(CXXFLAGS_X86) $(QTBLUETOOTH_DEFINES_X86) $(QTBLUETOOTH_INCLUDES_X86) \ -c $(@:$(QTBLUETOOTH_OBJDIR_X86)/%.omocmm=$(QTBLUETOOTH_MOCDIR_X86)/moc_%.mm) -o $@ -QTBLUETOOTH_BUILD_MOCMM_X64 = $(CXX) $(CXXFLAGS_X64) $(QTBLUETOOTH_DEFINES_X64) $(QTBLUETOOTH_INCLUDES_X64) \ +QTBLUETOOTH_BUILD_MOCMM_X64 = $(CXX_X64) $(CXXFLAGS_X64) $(QTBLUETOOTH_DEFINES_X64) $(QTBLUETOOTH_INCLUDES_X64) \ -c $(@:$(QTBLUETOOTH_OBJDIR_X64)/%.omocmm=$(QTBLUETOOTH_MOCDIR_X64)/moc_%.mm) -o $@ QTBLUETOOTH_OBJS_MOCMM_ALL = @@ -1198,13 +1199,13 @@ QTCORE_RCC_X64 = $(RCC_X64) --name $(basename $(@F)) \ $(@:$(QTCORE_RCCDIR_X64)/%.cpp=$(QTCORE_SRCDIR)/%.qrc) \ --output $(@:$(QTCORE_RCCDIR_X64)/%.cpp=$(QTCORE_RCCDIR_X64)/qrc_$(@F)) QTCORE_RCCH_ALL = mimetypes/mimetypes.cpp -QTCORE_BUILD_X86 = $(CXX) $(CXXFLAGS_X86) $(QTCORE_DEFINES_X86) $(QTCORE_INCLUDES_X86) \ +QTCORE_BUILD_X86 = $(CXX_X86) $(CXXFLAGS_X86) $(QTCORE_DEFINES_X86) $(QTCORE_INCLUDES_X86) \ -c $(@:$(QTCORE_OBJDIR_X86)%.o=$(QTCORE_SRCDIR)%.cpp) -o $@ -QTCORE_BUILD_X64 = $(CXX) $(CXXFLAGS_X64) $(QTCORE_DEFINES_X64) $(QTCORE_INCLUDES_X64) \ +QTCORE_BUILD_X64 = $(CXX_X64) $(CXXFLAGS_X64) $(QTCORE_DEFINES_X64) $(QTCORE_INCLUDES_X64) \ -c $(@:$(QTCORE_OBJDIR_X64)%.o=$(QTCORE_SRCDIR)%.cpp) -o $@ -QTCORE_BUILD_OMM_X86 = $(CXX) $(CXXFLAGS_X86) $(QTCORE_DEFINES_X86) $(QTCORE_INCLUDES_X86) \ +QTCORE_BUILD_OMM_X86 = $(CXX_X86) $(CXXFLAGS_X86) $(QTCORE_DEFINES_X86) $(QTCORE_INCLUDES_X86) \ -c $(@:$(QTCORE_OBJDIR_X86)%.omm=$(QTCORE_SRCDIR)%.mm) -o $@ -QTCORE_BUILD_OMM_X64 = $(CXX) $(CXXFLAGS_X64) $(QTCORE_DEFINES_X64) $(QTCORE_INCLUDES_X64) \ +QTCORE_BUILD_OMM_X64 = $(CXX_X64) $(CXXFLAGS_X64) $(QTCORE_DEFINES_X64) $(QTCORE_INCLUDES_X64) \ -c $(@:$(QTCORE_OBJDIR_X64)%.omm=$(QTCORE_SRCDIR)%.mm) -o $@ QTCORE_OBJS_ALL = animation/qabstractanimation.o \ animation/qanimationgroup.o \ @@ -1406,14 +1407,14 @@ QTCORE_OBJS_ALL = animation/qabstractanimation.o \ tools/qvector_msvc.o \ tools/qversionnumber.o \ tools/qvsnprintf.o -QTCORE_BUILD_MOC_X86 = $(CXX) $(CXXFLAGS_X86) $(QTCORE_DEFINES_X86) $(QTCORE_INCLUDES_X86) \ +QTCORE_BUILD_MOC_X86 = $(CXX_X86) $(CXXFLAGS_X86) $(QTCORE_DEFINES_X86) $(QTCORE_INCLUDES_X86) \ -c $(@:$(QTCORE_OBJDIR_X86)/%.omoc=$(QTCORE_MOCDIR_X86)/moc_%.cpp) -o $@ -QTCORE_BUILD_MOC_X64 = $(CXX) $(CXXFLAGS_X64) $(QTCORE_DEFINES_X64) $(QTCORE_INCLUDES_X64) \ +QTCORE_BUILD_MOC_X64 = $(CXX_X64) $(CXXFLAGS_X64) $(QTCORE_DEFINES_X64) $(QTCORE_INCLUDES_X64) \ -c $(@:$(QTCORE_OBJDIR_X64)/%.omoc=$(QTCORE_MOCDIR_X64)/moc_%.cpp) -o $@ QTCORE_OBJS_MOC_ALL = qmimetype.omoc -QTCORE_BUILD_RCC_X86 = $(CXX) $(CXXFLAGS_X86) $(QTCORE_DEFINES_X86) $(QTCORE_INCLUDES_X86) \ +QTCORE_BUILD_RCC_X86 = $(CXX_X86) $(CXXFLAGS_X86) $(QTCORE_DEFINES_X86) $(QTCORE_INCLUDES_X86) \ -c $(@:$(QTCORE_OBJDIR_X86)/%.orcc=$(QTCORE_RCCDIR_X86)/qrc_$(@F:.orcc=.cpp)) -o $@ -QTCORE_BUILD_RCC_X64 = $(CXX) $(CXXFLAGS_X64) $(QTCORE_DEFINES_X64) $(QTCORE_INCLUDES_X64) \ +QTCORE_BUILD_RCC_X64 = $(CXX_X64) $(CXXFLAGS_X64) $(QTCORE_DEFINES_X64) $(QTCORE_INCLUDES_X64) \ -c $(@:$(QTCORE_OBJDIR_X64)/%.orcc=$(QTCORE_RCCDIR_X64)/qrc_$(@F:.orcc=.cpp)) -o $@ QTCORE_OBJS_RCC_ALL = mimetypes.orcc @@ -1524,19 +1525,19 @@ QTDBUS_RCC_X64 = $(RCC_X64) --name $(basename $(@F)) \ $(@:$(QTDBUS_RCCDIR_X64)/%.cpp=$(QTDBUS_SRCDIR)/%.qrc) \ --output $(@:$(QTDBUS_RCCDIR_X64)/%.cpp=$(QTDBUS_RCCDIR_X64)/qrc_$(@F)) QTDBUS_RCCH_ALL = -QTDBUS_BUILD_X86 = $(CXX) $(CXXFLAGS_X86) $(QTDBUS_DEFINES_X86) $(QTDBUS_INCLUDES_X86) \ +QTDBUS_BUILD_X86 = $(CXX_X86) $(CXXFLAGS_X86) $(QTDBUS_DEFINES_X86) $(QTDBUS_INCLUDES_X86) \ -c $(@:$(QTDBUS_OBJDIR_X86)%.o=$(QTDBUS_SRCDIR)%.cpp) -o $@ -QTDBUS_BUILD_X64 = $(CXX) $(CXXFLAGS_X64) $(QTDBUS_DEFINES_X64) $(QTDBUS_INCLUDES_X64) \ +QTDBUS_BUILD_X64 = $(CXX_X64) $(CXXFLAGS_X64) $(QTDBUS_DEFINES_X64) $(QTDBUS_INCLUDES_X64) \ -c $(@:$(QTDBUS_OBJDIR_X64)%.o=$(QTDBUS_SRCDIR)%.cpp) -o $@ QTDBUS_OBJS_ALL = -QTDBUS_BUILD_MOC_X86 = $(CXX) $(CXXFLAGS_X86) $(QTDBUS_DEFINES_X86) $(QTDBUS_INCLUDES_X86) \ +QTDBUS_BUILD_MOC_X86 = $(CXX_X86) $(CXXFLAGS_X86) $(QTDBUS_DEFINES_X86) $(QTDBUS_INCLUDES_X86) \ -c $(@:$(QTDBUS_OBJDIR_X86)/%.omoc=$(QTDBUS_MOCDIR_X86)/moc_%.cpp) -o $@ -QTDBUS_BUILD_MOC_X64 = $(CXX) $(CXXFLAGS_X64) $(QTDBUS_DEFINES_X64) $(QTDBUS_INCLUDES_X64) \ +QTDBUS_BUILD_MOC_X64 = $(CXX_X64) $(CXXFLAGS_X64) $(QTDBUS_DEFINES_X64) $(QTDBUS_INCLUDES_X64) \ -c $(@:$(QTDBUS_OBJDIR_X64)/%.omoc=$(QTDBUS_MOCDIR_X64)/moc_%.cpp) -o $@ QTDBUS_OBJS_MOC_ALL = -QTDBUS_BUILD_RCC_X86 = $(CXX) $(CXXFLAGS_X86) $(QTDBUS_DEFINES_X86) $(QTDBUS_INCLUDES_X86) \ +QTDBUS_BUILD_RCC_X86 = $(CXX_X86) $(CXXFLAGS_X86) $(QTDBUS_DEFINES_X86) $(QTDBUS_INCLUDES_X86) \ -c $(@:$(QTDBUS_OBJDIR_X86)/%.orcc=$(QTDBUS_RCCDIR_X86)/qrc_$(@F:.orcc=.cpp)) -o $@ -QTDBUS_BUILD_RCC_X64 = $(CXX) $(CXXFLAGS_X64) $(QTDBUS_DEFINES_X64) $(QTDBUS_INCLUDES_X64) \ +QTDBUS_BUILD_RCC_X64 = $(CXX_X64) $(CXXFLAGS_X64) $(QTDBUS_DEFINES_X64) $(QTDBUS_INCLUDES_X64) \ -c $(@:$(QTDBUS_OBJDIR_X64)/%.orcc=$(QTDBUS_RCCDIR_X64)/qrc_$(@F:.orcc=.cpp)) -o $@ QTDBUS_OBJS_RCC_ALL = @@ -1638,19 +1639,19 @@ QTEVENTDISPATCHERS_RCC_X64 = $(RCC_X64) --name $(basename $(@F)) \ $(@:$(QTEVENTDISPATCHERS_RCCDIR_X64)/%.cpp=$(QTEVENTDISPATCHERS_SRCDIR)/%.qrc) \ --output $(@:$(QTEVENTDISPATCHERS_RCCDIR_X64)/%.cpp=$(QTEVENTDISPATCHERS_RCCDIR_X64)/qrc_$(@F)) QTEVENTDISPATCHERS_RCCH_ALL = -QTEVENTDISPATCHERS_BUILD_X86 = $(CXX) $(CXXFLAGS_X86) $(QTEVENTDISPATCHERS_DEFINES_X86) $(QTEVENTDISPATCHERS_INCLUDES_X86) \ +QTEVENTDISPATCHERS_BUILD_X86 = $(CXX_X86) $(CXXFLAGS_X86) $(QTEVENTDISPATCHERS_DEFINES_X86) $(QTEVENTDISPATCHERS_INCLUDES_X86) \ -c $(@:$(QTEVENTDISPATCHERS_OBJDIR_X86)%.o=$(QTEVENTDISPATCHERS_SRCDIR)%.cpp) -o $@ -QTEVENTDISPATCHERS_BUILD_X64 = $(CXX) $(CXXFLAGS_X64) $(QTEVENTDISPATCHERS_DEFINES_X64) $(QTEVENTDISPATCHERS_INCLUDES_X64) \ +QTEVENTDISPATCHERS_BUILD_X64 = $(CXX_X64) $(CXXFLAGS_X64) $(QTEVENTDISPATCHERS_DEFINES_X64) $(QTEVENTDISPATCHERS_INCLUDES_X64) \ -c $(@:$(QTEVENTDISPATCHERS_OBJDIR_X64)%.o=$(QTEVENTDISPATCHERS_SRCDIR)%.cpp) -o $@ QTEVENTDISPATCHERS_OBJS_ALL = -QTEVENTDISPATCHERS_BUILD_MOC_X86 = $(CXX) $(CXXFLAGS_X86) $(QTEVENTDISPATCHERS_DEFINES_X86) $(QTEVENTDISPATCHERS_INCLUDES_X86) \ +QTEVENTDISPATCHERS_BUILD_MOC_X86 = $(CXX_X86) $(CXXFLAGS_X86) $(QTEVENTDISPATCHERS_DEFINES_X86) $(QTEVENTDISPATCHERS_INCLUDES_X86) \ -c $(@:$(QTEVENTDISPATCHERS_OBJDIR_X86)/%.omoc=$(QTEVENTDISPATCHERS_MOCDIR_X86)/moc_%.cpp) -o $@ -QTEVENTDISPATCHERS_BUILD_MOC_X64 = $(CXX) $(CXXFLAGS_X64) $(QTEVENTDISPATCHERS_DEFINES_X64) $(QTEVENTDISPATCHERS_INCLUDES_X64) \ +QTEVENTDISPATCHERS_BUILD_MOC_X64 = $(CXX_X64) $(CXXFLAGS_X64) $(QTEVENTDISPATCHERS_DEFINES_X64) $(QTEVENTDISPATCHERS_INCLUDES_X64) \ -c $(@:$(QTEVENTDISPATCHERS_OBJDIR_X64)/%.omoc=$(QTEVENTDISPATCHERS_MOCDIR_X64)/moc_%.cpp) -o $@ QTEVENTDISPATCHERS_OBJS_MOC_ALL = -QTEVENTDISPATCHERS_BUILD_RCC_X86 = $(CXX) $(CXXFLAGS_X86) $(QTEVENTDISPATCHERS_DEFINES_X86) $(QTEVENTDISPATCHERS_INCLUDES_X86) \ +QTEVENTDISPATCHERS_BUILD_RCC_X86 = $(CXX_X86) $(CXXFLAGS_X86) $(QTEVENTDISPATCHERS_DEFINES_X86) $(QTEVENTDISPATCHERS_INCLUDES_X86) \ -c $(@:$(QTEVENTDISPATCHERS_OBJDIR_X86)/%.orcc=$(QTEVENTDISPATCHERS_RCCDIR_X86)/qrc_$(@F:.orcc=.cpp)) -o $@ -QTEVENTDISPATCHERS_BUILD_RCC_X64 = $(CXX) $(CXXFLAGS_X64) $(QTEVENTDISPATCHERS_DEFINES_X64) $(QTEVENTDISPATCHERS_INCLUDES_X64) \ +QTEVENTDISPATCHERS_BUILD_RCC_X64 = $(CXX_X64) $(CXXFLAGS_X64) $(QTEVENTDISPATCHERS_DEFINES_X64) $(QTEVENTDISPATCHERS_INCLUDES_X64) \ -c $(@:$(QTEVENTDISPATCHERS_OBJDIR_X64)/%.orcc=$(QTEVENTDISPATCHERS_RCCDIR_X64)/qrc_$(@F:.orcc=.cpp)) -o $@ QTEVENTDISPATCHERS_OBJS_RCC_ALL = @@ -1753,23 +1754,23 @@ QTFONTDATABASES_RCC_X64 = $(RCC_X64) --name $(basename $(@F)) \ $(@:$(QTFONTDATABASES_RCCDIR_X64)/%.cpp=$(QTFONTDATABASES_SRCDIR)/%.qrc) \ --output $(@:$(QTFONTDATABASES_RCCDIR_X64)/%.cpp=$(QTFONTDATABASES_RCCDIR_X64)/qrc_$(@F)) QTFONTDATABASES_RCCH_ALL = -QTFONTDATABASES_BUILD_X86 = $(CXX) $(CXXFLAGS_X86) $(QTFONTDATABASES_DEFINES_X86) $(QTFONTDATABASES_INCLUDES_X86) \ +QTFONTDATABASES_BUILD_X86 = $(CXX_X86) $(CXXFLAGS_X86) $(QTFONTDATABASES_DEFINES_X86) $(QTFONTDATABASES_INCLUDES_X86) \ -c $(@:$(QTFONTDATABASES_OBJDIR_X86)%.o=$(QTFONTDATABASES_SRCDIR)%.cpp) -o $@ -QTFONTDATABASES_BUILD_X64 = $(CXX) $(CXXFLAGS_X64) $(QTFONTDATABASES_DEFINES_X64) $(QTFONTDATABASES_INCLUDES_X64) \ +QTFONTDATABASES_BUILD_X64 = $(CXX_X64) $(CXXFLAGS_X64) $(QTFONTDATABASES_DEFINES_X64) $(QTFONTDATABASES_INCLUDES_X64) \ -c $(@:$(QTFONTDATABASES_OBJDIR_X64)%.o=$(QTFONTDATABASES_SRCDIR)%.cpp) -o $@ -QTFONTDATABASES_BUILD_OMM_X86 = $(CXX) $(CXXFLAGS_X86) $(QTFONTDATABASES_DEFINES_X86) $(QTFONTDATABASES_INCLUDES_X86) \ +QTFONTDATABASES_BUILD_OMM_X86 = $(CXX_X86) $(CXXFLAGS_X86) $(QTFONTDATABASES_DEFINES_X86) $(QTFONTDATABASES_INCLUDES_X86) \ -c $(@:$(QTFONTDATABASES_OBJDIR_X86)%.omm=$(QTFONTDATABASES_SRCDIR)%.mm) -o $@ -QTFONTDATABASES_BUILD_OMM_X64 = $(CXX) $(CXXFLAGS_X64) $(QTFONTDATABASES_DEFINES_X64) $(QTFONTDATABASES_INCLUDES_X64) \ +QTFONTDATABASES_BUILD_OMM_X64 = $(CXX_X64) $(CXXFLAGS_X64) $(QTFONTDATABASES_DEFINES_X64) $(QTFONTDATABASES_INCLUDES_X64) \ -c $(@:$(QTFONTDATABASES_OBJDIR_X64)%.omm=$(QTFONTDATABASES_SRCDIR)%.mm) -o $@ QTFONTDATABASES_OBJS_ALL = freetype/qfontengine_ft.o freetype/qfreetypefontdatabase.o -QTFONTDATABASES_BUILD_MOC_X86 = $(CXX) $(CXXFLAGS_X86) $(QTFONTDATABASES_DEFINES_X86) $(QTFONTDATABASES_INCLUDES_X86) \ +QTFONTDATABASES_BUILD_MOC_X86 = $(CXX_X86) $(CXXFLAGS_X86) $(QTFONTDATABASES_DEFINES_X86) $(QTFONTDATABASES_INCLUDES_X86) \ -c $(@:$(QTFONTDATABASES_OBJDIR_X86)/%.omoc=$(QTFONTDATABASES_MOCDIR_X86)/moc_%.cpp) -o $@ -QTFONTDATABASES_BUILD_MOC_X64 = $(CXX) $(CXXFLAGS_X64) $(QTFONTDATABASES_DEFINES_X64) $(QTFONTDATABASES_INCLUDES_X64) \ +QTFONTDATABASES_BUILD_MOC_X64 = $(CXX_X64) $(CXXFLAGS_X64) $(QTFONTDATABASES_DEFINES_X64) $(QTFONTDATABASES_INCLUDES_X64) \ -c $(@:$(QTFONTDATABASES_OBJDIR_X64)/%.omoc=$(QTFONTDATABASES_MOCDIR_X64)/moc_%.cpp) -o $@ QTFONTDATABASES_OBJS_MOC_ALL = -QTFONTDATABASES_BUILD_RCC_X86 = $(CXX) $(CXXFLAGS_X86) $(QTFONTDATABASES_DEFINES_X86) $(QTFONTDATABASES_INCLUDES_X86) \ +QTFONTDATABASES_BUILD_RCC_X86 = $(CXX_X86) $(CXXFLAGS_X86) $(QTFONTDATABASES_DEFINES_X86) $(QTFONTDATABASES_INCLUDES_X86) \ -c $(@:$(QTFONTDATABASES_OBJDIR_X86)/%.orcc=$(QTFONTDATABASES_RCCDIR_X86)/qrc_$(@F:.orcc=.cpp)) -o $@ -QTFONTDATABASES_BUILD_RCC_X64 = $(CXX) $(CXXFLAGS_X64) $(QTFONTDATABASES_DEFINES_X64) $(QTFONTDATABASES_INCLUDES_X64) \ +QTFONTDATABASES_BUILD_RCC_X64 = $(CXX_X64) $(CXXFLAGS_X64) $(QTFONTDATABASES_DEFINES_X64) $(QTFONTDATABASES_INCLUDES_X64) \ -c $(@:$(QTFONTDATABASES_OBJDIR_X64)/%.orcc=$(QTFONTDATABASES_RCCDIR_X64)/qrc_$(@F:.orcc=.cpp)) -o $@ QTFONTDATABASES_OBJS_RCC_ALL = @@ -1838,9 +1839,9 @@ QTCONCURRENT_DEFINES_X64 = $(QTCONCURRENT_DEFINES) $(QTCONCURRENT_DEFINES_X64_P QTCONCURRENT_INCLUDES = -I$(INCDIR)/qt -I$(INCDIR)/qt/QtCore -I$(INCDIR)/qt/QtConcurrent QTCONCURRENT_INCLUDES_X86 = $(QTCONCURRENT_INCLUDES) $(QTCONCURRENT_INCLUDES_X86_PLAT) QTCONCURRENT_INCLUDES_X64 = $(QTCONCURRENT_INCLUDES) $(QTCONCURRENT_INCLUDES_X64_PLAT) -QTCONCURRENT_BUILD_X86 = $(CXX) $(CXXFLAGS_X86) $(QTCONCURRENT_DEFINES_X86) $(QTCONCURRENT_INCLUDES_X86) \ +QTCONCURRENT_BUILD_X86 = $(CXX_X86) $(CXXFLAGS_X86) $(QTCONCURRENT_DEFINES_X86) $(QTCONCURRENT_INCLUDES_X86) \ -c $(@:$(QTCONCURRENT_OBJDIR_X86)%.o=$(QTCONCURRENT_SRCDIR)%.cpp) -o $@ -QTCONCURRENT_BUILD_X64 = $(CXX) $(CXXFLAGS_X64) $(QTCONCURRENT_DEFINES_X64) $(QTCONCURRENT_INCLUDES_X64) \ +QTCONCURRENT_BUILD_X64 = $(CXX_X64) $(CXXFLAGS_X64) $(QTCONCURRENT_DEFINES_X64) $(QTCONCURRENT_INCLUDES_X64) \ -c $(@:$(QTCONCURRENT_OBJDIR_X64)%.o=$(QTCONCURRENT_SRCDIR)%.cpp) -o $@ QTCONCURRENT_OBJS_ALL = qtconcurrentfilter.o \ qtconcurrentiteratekernel.o \ @@ -1887,9 +1888,9 @@ QTGAMEPAD_MOC_C_X86 = $(MOC_X86) $(QTGAMEPAD_DEFINES_X86) $(QTGAMEPAD_INCLUD QTGAMEPAD_MOC_C_X64 = $(MOC_X64) $(QTGAMEPAD_DEFINES_X64) $(QTGAMEPAD_INCLUDES_X64) \ $(@:$(QTGAMEPAD_MOCDIR_X64)/%.moc=$(QTGAMEPAD_SRCDIR)/%.cpp) -o $@ QTGAMEPAD_MOCC_ALL = -QTGAMEPAD_BUILD_X86 = $(CXX) $(CXXFLAGS_X86) $(QTGAMEPAD_DEFINES_X86) $(QTGAMEPAD_INCLUDES_X86) \ +QTGAMEPAD_BUILD_X86 = $(CXX_X86) $(CXXFLAGS_X86) $(QTGAMEPAD_DEFINES_X86) $(QTGAMEPAD_INCLUDES_X86) \ -c $(@:$(QTGAMEPAD_OBJDIR_X86)%.o=$(QTGAMEPAD_SRCDIR)%.cpp) -o $@ -QTGAMEPAD_BUILD_X64 = $(CXX) $(CXXFLAGS_X64) $(QTGAMEPAD_DEFINES_X64) $(QTGAMEPAD_INCLUDES_X64) \ +QTGAMEPAD_BUILD_X64 = $(CXX_X64) $(CXXFLAGS_X64) $(QTGAMEPAD_DEFINES_X64) $(QTGAMEPAD_INCLUDES_X64) \ -c $(@:$(QTGAMEPAD_OBJDIR_X64)%.o=$(QTGAMEPAD_SRCDIR)%.cpp) -o $@ QTGAMEPAD_OBJS_ALL = qgamepad.o \ qgamepadbackend.o \ @@ -1897,9 +1898,9 @@ QTGAMEPAD_OBJS_ALL = qgamepad.o \ qgamepadbackendplugin.o \ qgamepadkeynavigation.o \ qgamepadmanager.o -QTGAMEPAD_BUILD_MOC_X86 = $(CXX) $(CXXFLAGS_X86) $(QTGAMEPAD_DEFINES_X86) $(QTGAMEPAD_INCLUDES_X86) \ +QTGAMEPAD_BUILD_MOC_X86 = $(CXX_X86) $(CXXFLAGS_X86) $(QTGAMEPAD_DEFINES_X86) $(QTGAMEPAD_INCLUDES_X86) \ -c $(@:$(QTGAMEPAD_OBJDIR_X86)/%.omoc=$(QTGAMEPAD_MOCDIR_X86)/moc_%.cpp) -o $@ -QTGAMEPAD_BUILD_MOC_X64 = $(CXX) $(CXXFLAGS_X64) $(QTGAMEPAD_DEFINES_X64) $(QTGAMEPAD_INCLUDES_X64) \ +QTGAMEPAD_BUILD_MOC_X64 = $(CXX_X64) $(CXXFLAGS_X64) $(QTGAMEPAD_DEFINES_X64) $(QTGAMEPAD_INCLUDES_X64) \ -c $(@:$(QTGAMEPAD_OBJDIR_X64)/%.omoc=$(QTGAMEPAD_MOCDIR_X64)/moc_%.cpp) -o $@ QTGAMEPAD_OBJS_MOC_ALL = @@ -2048,13 +2049,13 @@ QTGUI_RCC_X64 = $(RCC_X64) --name $(basename $(@F)) \ $(@:$(QTGUI_RCCDIR_X64)/%.cpp=$(QTGUI_SRCDIR)/%.qrc) \ --output $(@:$(QTGUI_RCCDIR_X64)/%.cpp=$(QTGUI_RCCDIR_X64)/qrc_$(@F)) QTGUI_RCCH_ALL = painting/qpdf.cpp painting/qmake_webgradients.cpp -QTGUI_BUILD_X86 = $(CXX) $(CXXFLAGS_X86) $(QTGUI_DEFINES_X86) $(QTGUI_INCLUDES_X86) \ +QTGUI_BUILD_X86 = $(CXX_X86) $(CXXFLAGS_X86) $(QTGUI_DEFINES_X86) $(QTGUI_INCLUDES_X86) \ -c $(@:$(QTGUI_OBJDIR_X86)%.o=$(QTGUI_SRCDIR)%.cpp) -o $@ -QTGUI_BUILD_X64 = $(CXX) $(CXXFLAGS_X64) $(QTGUI_DEFINES_X64) $(QTGUI_INCLUDES_X64) \ +QTGUI_BUILD_X64 = $(CXX_X64) $(CXXFLAGS_X64) $(QTGUI_DEFINES_X64) $(QTGUI_INCLUDES_X64) \ -c $(@:$(QTGUI_OBJDIR_X64)%.o=$(QTGUI_SRCDIR)%.cpp) -o $@ -QTGUI_BUILD_OMM_X86 = $(CXX) $(CXXFLAGS_X86) $(QTGUI_DEFINES_X86) $(QTGUI_INCLUDES_X86) \ +QTGUI_BUILD_OMM_X86 = $(CXX_X86) $(CXXFLAGS_X86) $(QTGUI_DEFINES_X86) $(QTGUI_INCLUDES_X86) \ -c $(@:$(QTGUI_OBJDIR_X86)%.omm=$(QTGUI_SRCDIR)%.mm) -o $@ -QTGUI_BUILD_OMM_X64 = $(CXX) $(CXXFLAGS_X64) $(QTGUI_DEFINES_X64) $(QTGUI_INCLUDES_X64) \ +QTGUI_BUILD_OMM_X64 = $(CXX_X64) $(CXXFLAGS_X64) $(QTGUI_DEFINES_X64) $(QTGUI_INCLUDES_X64) \ -c $(@:$(QTGUI_OBJDIR_X64)%.omm=$(QTGUI_SRCDIR)%.mm) -o $@ QTGUI_OBJS_ALL = accessible/qaccessible.o \ accessible/qaccessiblebridge.o \ @@ -2164,32 +2165,6 @@ QTGUI_OBJS_ALL = accessible/qaccessible.o \ opengl/qopenglengineshadermanager.o \ opengl/qopenglframebufferobject.o \ opengl/qopenglfunctions.o \ - opengl/qopenglfunctions_1_0.o \ - opengl/qopenglfunctions_1_1.o \ - opengl/qopenglfunctions_1_2.o \ - opengl/qopenglfunctions_1_3.o \ - opengl/qopenglfunctions_1_4.o \ - opengl/qopenglfunctions_1_5.o \ - opengl/qopenglfunctions_2_0.o \ - opengl/qopenglfunctions_2_1.o \ - opengl/qopenglfunctions_3_0.o \ - opengl/qopenglfunctions_3_1.o \ - opengl/qopenglfunctions_3_2_compatibility.o \ - opengl/qopenglfunctions_3_2_core.o \ - opengl/qopenglfunctions_3_3_compatibility.o \ - opengl/qopenglfunctions_3_3_core.o \ - opengl/qopenglfunctions_4_0_compatibility.o \ - opengl/qopenglfunctions_4_0_core.o \ - opengl/qopenglfunctions_4_1_compatibility.o \ - opengl/qopenglfunctions_4_1_core.o \ - opengl/qopenglfunctions_4_2_compatibility.o \ - opengl/qopenglfunctions_4_2_core.o \ - opengl/qopenglfunctions_4_3_compatibility.o \ - opengl/qopenglfunctions_4_3_core.o \ - opengl/qopenglfunctions_4_4_compatibility.o \ - opengl/qopenglfunctions_4_4_core.o \ - opengl/qopenglfunctions_4_5_compatibility.o \ - opengl/qopenglfunctions_4_5_core.o \ opengl/qopenglgradientcache.o \ opengl/qopenglpaintdevice.o \ opengl/qopenglpaintengine.o \ @@ -2301,12 +2276,12 @@ QTGUI_OBJS_ALL = accessible/qaccessible.o \ util/qtexturefiledata.o \ util/qtexturefilereader.o \ util/qvalidator.o -QTGUI_BUILD_X86_C = $(CC) $(CFLAGS_X86) $(QTGUI_DEFINES_X86) $(QTGUI_INCLUDES_X86) -c $(@:$(QTGUI_OBJDIR_X86)%.oc=$(QTGUI_SRCDIR)%.c) -o $@ -QTGUI_BUILD_X64_C = $(CC) $(CFLAGS_X64) $(QTGUI_DEFINES_X64) $(QTGUI_INCLUDES_X64) -c $(@:$(QTGUI_OBJDIR_X64)%.oc=$(QTGUI_SRCDIR)%.c) -o $@ +QTGUI_BUILD_X86_C = $(CC_X86) $(CFLAGS_X86) $(QTGUI_DEFINES_X86) $(QTGUI_INCLUDES_X86) -c $(@:$(QTGUI_OBJDIR_X86)%.oc=$(QTGUI_SRCDIR)%.c) -o $@ +QTGUI_BUILD_X64_C = $(CC_X64) $(CFLAGS_X64) $(QTGUI_DEFINES_X64) $(QTGUI_INCLUDES_X64) -c $(@:$(QTGUI_OBJDIR_X64)%.oc=$(QTGUI_SRCDIR)%.c) -o $@ QTGUI_OBJS_C_ALL = painting/qgrayraster.oc -QTGUI_BUILD_MOC_X86 = $(CXX) $(CXXFLAGS_X86) $(QTGUI_DEFINES_X86) $(QTGUI_INCLUDES_X86) \ +QTGUI_BUILD_MOC_X86 = $(CXX_X86) $(CXXFLAGS_X86) $(QTGUI_DEFINES_X86) $(QTGUI_INCLUDES_X86) \ -c $(@:$(QTGUI_OBJDIR_X86)/%.omoc=$(QTGUI_MOCDIR_X86)/moc_%.cpp) -o $@ -QTGUI_BUILD_MOC_X64 = $(CXX) $(CXXFLAGS_X64) $(QTGUI_DEFINES_X64) $(QTGUI_INCLUDES_X64) \ +QTGUI_BUILD_MOC_X64 = $(CXX_X64) $(CXXFLAGS_X64) $(QTGUI_DEFINES_X64) $(QTGUI_INCLUDES_X64) \ -c $(@:$(QTGUI_OBJDIR_X64)/%.omoc=$(QTGUI_MOCDIR_X64)/moc_%.cpp) -o $@ QTGUI_OBJS_MOC_ALL = qaccessible.omoc \ qaccessiblebridge.omoc \ @@ -2364,9 +2339,9 @@ QTGUI_OBJS_MOC_ALL = qaccessible.omoc \ qtexttable.omoc \ qtouchdevice.omoc \ qvalidator.omoc -QTGUI_BUILD_RCC_X86 = $(CXX) $(CXXFLAGS_X86) $(QTGUI_DEFINES_X86) $(QTGUI_INCLUDES_X86) \ +QTGUI_BUILD_RCC_X86 = $(CXX_X86) $(CXXFLAGS_X86) $(QTGUI_DEFINES_X86) $(QTGUI_INCLUDES_X86) \ -c $(@:$(QTGUI_OBJDIR_X86)/%.orcc=$(QTGUI_RCCDIR_X86)/qrc_$(@F:.orcc=.cpp)) -o $@ -QTGUI_BUILD_RCC_X64 = $(CXX) $(CXXFLAGS_X64) $(QTGUI_DEFINES_X64) $(QTGUI_INCLUDES_X64) \ +QTGUI_BUILD_RCC_X64 = $(CXX_X64) $(CXXFLAGS_X64) $(QTGUI_DEFINES_X64) $(QTGUI_INCLUDES_X64) \ -c $(@:$(QTGUI_OBJDIR_X64)/%.orcc=$(QTGUI_RCCDIR_X64)/qrc_$(@F:.orcc=.cpp)) -o $@ QTGUI_OBJS_RCC_ALL = qpdf.orcc qmake_webgradients.orcc @@ -2557,9 +2532,9 @@ QTMULTIMEDIA_RCC_X64 = $(RCC_X64) --name $(basename $(@F)) \ $(@:$(QTMULTIMEDIA_RCCDIR_X64)/%.cpp=$(QTMULTIMEDIA_SRCDIR)/%.qrc) \ --output $(@:$(QTMULTIMEDIA_RCCDIR_X64)/%.cpp=$(QTMULTIMEDIA_RCCDIR_X64)/qrc_$(@F)) QTMULTIMEDIA_RCCH_ALL = -QTMULTIMEDIA_BUILD_X86 = $(CXX) $(CXXFLAGS_X86) $(QTMULTIMEDIA_DEFINES_X86) $(QTMULTIMEDIA_INCLUDES_X86) \ +QTMULTIMEDIA_BUILD_X86 = $(CXX_X86) $(CXXFLAGS_X86) $(QTMULTIMEDIA_DEFINES_X86) $(QTMULTIMEDIA_INCLUDES_X86) \ -c $(@:$(QTMULTIMEDIA_OBJDIR_X86)%.o=$(QTMULTIMEDIA_SRCDIR)%.cpp) -o $@ -QTMULTIMEDIA_BUILD_X64 = $(CXX) $(CXXFLAGS_X64) $(QTMULTIMEDIA_DEFINES_X64) $(QTMULTIMEDIA_INCLUDES_X64) \ +QTMULTIMEDIA_BUILD_X64 = $(CXX_X64) $(CXXFLAGS_X64) $(QTMULTIMEDIA_DEFINES_X64) $(QTMULTIMEDIA_INCLUDES_X64) \ -c $(@:$(QTMULTIMEDIA_OBJDIR_X64)%.o=$(QTMULTIMEDIA_SRCDIR)%.cpp) -o $@ QTMULTIMEDIA_OBJS_ALL = audio/qaudio.o \ audio/qaudiobuffer.o \ @@ -2662,9 +2637,9 @@ QTMULTIMEDIA_OBJS_ALL = audio/qaudio.o \ qmediatimerange.o \ qmultimedia.o \ qmultimediautils.o -QTMULTIMEDIA_BUILD_MOC_X86 = $(CXX) $(CXXFLAGS_X86) $(QTMULTIMEDIA_DEFINES_X86) $(QTMULTIMEDIA_INCLUDES_X86) \ +QTMULTIMEDIA_BUILD_MOC_X86 = $(CXX_X86) $(CXXFLAGS_X86) $(QTMULTIMEDIA_DEFINES_X86) $(QTMULTIMEDIA_INCLUDES_X86) \ -c $(@:$(QTMULTIMEDIA_OBJDIR_X86)/%.omoc=$(QTMULTIMEDIA_MOCDIR_X86)/moc_%.cpp) -o $@ -QTMULTIMEDIA_BUILD_MOC_X64 = $(CXX) $(CXXFLAGS_X64) $(QTMULTIMEDIA_DEFINES_X64) $(QTMULTIMEDIA_INCLUDES_X64) \ +QTMULTIMEDIA_BUILD_MOC_X64 = $(CXX_X64) $(CXXFLAGS_X64) $(QTMULTIMEDIA_DEFINES_X64) $(QTMULTIMEDIA_INCLUDES_X64) \ -c $(@:$(QTMULTIMEDIA_OBJDIR_X64)/%.omoc=$(QTMULTIMEDIA_MOCDIR_X64)/moc_%.cpp) -o $@ QTMULTIMEDIA_OBJS_MOC_ALL = qabstractvideofilter.omoc \ qaudioprobe.omoc \ @@ -2677,9 +2652,9 @@ QTMULTIMEDIA_OBJS_MOC_ALL = qabstractvideofilter.omoc \ qvideooutputorientationhandler_p.omoc \ qvideoprobe.omoc \ qvideosurfaceoutput_p.omoc -QTMULTIMEDIA_BUILD_RCC_X86 = $(CXX) $(CXXFLAGS_X86) $(QTMULTIMEDIA_DEFINES_X86) $(QTMULTIMEDIA_INCLUDES_X86) \ +QTMULTIMEDIA_BUILD_RCC_X86 = $(CXX_X86) $(CXXFLAGS_X86) $(QTMULTIMEDIA_DEFINES_X86) $(QTMULTIMEDIA_INCLUDES_X86) \ -c $(@:$(QTMULTIMEDIA_OBJDIR_X86)/%.orcc=$(QTMULTIMEDIA_RCCDIR_X86)/qrc_$(@F:.orcc=.cpp)) -o $@ -QTMULTIMEDIA_BUILD_RCC_X64 = $(CXX) $(CXXFLAGS_X64) $(QTMULTIMEDIA_DEFINES_X64) $(QTMULTIMEDIA_INCLUDES_X64) \ +QTMULTIMEDIA_BUILD_RCC_X64 = $(CXX_X64) $(CXXFLAGS_X64) $(QTMULTIMEDIA_DEFINES_X64) $(QTMULTIMEDIA_INCLUDES_X64) \ -c $(@:$(QTMULTIMEDIA_OBJDIR_X64)/%.orcc=$(QTMULTIMEDIA_RCCDIR_X64)/qrc_$(@F:.orcc=.cpp)) -o $@ QTMULTIMEDIA_OBJS_RCC_ALL = @@ -2789,19 +2764,19 @@ QTMULTIMEDIAWIDGETS_RCC_X64 = $(RCC_X64) --name $(basename $(@F)) \ $(@:$(QTMULTIMEDIAWIDGETS_RCCDIR_X64)/%.cpp=$(QTMULTIMEDIAWIDGETS_SRCDIR)/%.qrc) \ --output $(@:$(QTMULTIMEDIAWIDGETS_RCCDIR_X64)/%.cpp=$(QTMULTIMEDIAWIDGETS_RCCDIR_X64)/qrc_$(@F)) QTMULTIMEDIAWIDGETS_RCCH_ALL = -QTMULTIMEDIAWIDGETS_BUILD_X86 = $(CXX) $(CXXFLAGS_X86) $(QTMULTIMEDIAWIDGETS_DEFINES_X86) $(QTMULTIMEDIAWIDGETS_INCLUDES_X86) \ +QTMULTIMEDIAWIDGETS_BUILD_X86 = $(CXX_X86) $(CXXFLAGS_X86) $(QTMULTIMEDIAWIDGETS_DEFINES_X86) $(QTMULTIMEDIAWIDGETS_INCLUDES_X86) \ -c $(@:$(QTMULTIMEDIAWIDGETS_OBJDIR_X86)%.o=$(QTMULTIMEDIAWIDGETS_SRCDIR)%.cpp) -o $@ -QTMULTIMEDIAWIDGETS_BUILD_X64 = $(CXX) $(CXXFLAGS_X64) $(QTMULTIMEDIAWIDGETS_DEFINES_X64) $(QTMULTIMEDIAWIDGETS_INCLUDES_X64) \ +QTMULTIMEDIAWIDGETS_BUILD_X64 = $(CXX_X64) $(CXXFLAGS_X64) $(QTMULTIMEDIAWIDGETS_DEFINES_X64) $(QTMULTIMEDIAWIDGETS_INCLUDES_X64) \ -c $(@:$(QTMULTIMEDIAWIDGETS_OBJDIR_X64)%.o=$(QTMULTIMEDIAWIDGETS_SRCDIR)%.cpp) -o $@ QTMULTIMEDIAWIDGETS_OBJS_ALL = -QTMULTIMEDIAWIDGETS_BUILD_MOC_X86 = $(CXX) $(CXXFLAGS_X86) $(QTMULTIMEDIAWIDGETS_DEFINES_X86) $(QTMULTIMEDIAWIDGETS_INCLUDES_X86) \ +QTMULTIMEDIAWIDGETS_BUILD_MOC_X86 = $(CXX_X86) $(CXXFLAGS_X86) $(QTMULTIMEDIAWIDGETS_DEFINES_X86) $(QTMULTIMEDIAWIDGETS_INCLUDES_X86) \ -c $(@:$(QTMULTIMEDIAWIDGETS_OBJDIR_X86)/%.omoc=$(QTMULTIMEDIAWIDGETS_MOCDIR_X86)/moc_%.cpp) -o $@ -QTMULTIMEDIAWIDGETS_BUILD_MOC_X64 = $(CXX) $(CXXFLAGS_X64) $(QTMULTIMEDIAWIDGETS_DEFINES_X64) $(QTMULTIMEDIAWIDGETS_INCLUDES_X64) \ +QTMULTIMEDIAWIDGETS_BUILD_MOC_X64 = $(CXX_X64) $(CXXFLAGS_X64) $(QTMULTIMEDIAWIDGETS_DEFINES_X64) $(QTMULTIMEDIAWIDGETS_INCLUDES_X64) \ -c $(@:$(QTMULTIMEDIAWIDGETS_OBJDIR_X64)/%.omoc=$(QTMULTIMEDIAWIDGETS_MOCDIR_X64)/moc_%.cpp) -o $@ QTMULTIMEDIAWIDGETS_OBJS_MOC_ALL = -QTMULTIMEDIAWIDGETS_BUILD_RCC_X86 = $(CXX) $(CXXFLAGS_X86) $(QTMULTIMEDIAWIDGETS_DEFINES_X86) $(QTMULTIMEDIAWIDGETS_INCLUDES_X86) \ +QTMULTIMEDIAWIDGETS_BUILD_RCC_X86 = $(CXX_X86) $(CXXFLAGS_X86) $(QTMULTIMEDIAWIDGETS_DEFINES_X86) $(QTMULTIMEDIAWIDGETS_INCLUDES_X86) \ -c $(@:$(QTMULTIMEDIAWIDGETS_OBJDIR_X86)/%.orcc=$(QTMULTIMEDIAWIDGETS_RCCDIR_X86)/qrc_$(@F:.orcc=.cpp)) -o $@ -QTMULTIMEDIAWIDGETS_BUILD_RCC_X64 = $(CXX) $(CXXFLAGS_X64) $(QTMULTIMEDIAWIDGETS_DEFINES_X64) $(QTMULTIMEDIAWIDGETS_INCLUDES_X64) \ +QTMULTIMEDIAWIDGETS_BUILD_RCC_X64 = $(CXX_X64) $(CXXFLAGS_X64) $(QTMULTIMEDIAWIDGETS_DEFINES_X64) $(QTMULTIMEDIAWIDGETS_INCLUDES_X64) \ -c $(@:$(QTMULTIMEDIAWIDGETS_OBJDIR_X64)/%.orcc=$(QTMULTIMEDIAWIDGETS_RCCDIR_X64)/qrc_$(@F:.orcc=.cpp)) -o $@ QTMULTIMEDIAWIDGETS_OBJS_RCC_ALL = qcameraviewfinder.o \ qgraphicsvideoitem.o \ @@ -2953,9 +2928,9 @@ QTNETWORK_RCC_X64 = $(RCC_X64) --name $(basename $(@F)) \ $(@:$(QTNETWORK_RCCDIR_X64)/%.cpp=$(QTNETWORK_SRCDIR)/%.qrc) \ --output $(@:$(QTNETWORK_RCCDIR_X64)/%.cpp=$(QTNETWORK_RCCDIR_X64)/qrc_$(@F)) QTNETWORK_RCCH_ALL = -QTNETWORK_BUILD_X86 = $(CXX) $(CXXFLAGS_X86) $(QTNETWORK_DEFINES_X86) $(QTNETWORK_INCLUDES_X86) \ +QTNETWORK_BUILD_X86 = $(CXX_X86) $(CXXFLAGS_X86) $(QTNETWORK_DEFINES_X86) $(QTNETWORK_INCLUDES_X86) \ -c $(@:$(QTNETWORK_OBJDIR_X86)%.o=$(QTNETWORK_SRCDIR)%.cpp) -o $@ -QTNETWORK_BUILD_X64 = $(CXX) $(CXXFLAGS_X64) $(QTNETWORK_DEFINES_X64) $(QTNETWORK_INCLUDES_X64) \ +QTNETWORK_BUILD_X64 = $(CXX_X64) $(CXXFLAGS_X64) $(QTNETWORK_DEFINES_X64) $(QTNETWORK_INCLUDES_X64) \ -c $(@:$(QTNETWORK_OBJDIR_X64)%.o=$(QTNETWORK_SRCDIR)%.cpp) -o $@ QTNETWORK_OBJS_ALL = access/http2/bitstreams.o \ access/http2/hpack.o \ @@ -3046,9 +3021,9 @@ QTNETWORK_OBJS_ALL = access/http2/bitstreams.o \ ssl/qsslsocket_openssl.o \ ssl/qsslsocket_openssl_symbols.o \ ssl/qsslsocket_openssl11.o -QTNETWORK_BUILD_MOC_X86 = $(CXX) $(CXXFLAGS_X86) $(QTNETWORK_DEFINES_X86) $(QTNETWORK_INCLUDES_X86) \ +QTNETWORK_BUILD_MOC_X86 = $(CXX_X86) $(CXXFLAGS_X86) $(QTNETWORK_DEFINES_X86) $(QTNETWORK_INCLUDES_X86) \ -c $(@:$(QTNETWORK_OBJDIR_X86)/%.omoc=$(QTNETWORK_MOCDIR_X86)/moc_%.cpp) -o $@ -QTNETWORK_BUILD_MOC_X64 = $(CXX) $(CXXFLAGS_X64) $(QTNETWORK_DEFINES_X64) $(QTNETWORK_INCLUDES_X64) \ +QTNETWORK_BUILD_MOC_X64 = $(CXX_X64) $(CXXFLAGS_X64) $(QTNETWORK_DEFINES_X64) $(QTNETWORK_INCLUDES_X64) \ -c $(@:$(QTNETWORK_OBJDIR_X64)/%.omoc=$(QTNETWORK_MOCDIR_X64)/moc_%.cpp) -o $@ QTNETWORK_OBJS_MOC_ALL = qabstractnetworkcache.omoc \ qabstractsocketengine_p.omoc \ @@ -3079,9 +3054,9 @@ QTNETWORK_OBJS_MOC_ALL = qabstractnetworkcache.omoc \ qspdyprotocolhandler_p.omoc \ qtcpsocket.omoc \ qudpsocket.omoc -QTNETWORK_BUILD_RCC_X86 = $(CXX) $(CXXFLAGS_X86) $(QTNETWORK_DEFINES_X86) $(QTNETWORK_INCLUDES_X86) \ +QTNETWORK_BUILD_RCC_X86 = $(CXX_X86) $(CXXFLAGS_X86) $(QTNETWORK_DEFINES_X86) $(QTNETWORK_INCLUDES_X86) \ -c $(@:$(QTNETWORK_OBJDIR_X86)/%.orcc=$(QTNETWORK_RCCDIR_X86)/qrc_$(@F:.orcc=.cpp)) -o $@ -QTNETWORK_BUILD_RCC_X64 = $(CXX) $(CXXFLAGS_X64) $(QTNETWORK_DEFINES_X64) $(QTNETWORK_INCLUDES_X64) \ +QTNETWORK_BUILD_RCC_X64 = $(CXX_X64) $(CXXFLAGS_X64) $(QTNETWORK_DEFINES_X64) $(QTNETWORK_INCLUDES_X64) \ -c $(@:$(QTNETWORK_OBJDIR_X64)/%.orcc=$(QTNETWORK_RCCDIR_X64)/qrc_$(@F:.orcc=.cpp)) -o $@ QTNETWORK_OBJS_RCC_ALL = @@ -3144,9 +3119,9 @@ QTOPENGL_INCLUDES = -I$(INCDIR)/qt -I$(INCDIR)/qt/QtCore -I$(INCDIR)/qt/QtOp -I$(INCDIR)/qt/QtGui -I$(INCDIR)/qt/QtWidgets QTOPENGL_INCLUDES_X86 = $(QTOPENGL_INCLUDES) $(QTOPENGL_INCLUDES_X86_PLAT) QTOPENGL_INCLUDES_X64 = $(QTOPENGL_INCLUDES) $(QTOPENGL_INCLUDES_X64_PLAT) -QTOPENGL_BUILD_X86 = $(CXX) $(CXXFLAGS_X86) $(QTOPENGL_DEFINES_X86) $(QTOPENGL_INCLUDES_X86) \ +QTOPENGL_BUILD_X86 = $(CXX_X86) $(CXXFLAGS_X86) $(QTOPENGL_DEFINES_X86) $(QTOPENGL_INCLUDES_X86) \ -c $(@:$(QTOPENGL_OBJDIR_X86)%.o=$(QTOPENGL_SRCDIR)%.cpp) -o $@ -QTOPENGL_BUILD_X64 = $(CXX) $(CXXFLAGS_X64) $(QTOPENGL_DEFINES_X64) $(QTOPENGL_INCLUDES_X64) \ +QTOPENGL_BUILD_X64 = $(CXX_X64) $(CXXFLAGS_X64) $(QTOPENGL_DEFINES_X64) $(QTOPENGL_INCLUDES_X64) \ -c $(@:$(QTOPENGL_OBJDIR_X64)%.o=$(QTOPENGL_SRCDIR)%.cpp) -o $@ QTOPENGL_OBJS_ALL = gl2paintengineex/qgl2pexvertexarray.o \ gl2paintengineex/qglcustomshaderstage.o \ @@ -3233,19 +3208,19 @@ QTPLATFORMWINDOWS_RCC_X64 = $(RCC_X64) --name $(basename $(@F)) \ $(@:$(QTPLATFORMWINDOWS_RCCDIR_X64)/%.cpp=$(QTPLATFORMWINDOWS_SRCDIR)/%.qrc) \ --output $(@:$(QTPLATFORMWINDOWS_RCCDIR_X64)/%.cpp=$(QTPLATFORMWINDOWS_RCCDIR_X64)/qrc_$(@F)) QTPLATFORMWINDOWS_RCCH_ALL = -QTPLATFORMWINDOWS_BUILD_X86 = $(CXX) $(CXXFLAGS_X86) $(QTPLATFORMWINDOWS_DEFINES_X86) $(QTPLATFORMWINDOWS_INCLUDES_X86) \ +QTPLATFORMWINDOWS_BUILD_X86 = $(CXX_X86) $(CXXFLAGS_X86) $(QTPLATFORMWINDOWS_DEFINES_X86) $(QTPLATFORMWINDOWS_INCLUDES_X86) \ -c $(@:$(QTPLATFORMWINDOWS_OBJDIR_X86)%.o=$(QTPLATFORMWINDOWS_SRCDIR)%.cpp) -o $@ -QTPLATFORMWINDOWS_BUILD_X64 = $(CXX) $(CXXFLAGS_X64) $(QTPLATFORMWINDOWS_DEFINES_X64) $(QTPLATFORMWINDOWS_INCLUDES_X64) \ +QTPLATFORMWINDOWS_BUILD_X64 = $(CXX_X64) $(CXXFLAGS_X64) $(QTPLATFORMWINDOWS_DEFINES_X64) $(QTPLATFORMWINDOWS_INCLUDES_X64) \ -c $(@:$(QTPLATFORMWINDOWS_OBJDIR_X64)%.o=$(QTPLATFORMWINDOWS_SRCDIR)%.cpp) -o $@ QTPLATFORMWINDOWS_OBJS_ALL = -QTPLATFORMWINDOWS_BUILD_MOC_X86 = $(CXX) $(CXXFLAGS_X86) $(QTPLATFORMWINDOWS_DEFINES_X86) $(QTPLATFORMWINDOWS_INCLUDES_X86) \ +QTPLATFORMWINDOWS_BUILD_MOC_X86 = $(CXX_X86) $(CXXFLAGS_X86) $(QTPLATFORMWINDOWS_DEFINES_X86) $(QTPLATFORMWINDOWS_INCLUDES_X86) \ -c $(@:$(QTPLATFORMWINDOWS_OBJDIR_X86)/%.omoc=$(QTPLATFORMWINDOWS_MOCDIR_X86)/moc_%.cpp) -o $@ -QTPLATFORMWINDOWS_BUILD_MOC_X64 = $(CXX) $(CXXFLAGS_X64) $(QTPLATFORMWINDOWS_DEFINES_X64) $(QTPLATFORMWINDOWS_INCLUDES_X64) \ +QTPLATFORMWINDOWS_BUILD_MOC_X64 = $(CXX_X64) $(CXXFLAGS_X64) $(QTPLATFORMWINDOWS_DEFINES_X64) $(QTPLATFORMWINDOWS_INCLUDES_X64) \ -c $(@:$(QTPLATFORMWINDOWS_OBJDIR_X64)/%.omoc=$(QTPLATFORMWINDOWS_MOCDIR_X64)/moc_%.cpp) -o $@ QTPLATFORMWINDOWS_OBJS_MOC_ALL = -QTPLATFORMWINDOWS_BUILD_RCC_X86 = $(CXX) $(CXXFLAGS_X86) $(QTPLATFORMWINDOWS_DEFINES_X86) $(QTPLATFORMWINDOWS_INCLUDES_X86) \ +QTPLATFORMWINDOWS_BUILD_RCC_X86 = $(CXX_X86) $(CXXFLAGS_X86) $(QTPLATFORMWINDOWS_DEFINES_X86) $(QTPLATFORMWINDOWS_INCLUDES_X86) \ -c $(@:$(QTPLATFORMWINDOWS_OBJDIR_X86)/%.orcc=$(QTPLATFORMWINDOWS_RCCDIR_X86)/qrc_$(@F:.orcc=.cpp)) -o $@ -QTPLATFORMWINDOWS_BUILD_RCC_X64 = $(CXX) $(CXXFLAGS_X64) $(QTPLATFORMWINDOWS_DEFINES_X64) $(QTPLATFORMWINDOWS_INCLUDES_X64) \ +QTPLATFORMWINDOWS_BUILD_RCC_X64 = $(CXX_X64) $(CXXFLAGS_X64) $(QTPLATFORMWINDOWS_DEFINES_X64) $(QTPLATFORMWINDOWS_INCLUDES_X64) \ -c $(@:$(QTPLATFORMWINDOWS_OBJDIR_X64)/%.orcc=$(QTPLATFORMWINDOWS_RCCDIR_X64)/qrc_$(@F:.orcc=.cpp)) -o $@ QTPLATFORMWINDOWS_OBJS_RCC_ALL = @@ -3360,19 +3335,19 @@ QTPLATFORMXCB_RCC_X64 = $(RCC_X64) --name $(basename $(@F)) \ $(@:$(QTPLATFORMXCB_RCCDIR_X64)/%.cpp=$(QTPLATFORMXCB_SRCDIR)/%.qrc) \ --output $(@:$(QTPLATFORMXCB_RCCDIR_X64)/%.cpp=$(QTPLATFORMXCB_RCCDIR_X64)/qrc_$(@F)) QTPLATFORMXCB_RCCH_ALL = -QTPLATFORMXCB_BUILD_X86 = $(CXX) $(CXXFLAGS_X86) $(QTPLATFORMXCB_DEFINES_X86) $(QTPLATFORMXCB_INCLUDES_X86) \ +QTPLATFORMXCB_BUILD_X86 = $(CXX_X86) $(CXXFLAGS_X86) $(QTPLATFORMXCB_DEFINES_X86) $(QTPLATFORMXCB_INCLUDES_X86) \ -c $(@:$(QTPLATFORMXCB_OBJDIR_X86)%.o=$(QTPLATFORMXCB_SRCDIR)%.cpp) -o $@ -QTPLATFORMXCB_BUILD_X64 = $(CXX) $(CXXFLAGS_X64) $(QTPLATFORMXCB_DEFINES_X64) $(QTPLATFORMXCB_INCLUDES_X64) \ +QTPLATFORMXCB_BUILD_X64 = $(CXX_X64) $(CXXFLAGS_X64) $(QTPLATFORMXCB_DEFINES_X64) $(QTPLATFORMXCB_INCLUDES_X64) \ -c $(@:$(QTPLATFORMXCB_OBJDIR_X64)%.o=$(QTPLATFORMXCB_SRCDIR)%.cpp) -o $@ QTPLATFORMXCB_OBJS_ALL = -QTPLATFORMXCB_BUILD_MOC_X86 = $(CXX) $(CXXFLAGS_X86) $(QTPLATFORMXCB_DEFINES_X86) $(QTPLATFORMXCB_INCLUDES_X86) \ +QTPLATFORMXCB_BUILD_MOC_X86 = $(CXX_X86) $(CXXFLAGS_X86) $(QTPLATFORMXCB_DEFINES_X86) $(QTPLATFORMXCB_INCLUDES_X86) \ -c $(@:$(QTPLATFORMXCB_OBJDIR_X86)/%.omoc=$(QTPLATFORMXCB_MOCDIR_X86)/moc_%.cpp) -o $@ -QTPLATFORMXCB_BUILD_MOC_X64 = $(CXX) $(CXXFLAGS_X64) $(QTPLATFORMXCB_DEFINES_X64) $(QTPLATFORMXCB_INCLUDES_X64) \ +QTPLATFORMXCB_BUILD_MOC_X64 = $(CXX_X64) $(CXXFLAGS_X64) $(QTPLATFORMXCB_DEFINES_X64) $(QTPLATFORMXCB_INCLUDES_X64) \ -c $(@:$(QTPLATFORMXCB_OBJDIR_X64)/%.omoc=$(QTPLATFORMXCB_MOCDIR_X64)/moc_%.cpp) -o $@ QTPLATFORMXCB_OBJS_MOC_ALL = -QTPLATFORMXCB_BUILD_RCC_X86 = $(CXX) $(CXXFLAGS_X86) $(QTPLATFORMXCB_DEFINES_X86) $(QTPLATFORMXCB_INCLUDES_X86) \ +QTPLATFORMXCB_BUILD_RCC_X86 = $(CXX_X86) $(CXXFLAGS_X86) $(QTPLATFORMXCB_DEFINES_X86) $(QTPLATFORMXCB_INCLUDES_X86) \ -c $(@:$(QTPLATFORMXCB_OBJDIR_X86)/%.orcc=$(QTPLATFORMXCB_RCCDIR_X86)/qrc_$(@F:.orcc=.cpp)) -o $@ -QTPLATFORMXCB_BUILD_RCC_X64 = $(CXX) $(CXXFLAGS_X64) $(QTPLATFORMXCB_DEFINES_X64) $(QTPLATFORMXCB_INCLUDES_X64) \ +QTPLATFORMXCB_BUILD_RCC_X64 = $(CXX_X64) $(CXXFLAGS_X64) $(QTPLATFORMXCB_DEFINES_X64) $(QTPLATFORMXCB_INCLUDES_X64) \ -c $(@:$(QTPLATFORMXCB_OBJDIR_X64)/%.orcc=$(QTPLATFORMXCB_RCCDIR_X64)/qrc_$(@F:.orcc=.cpp)) -o $@ QTPLATFORMXCB_OBJS_RCC_ALL = @@ -3491,23 +3466,23 @@ QTPLATFORMCOCOA_RCC_X64 = $(RCC_X64) --name $(basename $(@F)) \ $(@:$(QTPLATFORMCOCOA_RCCDIR_X64)/%.cpp=$(QTPLATFORMCOCOA_SRCDIR)/%.qrc) \ --output $(@:$(QTPLATFORMCOCOA_RCCDIR_X64)/%.cpp=$(QTPLATFORMCOCOA_RCCDIR_X64)/qrc_$(@F)) QTPLATFORMCOCOA_RCCH_ALL = -QTPLATFORMCOCOA_BUILD_X86 = $(CXX) $(CXXFLAGS_X86) $(QTPLATFORMCOCOA_DEFINES_X86) $(QTPLATFORMCOCOA_INCLUDES_X86) \ +QTPLATFORMCOCOA_BUILD_X86 = $(CXX_X86) $(CXXFLAGS_X86) $(QTPLATFORMCOCOA_DEFINES_X86) $(QTPLATFORMCOCOA_INCLUDES_X86) \ -c $(@:$(QTPLATFORMCOCOA_OBJDIR_X86)%.o=$(QTPLATFORMCOCOA_SRCDIR)%.cpp) -o $@ -QTPLATFORMCOCOA_BUILD_X64 = $(CXX) $(CXXFLAGS_X64) $(QTPLATFORMCOCOA_DEFINES_X64) $(QTPLATFORMCOCOA_INCLUDES_X64) \ +QTPLATFORMCOCOA_BUILD_X64 = $(CXX_X64) $(CXXFLAGS_X64) $(QTPLATFORMCOCOA_DEFINES_X64) $(QTPLATFORMCOCOA_INCLUDES_X64) \ -c $(@:$(QTPLATFORMCOCOA_OBJDIR_X64)%.o=$(QTPLATFORMCOCOA_SRCDIR)%.cpp) -o $@ -QTPLATFORMCOCOA_BUILD_OMM_X86 = $(CXX) $(CXXFLAGS_X86) $(QTPLATFORMCOCOA_DEFINES_X86) $(QTPLATFORMCOCOA_INCLUDES_X86) \ +QTPLATFORMCOCOA_BUILD_OMM_X86 = $(CXX_X86) $(CXXFLAGS_X86) $(QTPLATFORMCOCOA_DEFINES_X86) $(QTPLATFORMCOCOA_INCLUDES_X86) \ -c $(@:$(QTPLATFORMCOCOA_OBJDIR_X86)%.omm=$(QTPLATFORMCOCOA_SRCDIR)%.mm) -o $@ -QTPLATFORMCOCOA_BUILD_OMM_X64 = $(CXX) $(CXXFLAGS_X64) $(QTPLATFORMCOCOA_DEFINES_X64) $(QTPLATFORMCOCOA_INCLUDES_X64) \ +QTPLATFORMCOCOA_BUILD_OMM_X64 = $(CXX_X64) $(CXXFLAGS_X64) $(QTPLATFORMCOCOA_DEFINES_X64) $(QTPLATFORMCOCOA_INCLUDES_X64) \ -c $(@:$(QTPLATFORMCOCOA_OBJDIR_X64)%.omm=$(QTPLATFORMCOCOA_SRCDIR)%.mm) -o $@ QTPLATFORMCOCOA_OBJS_ALL = -QTPLATFORMCOCOA_BUILD_MOC_X86 = $(CXX) $(CXXFLAGS_X86) $(QTPLATFORMCOCOA_DEFINES_X86) $(QTPLATFORMCOCOA_INCLUDES_X86) \ +QTPLATFORMCOCOA_BUILD_MOC_X86 = $(CXX_X86) $(CXXFLAGS_X86) $(QTPLATFORMCOCOA_DEFINES_X86) $(QTPLATFORMCOCOA_INCLUDES_X86) \ -c $(@:$(QTPLATFORMCOCOA_OBJDIR_X86)/%.omoc=$(QTPLATFORMCOCOA_MOCDIR_X86)/moc_%.cpp) -o $@ -QTPLATFORMCOCOA_BUILD_MOC_X64 = $(CXX) $(CXXFLAGS_X64) $(QTPLATFORMCOCOA_DEFINES_X64) $(QTPLATFORMCOCOA_INCLUDES_X64) \ +QTPLATFORMCOCOA_BUILD_MOC_X64 = $(CXX_X64) $(CXXFLAGS_X64) $(QTPLATFORMCOCOA_DEFINES_X64) $(QTPLATFORMCOCOA_INCLUDES_X64) \ -c $(@:$(QTPLATFORMCOCOA_OBJDIR_X64)/%.omoc=$(QTPLATFORMCOCOA_MOCDIR_X64)/moc_%.cpp) -o $@ QTPLATFORMCOCOA_OBJS_MOC_ALL = -QTPLATFORMCOCOA_BUILD_RCC_X86 = $(CXX) $(CXXFLAGS_X86) $(QTPLATFORMCOCOA_DEFINES_X86) $(QTPLATFORMCOCOA_INCLUDES_X86) \ +QTPLATFORMCOCOA_BUILD_RCC_X86 = $(CXX_X86) $(CXXFLAGS_X86) $(QTPLATFORMCOCOA_DEFINES_X86) $(QTPLATFORMCOCOA_INCLUDES_X86) \ -c $(@:$(QTPLATFORMCOCOA_OBJDIR_X86)/%.orcc=$(QTPLATFORMCOCOA_RCCDIR_X86)/qrc_$(@F:.orcc=.cpp)) -o $@ -QTPLATFORMCOCOA_BUILD_RCC_X64 = $(CXX) $(CXXFLAGS_X64) $(QTPLATFORMCOCOA_DEFINES_X64) $(QTPLATFORMCOCOA_INCLUDES_X64) \ +QTPLATFORMCOCOA_BUILD_RCC_X64 = $(CXX_X64) $(CXXFLAGS_X64) $(QTPLATFORMCOCOA_DEFINES_X64) $(QTPLATFORMCOCOA_INCLUDES_X64) \ -c $(@:$(QTPLATFORMCOCOA_OBJDIR_X64)/%.orcc=$(QTPLATFORMCOCOA_RCCDIR_X64)/qrc_$(@F:.orcc=.cpp)) -o $@ QTPLATFORMCOCOA_OBJS_RCC_ALL = @@ -3621,13 +3596,13 @@ QTPRINTSUPPORT_RCC_X64 = $(RCC_X64) --name $(basename $(@F)) \ $(@:$(QTPRINTSUPPORT_RCCDIR_X64)/%.cpp=$(QTPRINTSUPPORT_SRCDIR)/%.qrc) \ --output $(@:$(QTPRINTSUPPORT_RCCDIR_X64)/%.cpp=$(QTPRINTSUPPORT_RCCDIR_X64)/qrc_$(@F)) QTPRINTSUPPORT_RCCH_ALL = dialogs/qprintdialog.cpp -QTPRINTSUPPORT_BUILD_X86 = $(CXX) $(CXXFLAGS_X86) $(QTPRINTSUPPORT_DEFINES_X86) $(QTPRINTSUPPORT_INCLUDES_X86) \ +QTPRINTSUPPORT_BUILD_X86 = $(CXX_X86) $(CXXFLAGS_X86) $(QTPRINTSUPPORT_DEFINES_X86) $(QTPRINTSUPPORT_INCLUDES_X86) \ -c $(@:$(QTPRINTSUPPORT_OBJDIR_X86)%.o=$(QTPRINTSUPPORT_SRCDIR)%.cpp) -o $@ -QTPRINTSUPPORT_BUILD_X64 = $(CXX) $(CXXFLAGS_X64) $(QTPRINTSUPPORT_DEFINES_X64) $(QTPRINTSUPPORT_INCLUDES_X64) \ +QTPRINTSUPPORT_BUILD_X64 = $(CXX_X64) $(CXXFLAGS_X64) $(QTPRINTSUPPORT_DEFINES_X64) $(QTPRINTSUPPORT_INCLUDES_X64) \ -c $(@:$(QTPRINTSUPPORT_OBJDIR_X64)%.o=$(QTPRINTSUPPORT_SRCDIR)%.cpp) -o $@ -QTPRINTSUPPORT_BUILD_OMM_X86 = $(CXX) $(CXXFLAGS_X86) $(QTPRINTSUPPORT_DEFINES_X86) $(QTPRINTSUPPORT_INCLUDES_X86) \ +QTPRINTSUPPORT_BUILD_OMM_X86 = $(CXX_X86) $(CXXFLAGS_X86) $(QTPRINTSUPPORT_DEFINES_X86) $(QTPRINTSUPPORT_INCLUDES_X86) \ -c $(@:$(QTPRINTSUPPORT_OBJDIR_X86)%.omm=$(QTPRINTSUPPORT_SRCDIR)%.mm) -o $@ -QTPRINTSUPPORT_BUILD_OMM_X64 = $(CXX) $(CXXFLAGS_X64) $(QTPRINTSUPPORT_DEFINES_X64) $(QTPRINTSUPPORT_INCLUDES_X64) \ +QTPRINTSUPPORT_BUILD_OMM_X64 = $(CXX_X64) $(CXXFLAGS_X64) $(QTPRINTSUPPORT_DEFINES_X64) $(QTPRINTSUPPORT_INCLUDES_X64) \ -c $(@:$(QTPRINTSUPPORT_OBJDIR_X64)%.omm=$(QTPRINTSUPPORT_SRCDIR)%.mm) -o $@ QTPRINTSUPPORT_OBJS_ALL = dialogs/qabstractprintdialog.o \ dialogs/qpagesetupdialog.o \ @@ -3642,14 +3617,14 @@ QTPRINTSUPPORT_OBJS_ALL = dialogs/qabstractprintdialog.o \ kernel/qprinter.o \ kernel/qprinterinfo.o \ widgets/qprintpreviewwidget.o -QTPRINTSUPPORT_BUILD_MOC_X86 = $(CXX) $(CXXFLAGS_X86) $(QTPRINTSUPPORT_DEFINES_X86) $(QTPRINTSUPPORT_INCLUDES_X86) \ +QTPRINTSUPPORT_BUILD_MOC_X86 = $(CXX_X86) $(CXXFLAGS_X86) $(QTPRINTSUPPORT_DEFINES_X86) $(QTPRINTSUPPORT_INCLUDES_X86) \ -c $(@:$(QTPRINTSUPPORT_OBJDIR_X86)/%.omoc=$(QTPRINTSUPPORT_MOCDIR_X86)/moc_%.cpp) -o $@ -QTPRINTSUPPORT_BUILD_MOC_X64 = $(CXX) $(CXXFLAGS_X64) $(QTPRINTSUPPORT_DEFINES_X64) $(QTPRINTSUPPORT_INCLUDES_X64) \ +QTPRINTSUPPORT_BUILD_MOC_X64 = $(CXX_X64) $(CXXFLAGS_X64) $(QTPRINTSUPPORT_DEFINES_X64) $(QTPRINTSUPPORT_INCLUDES_X64) \ -c $(@:$(QTPRINTSUPPORT_OBJDIR_X64)/%.omoc=$(QTPRINTSUPPORT_MOCDIR_X64)/moc_%.cpp) -o $@ QTPRINTSUPPORT_OBJS_MOC_ALL = qabstractprintdialog.omoc -QTPRINTSUPPORT_BUILD_RCC_X86 = $(CXX) $(CXXFLAGS_X86) $(QTPRINTSUPPORT_DEFINES_X86) $(QTPRINTSUPPORT_INCLUDES_X86) \ +QTPRINTSUPPORT_BUILD_RCC_X86 = $(CXX_X86) $(CXXFLAGS_X86) $(QTPRINTSUPPORT_DEFINES_X86) $(QTPRINTSUPPORT_INCLUDES_X86) \ -c $(@:$(QTPRINTSUPPORT_OBJDIR_X86)/%.orcc=$(QTPRINTSUPPORT_RCCDIR_X86)/qrc_$(@F:.orcc=.cpp)) -o $@ -QTPRINTSUPPORT_BUILD_RCC_X64 = $(CXX) $(CXXFLAGS_X64) $(QTPRINTSUPPORT_DEFINES_X64) $(QTPRINTSUPPORT_INCLUDES_X64) \ +QTPRINTSUPPORT_BUILD_RCC_X64 = $(CXX_X64) $(CXXFLAGS_X64) $(QTPRINTSUPPORT_DEFINES_X64) $(QTPRINTSUPPORT_INCLUDES_X64) \ -c $(@:$(QTPRINTSUPPORT_OBJDIR_X64)/%.orcc=$(QTPRINTSUPPORT_RCCDIR_X64)/qrc_$(@F:.orcc=.cpp)) -o $@ QTPRINTSUPPORT_OBJS_RCC_ALL = dialogs/qprintdialog.orcc @@ -3732,15 +3707,15 @@ QTSERIALPORT_MOC_C_X86 = $(MOC_X86) $(QTSERIALPORT_DEFINES_X86) $(QTSERIALPO QTSERIALPORT_MOC_C_X64 = $(MOC_X64) $(QTSERIALPORT_DEFINES_X64) $(QTSERIALPORT_INCLUDES_X64) \ $(@:$(QTSERIALPORT_MOCDIR_X64)/%.moc=$(QTSERIALPORT_SRCDIR)/%.cpp) -o $@ QTSERIALPORT_MOCC_ALL = -QTSERIALPORT_BUILD_X86 = $(CXX) $(CXXFLAGS_X86) $(QTSERIALPORT_DEFINES_X86) $(QTSERIALPORT_INCLUDES_X86) \ +QTSERIALPORT_BUILD_X86 = $(CXX_X86) $(CXXFLAGS_X86) $(QTSERIALPORT_DEFINES_X86) $(QTSERIALPORT_INCLUDES_X86) \ -c $(@:$(QTSERIALPORT_OBJDIR_X86)%.o=$(QTSERIALPORT_SRCDIR)%.cpp) -o $@ -QTSERIALPORT_BUILD_X64 = $(CXX) $(CXXFLAGS_X64) $(QTSERIALPORT_DEFINES_X64) $(QTSERIALPORT_INCLUDES_X64) \ +QTSERIALPORT_BUILD_X64 = $(CXX_X64) $(CXXFLAGS_X64) $(QTSERIALPORT_DEFINES_X64) $(QTSERIALPORT_INCLUDES_X64) \ -c $(@:$(QTSERIALPORT_OBJDIR_X64)%.o=$(QTSERIALPORT_SRCDIR)%.cpp) -o $@ QTSERIALPORT_OBJS_ALL = qserialport.o \ qserialportinfo.o -QTSERIALPORT_BUILD_MOC_X86 = $(CXX) $(CXXFLAGS_X86) $(QTSERIALPORT_DEFINES_X86) $(QTSERIALPORT_INCLUDES_X86) \ +QTSERIALPORT_BUILD_MOC_X86 = $(CXX_X86) $(CXXFLAGS_X86) $(QTSERIALPORT_DEFINES_X86) $(QTSERIALPORT_INCLUDES_X86) \ -c $(@:$(QTSERIALPORT_OBJDIR_X86)/%.omoc=$(QTSERIALPORT_MOCDIR_X86)/moc_%.cpp) -o $@ -QTSERIALPORT_BUILD_MOC_X64 = $(CXX) $(CXXFLAGS_X64) $(QTSERIALPORT_DEFINES_X64) $(QTSERIALPORT_INCLUDES_X64) \ +QTSERIALPORT_BUILD_MOC_X64 = $(CXX_X64) $(CXXFLAGS_X64) $(QTSERIALPORT_DEFINES_X64) $(QTSERIALPORT_INCLUDES_X64) \ -c $(@:$(QTSERIALPORT_OBJDIR_X64)/%.omoc=$(QTSERIALPORT_MOCDIR_X64)/moc_%.cpp) -o $@ QTSERIALPORT_OBJS_MOC_ALL = @@ -3989,13 +3964,13 @@ QTWIDGETS_RCC_X64 = $(RCC_X64) --name $(basename $(@F)) \ $(@:$(QTWIDGETS_RCCDIR_X64)/%.cpp=$(QTWIDGETS_SRCDIR)/%.qrc) \ --output $(@:$(QTWIDGETS_RCCDIR_X64)/%.cpp=$(QTWIDGETS_RCCDIR_X64)/qrc_$(@F)) QTWIDGETS_RCCH_ALL = styles/qstyle.cpp dialogs/qmessagebox.cpp -QTWIDGETS_BUILD_X86 = $(CXX) $(CXXFLAGS_X86) $(QTWIDGETS_DEFINES_X86) $(QTWIDGETS_INCLUDES_X86) \ +QTWIDGETS_BUILD_X86 = $(CXX_X86) $(CXXFLAGS_X86) $(QTWIDGETS_DEFINES_X86) $(QTWIDGETS_INCLUDES_X86) \ -c $(@:$(QTWIDGETS_OBJDIR_X86)%.o=$(QTWIDGETS_SRCDIR)%.cpp) -o $@ -QTWIDGETS_BUILD_X64 = $(CXX) $(CXXFLAGS_X64) $(QTWIDGETS_DEFINES_X64) $(QTWIDGETS_INCLUDES_X64) \ +QTWIDGETS_BUILD_X64 = $(CXX_X64) $(CXXFLAGS_X64) $(QTWIDGETS_DEFINES_X64) $(QTWIDGETS_INCLUDES_X64) \ -c $(@:$(QTWIDGETS_OBJDIR_X64)%.o=$(QTWIDGETS_SRCDIR)%.cpp) -o $@ -QTWIDGETS_BUILD_OMM_X86 = $(CXX) $(CXXFLAGS_X86) $(QTWIDGETS_DEFINES_X86) $(QTWIDGETS_INCLUDES_X86) \ +QTWIDGETS_BUILD_OMM_X86 = $(CXX_X86) $(CXXFLAGS_X86) $(QTWIDGETS_DEFINES_X86) $(QTWIDGETS_INCLUDES_X86) \ -c $(@:$(QTWIDGETS_OBJDIR_X86)%.omm=$(QTWIDGETS_SRCDIR)%.mm) -o $@ -QTWIDGETS_BUILD_OMM_X64 = $(CXX) $(CXXFLAGS_X64) $(QTWIDGETS_DEFINES_X64) $(QTWIDGETS_INCLUDES_X64) \ +QTWIDGETS_BUILD_OMM_X64 = $(CXX_X64) $(CXXFLAGS_X64) $(QTWIDGETS_DEFINES_X64) $(QTWIDGETS_INCLUDES_X64) \ -c $(@:$(QTWIDGETS_OBJDIR_X64)%.omm=$(QTWIDGETS_SRCDIR)%.mm) -o $@ QTWIDGETS_OBJS_ALL = accessible/complexwidgets.o \ accessible/itemviews.o \ @@ -4176,14 +4151,14 @@ QTWIDGETS_OBJS_ALL = accessible/complexwidgets.o \ widgets/qwidgetlinecontrol.o \ widgets/qwidgetresizehandler.o \ widgets/qwidgettextcontrol.o -QTWIDGETS_BUILD_MOC_X86 = $(CXX) $(CXXFLAGS_X86) $(QTWIDGETS_DEFINES_X86) $(QTWIDGETS_INCLUDES_X86) \ +QTWIDGETS_BUILD_MOC_X86 = $(CXX_X86) $(CXXFLAGS_X86) $(QTWIDGETS_DEFINES_X86) $(QTWIDGETS_INCLUDES_X86) \ -c $(@:$(QTWIDGETS_OBJDIR_X86)/%.omoc=$(QTWIDGETS_MOCDIR_X86)/moc_%.cpp) -o $@ -QTWIDGETS_BUILD_MOC_X64 = $(CXX) $(CXXFLAGS_X64) $(QTWIDGETS_DEFINES_X64) $(QTWIDGETS_INCLUDES_X64) \ +QTWIDGETS_BUILD_MOC_X64 = $(CXX_X64) $(CXXFLAGS_X64) $(QTWIDGETS_DEFINES_X64) $(QTWIDGETS_INCLUDES_X64) \ -c $(@:$(QTWIDGETS_OBJDIR_X64)/%.omoc=$(QTWIDGETS_MOCDIR_X64)/moc_%.cpp) -o $@ QTWIDGETS_OBJS_MOC_ALL = -QTWIDGETS_BUILD_RCC_X86 = $(CXX) $(CXXFLAGS_X86) $(QTWIDGETS_DEFINES_X86) $(QTWIDGETS_INCLUDES_X86) \ +QTWIDGETS_BUILD_RCC_X86 = $(CXX_X86) $(CXXFLAGS_X86) $(QTWIDGETS_DEFINES_X86) $(QTWIDGETS_INCLUDES_X86) \ -c $(@:$(QTWIDGETS_OBJDIR_X86)/%.orcc=$(QTWIDGETS_RCCDIR_X86)/qrc_$(@F:.orcc=.cpp)) -o $@ -QTWIDGETS_BUILD_RCC_X64 = $(CXX) $(CXXFLAGS_X64) $(QTWIDGETS_DEFINES_X64) $(QTWIDGETS_INCLUDES_X64) \ +QTWIDGETS_BUILD_RCC_X64 = $(CXX_X64) $(CXXFLAGS_X64) $(QTWIDGETS_DEFINES_X64) $(QTWIDGETS_INCLUDES_X64) \ -c $(@:$(QTWIDGETS_OBJDIR_X64)/%.orcc=$(QTWIDGETS_RCCDIR_X64)/qrc_$(@F:.orcc=.cpp)) -o $@ QTWIDGETS_OBJS_RCC_ALL = qstyle.orcc qmessagebox.orcc @@ -4251,9 +4226,9 @@ QTXML_DEFINES_X64 = $(QTXML_DEFINES) $(QTXML_DEFINES_X64_PLAT) QTXML_INCLUDES = -I$(INCDIR)/qt -I$(INCDIR)/qt/QtCore -I$(INCDIR)/qt/QtXml -I$(INCDIR)/qt/QtXml/private QTXML_INCLUDES_X86 = $(QTXML_INCLUDES) $(QTXML_INCLUDES_X86_PLAT) QTXML_INCLUDES_X64 = $(QTXML_INCLUDES) $(QTXML_INCLUDES_X64_PLAT) -QTXML_BUILD_X86 = $(CXX) $(CXXFLAGS_X86) $(QTXML_DEFINES_X86) $(QTXML_INCLUDES_X86) \ +QTXML_BUILD_X86 = $(CXX_X86) $(CXXFLAGS_X86) $(QTXML_DEFINES_X86) $(QTXML_INCLUDES_X86) \ -c $(@:$(QTXML_OBJDIR_X86)%.o=$(QTXML_SRCDIR)%.cpp) -o $@ -QTXML_BUILD_X64 = $(CXX) $(CXXFLAGS_X64) $(QTXML_DEFINES_X64) $(QTXML_INCLUDES_X64) \ +QTXML_BUILD_X64 = $(CXX_X64) $(CXXFLAGS_X64) $(QTXML_DEFINES_X64) $(QTXML_INCLUDES_X64) \ -c $(@:$(QTXML_OBJDIR_X64)%.o=$(QTXML_SRCDIR)%.cpp) -o $@ QTXML_OBJS_ALL = dom/qdom.o sax/qxml.o @@ -4315,19 +4290,19 @@ SINGLEAPPLICATION_RCC_X64 = $(RCC_X64) --name $(basename $(@F)) \ $(@:$(SINGLEAPPLICATION_RCCDIR_X64)/%.cpp=$(SINGLEAPPLICATION_SRCDIR)/%.qrc) \ --output $(@:$(SINGLEAPPLICATION_RCCDIR_X64)/%.cpp=$(SINGLEAPPLICATION_RCCDIR_X64)/qrc_$(@F)) SINGLEAPPLICATION_RCCH_ALL = -SINGLEAPPLICATION_BUILD_X86 = $(CXX) $(CXXFLAGS_X86) $(SINGLEAPPLICATION_DEFINES_X86) $(SINGLEAPPLICATION_INCLUDES_X86) \ +SINGLEAPPLICATION_BUILD_X86 = $(CXX_X86) $(CXXFLAGS_X86) $(SINGLEAPPLICATION_DEFINES_X86) $(SINGLEAPPLICATION_INCLUDES_X86) \ -c $(@:$(SINGLEAPPLICATION_OBJDIR_X86)%.o=$(SINGLEAPPLICATION_SRCDIR)%.cpp) -o $@ -SINGLEAPPLICATION_BUILD_X64 = $(CXX) $(CXXFLAGS_X64) $(SINGLEAPPLICATION_DEFINES_X64) $(SINGLEAPPLICATION_INCLUDES_X64) \ +SINGLEAPPLICATION_BUILD_X64 = $(CXX_X64) $(CXXFLAGS_X64) $(SINGLEAPPLICATION_DEFINES_X64) $(SINGLEAPPLICATION_INCLUDES_X64) \ -c $(@:$(SINGLEAPPLICATION_OBJDIR_X64)%.o=$(SINGLEAPPLICATION_SRCDIR)%.cpp) -o $@ SINGLEAPPLICATION_OBJS_ALL = singleapplication.o -SINGLEAPPLICATION_BUILD_MOC_X86 = $(CXX) $(CXXFLAGS_X86) $(SINGLEAPPLICATION_DEFINES_X86) $(SINGLEAPPLICATION_INCLUDES_X86) \ +SINGLEAPPLICATION_BUILD_MOC_X86 = $(CXX_X86) $(CXXFLAGS_X86) $(SINGLEAPPLICATION_DEFINES_X86) $(SINGLEAPPLICATION_INCLUDES_X86) \ -c $(@:$(SINGLEAPPLICATION_OBJDIR_X86)/%.omoc=$(SINGLEAPPLICATION_MOCDIR_X86)/moc_%.cpp) -o $@ -SINGLEAPPLICATION_BUILD_MOC_X64 = $(CXX) $(CXXFLAGS_X64) $(SINGLEAPPLICATION_DEFINES_X64) $(SINGLEAPPLICATION_INCLUDES_X64) \ +SINGLEAPPLICATION_BUILD_MOC_X64 = $(CXX_X64) $(CXXFLAGS_X64) $(SINGLEAPPLICATION_DEFINES_X64) $(SINGLEAPPLICATION_INCLUDES_X64) \ -c $(@:$(SINGLEAPPLICATION_OBJDIR_X64)/%.omoc=$(SINGLEAPPLICATION_MOCDIR_X64)/moc_%.cpp) -o $@ SINGLEAPPLICATION_OBJS_MOC_ALL = singleapplication.omoc singleapplication_p.omoc -SINGLEAPPLICATION_BUILD_RCC_X86 = $(CXX) $(CXXFLAGS_X86) $(SINGLEAPPLICATION_DEFINES_X86) $(SINGLEAPPLICATION_INCLUDES_X86) \ +SINGLEAPPLICATION_BUILD_RCC_X86 = $(CXX_X86) $(CXXFLAGS_X86) $(SINGLEAPPLICATION_DEFINES_X86) $(SINGLEAPPLICATION_INCLUDES_X86) \ -c $(@:$(SINGLEAPPLICATION_OBJDIR_X86)/%.orcc=$(SINGLEAPPLICATION_RCCDIR_X86)/qrc_$(@F:.orcc=.cpp)) -o $@ -SINGLEAPPLICATION_BUILD_RCC_X64 = $(CXX) $(CXXFLAGS_X64) $(SINGLEAPPLICATION_DEFINES_X64) $(SINGLEAPPLICATION_INCLUDES_X64) \ +SINGLEAPPLICATION_BUILD_RCC_X64 = $(CXX_X64) $(CXXFLAGS_X64) $(SINGLEAPPLICATION_DEFINES_X64) $(SINGLEAPPLICATION_INCLUDES_X64) \ -c $(@:$(SINGLEAPPLICATION_OBJDIR_X64)/%.orcc=$(SINGLEAPPLICATION_RCCDIR_X64)/qrc_$(@F:.orcc=.cpp)) -o $@ SINGLEAPPLICATION_OBJS_RCC_ALL = diff --git a/deps/build/make/Makefile.linux b/deps/build/make/Makefile.linux index a5b092dd3..92a0af635 100644 --- a/deps/build/make/Makefile.linux +++ b/deps/build/make/Makefile.linux @@ -7,7 +7,10 @@ TARGET_X86 = i686-linux-gnu TARGET_X64 = x86_64-linux-gnu # flags shared between all -FLAGS = -O2 -D_SILENCE_CXX17_OLD_ALLOCATOR_MEMBERS_DEPRECATION_WARNING \ +FLAGS = -O2 \ + -fpic \ + -static \ + -D_SILENCE_CXX17_OLD_ALLOCATOR_MEMBERS_DEPRECATION_WARNING \ -Wno-deprecated-declarations \ -Wno-incompatible-pointer-types \ -Wno-implicit-function-declaration \ @@ -19,12 +22,14 @@ ARCHFLAGS_X86 = -msse -msse2 ARCHFLAGS_X64 = -msse -msse2 # C Compiler -CC = clang +CC_X86 = clang +CC_X64 = clang CFLAGS_X86 = -m32 --target=$(TARGET_X86) $(ARCHFLAGS_X86) $(FLAGS) CFLAGS_X64 = -m64 --target=$(TARGET_X64) $(ARCHFLAGS_X64) $(FLAGS) # C++ Compiler -CXX = clang++ +CXX_X86 = clang++ +CXX_X64 = clang++ CXXFLAGS_ALL = -Xclang -flto-visibility-public-std $(FLAGS) CXXFLAGS_A_X86 = -m32 -target $(TARGET_X86) $(ARCHFLAGS_X86) $(CXXFLAGS_ALL) CXXFLAGS_A_X64 = -m64 -target $(TARGET_X64) $(ARCHFLAGS_X64) $(CXXFLAGS_ALL) @@ -39,10 +44,10 @@ define deletefilepattern endef # Platform Specific additional defines -LIBCRYPTO_DEFINES_X86_PLAT = -DOPENSSLDIR=\"/etc/ssl\" -DENGINESDIR=\".\" -LIBCRYPTO_DEFINES_X64_PLAT = -DOPENSSLDIR=\"/etc/ssl\" -DENGINESDIR=\".\" -LIBSSL_DEFINES_X86_PLAT = -DOPENSSLDIR=\"/etc/ssl\" -DENGINESDIR=\".\" -LIBSSL_DEFINES_X64_PLAT = -DOPENSSLDIR=\"/etc/ssl\" -DENGINESDIR=\".\" +LIBCRYPTO_DEFINES_X86_PLAT = -DOPENSSL_IA32_SSE2 -DOPENSSLDIR=\"/etc/ssl\" -DENGINESDIR=\".\" +LIBCRYPTO_DEFINES_X64_PLAT = -DOPENSSL_IA32_SSE2 -DOPENSSLDIR=\"/etc/ssl\" -DENGINESDIR=\".\" +LIBSSL_DEFINES_X86_PLAT = -DOPENSSL_IA32_SSE2 -DOPENSSLDIR=\"/etc/ssl\" -DENGINESDIR=\".\" +LIBSSL_DEFINES_X64_PLAT = -DOPENSSL_IA32_SSE2 -DOPENSSLDIR=\"/etc/ssl\" -DENGINESDIR=\".\" FONTCONFIG_DEFINES_X86_PLAT = -DFONTCONFIG_PATH=\"/etc/fonts\" -DFC_CACHEDIR=\"~/.cache/fontconfig\" -DFC_TEMPLATEDIR=\"/usr/share/fontconfig/conf.avail\" FONTCONFIG_DEFINES_X64_PLAT = -DFONTCONFIG_PATH=\"/etc/fonts\" -DFC_CACHEDIR=\"~/.cache/fontconfig\" -DFC_TEMPLATEDIR=\"/usr/share/fontconfig/conf.avail\" OPENCVCORE_DEFINES_X86_PLAT = @@ -53,52 +58,52 @@ OPENCVIMGPROC_DEFINES_X86_PLAT = OPENCVIMGPROC_DEFINES_X64_PLAT = OPENCVVIDEOIO_DEFINES_X86_PLAT = OPENCVVIDEOIO_DEFINES_X64_PLAT = -QTBOOTSTRAP_DEFINES_X86_PLAT = -QTBOOTSTRAP_DEFINES_X64_PLAT = -QTMOC_DEFINES_X86_PLAT = -QTMOC_DEFINES_X64_PLAT = -QTRCC_DEFINES_X86_PLAT = -QTRCC_DEFINES_X64_PLAT = -QTUIC_DEFINES_X86_PLAT = -QTUIC_DEFINES_X64_PLAT = -QTBLUETOOTH_DEFINES_X86_PLAT = -DQT_FEATURE_bluez=1 -DQT_FEATURE_dbus=1 -QTBLUETOOTH_DEFINES_X64_PLAT = -DQT_FEATURE_bluez=1 -DQT_FEATURE_dbus=1 -QTCONCURRENT_DEFINES_X86_PLAT = -QTCONCURRENT_DEFINES_X64_PLAT = -QTCORE_DEFINES_X86_PLAT = -DQT_UNIX_SEMAPHORE -DQT_FEATURE_dbus=1 -QTCORE_DEFINES_X64_PLAT = -DQT_UNIX_SEMAPHORE -DQT_FEATURE_dbus=1 -QTDBUS_DEFINES_X86_PLAT = -DQT_FEATURE_dbus=1 -QTDBUS_DEFINES_X64_PLAT = -DQT_FEATURE_dbus=1 -QTEVENTDISPATCHERS_DEFINES_X86_PLAT = -QTEVENTDISPATCHERS_DEFINES_X64_PLAT = -QTFONTDATABASES_DEFINES_X86_PLAT = -DQT_FEATURE_fontconfig=1 -QTFONTDATABASES_DEFINES_X64_PLAT = -DQT_FEATURE_fontconfig=1 -QTGAMEPAD_DEFINES_X86_PLAT = -QTGAMEPAD_DEFINES_X64_PLAT = -QTGUI_DEFINES_X86_PLAT = -DQT_QPA_DEFAULT_PLATFORM_NAME=\"xcb\" -DQT_FEATURE_fontconfig=1 -DQT_FEATURE_dbus=1 -QTGUI_DEFINES_X64_PLAT = -DQT_QPA_DEFAULT_PLATFORM_NAME=\"xcb\" -DQT_FEATURE_fontconfig=1 -DQT_FEATURE_dbus=1 -QTMULTIMEDIA_DEFINES_X86_PLAT = -QTMULTIMEDIA_DEFINES_X64_PLAT = -QTMULTIMEDIAWIDGETS_DEFINES_X86_PLAT= -QTMULTIMEDIAWIDGETS_DEFINES_X64_PLAT= -QTNETWORK_DEFINES_X86_PLAT = -DOPENSSLDIR=\"/etc/ssl\" -DENGINESDIR=\".\" -QTNETWORK_DEFINES_X64_PLAT = -DOPENSSLDIR=\"/etc/ssl\" -DENGINESDIR=\".\" -QTOPENGL_DEFINES_X86_PLAT = -QTOPENGL_DEFINES_X64_PLAT = +QTBOOTSTRAP_DEFINES_X86_PLAT = -DQT_LARGEFILE_SUPPORT=64 +QTBOOTSTRAP_DEFINES_X64_PLAT = -DQT_LARGEFILE_SUPPORT=64 +QTMOC_DEFINES_X86_PLAT = -DQT_LARGEFILE_SUPPORT=64 +QTMOC_DEFINES_X64_PLAT = -DQT_LARGEFILE_SUPPORT=64 +QTRCC_DEFINES_X86_PLAT = -DQT_LARGEFILE_SUPPORT=64 +QTRCC_DEFINES_X64_PLAT = -DQT_LARGEFILE_SUPPORT=64 +QTUIC_DEFINES_X86_PLAT = -DQT_LARGEFILE_SUPPORT=64 +QTUIC_DEFINES_X64_PLAT = -DQT_LARGEFILE_SUPPORT=64 +QTBLUETOOTH_DEFINES_X86_PLAT = -DQT_LARGEFILE_SUPPORT=64 -DQT_FEATURE_bluez=1 -DQT_FEATURE_dbus=1 +QTBLUETOOTH_DEFINES_X64_PLAT = -DQT_LARGEFILE_SUPPORT=64 -DQT_FEATURE_bluez=1 -DQT_FEATURE_dbus=1 +QTCONCURRENT_DEFINES_X86_PLAT = -DQT_LARGEFILE_SUPPORT=64 +QTCONCURRENT_DEFINES_X64_PLAT = -DQT_LARGEFILE_SUPPORT=64 +QTCORE_DEFINES_X86_PLAT = -DQT_LARGEFILE_SUPPORT=64 -DQT_UNIX_SEMAPHORE -DQT_FEATURE_dbus=1 +QTCORE_DEFINES_X64_PLAT = -DQT_LARGEFILE_SUPPORT=64 -DQT_UNIX_SEMAPHORE -DQT_FEATURE_dbus=1 +QTDBUS_DEFINES_X86_PLAT = -DQT_LARGEFILE_SUPPORT=64 -DQT_FEATURE_dbus=1 +QTDBUS_DEFINES_X64_PLAT = -DQT_LARGEFILE_SUPPORT=64 -DQT_FEATURE_dbus=1 +QTEVENTDISPATCHERS_DEFINES_X86_PLAT = -DQT_LARGEFILE_SUPPORT=64 +QTEVENTDISPATCHERS_DEFINES_X64_PLAT = -DQT_LARGEFILE_SUPPORT=64 +QTFONTDATABASES_DEFINES_X86_PLAT = -DQT_LARGEFILE_SUPPORT=64 -DQT_FEATURE_fontconfig=1 +QTFONTDATABASES_DEFINES_X64_PLAT = -DQT_LARGEFILE_SUPPORT=64 -DQT_FEATURE_fontconfig=1 +QTGAMEPAD_DEFINES_X86_PLAT = -DQT_LARGEFILE_SUPPORT=64 +QTGAMEPAD_DEFINES_X64_PLAT = -DQT_LARGEFILE_SUPPORT=64 +QTGUI_DEFINES_X86_PLAT = -DQT_LARGEFILE_SUPPORT=64 -DQT_QPA_DEFAULT_PLATFORM_NAME=\"xcb\" -DQT_FEATURE_fontconfig=1 -DQT_FEATURE_dbus=1 +QTGUI_DEFINES_X64_PLAT = -DQT_LARGEFILE_SUPPORT=64 -DQT_QPA_DEFAULT_PLATFORM_NAME=\"xcb\" -DQT_FEATURE_fontconfig=1 -DQT_FEATURE_dbus=1 +QTMULTIMEDIA_DEFINES_X86_PLAT = -DQT_LARGEFILE_SUPPORT=64 +QTMULTIMEDIA_DEFINES_X64_PLAT = -DQT_LARGEFILE_SUPPORT=64 +QTMULTIMEDIAWIDGETS_DEFINES_X86_PLAT= -DQT_LARGEFILE_SUPPORT=64 +QTMULTIMEDIAWIDGETS_DEFINES_X64_PLAT= -DQT_LARGEFILE_SUPPORT=64 +QTNETWORK_DEFINES_X86_PLAT = -DQT_LARGEFILE_SUPPORT=64 -DOPENSSLDIR=\"/etc/ssl\" -DENGINESDIR=\".\" +QTNETWORK_DEFINES_X64_PLAT = -DQT_LARGEFILE_SUPPORT=64 -DOPENSSLDIR=\"/etc/ssl\" -DENGINESDIR=\".\" +QTOPENGL_DEFINES_X86_PLAT = -DQT_LARGEFILE_SUPPORT=64 +QTOPENGL_DEFINES_X64_PLAT = -DQT_LARGEFILE_SUPPORT=64 QTPLATFORMWINDOWS_DEFINES_X86_PLAT = QTPLATFORMWINDOWS_DEFINES_X64_PLAT = -QTPLATFORMXCB_DEFINES_X86_PLAT = -DQT_QPA_DEFAULT_PLATFORM_NAME=\"xcb\" -DQT_FEATURE_fontconfig=1 -DQT_FEATURE_dbus=1 -QTPLATFORMXCB_DEFINES_X64_PLAT = -DQT_QPA_DEFAULT_PLATFORM_NAME=\"xcb\" -DQT_FEATURE_fontconfig=1 -DQT_FEATURE_dbus=1 -QTPLATFORMCOCOA_DEFINES_X86_PLAT = -QTPLATFORMCOCOA_DEFINES_X64_PLAT = -QTPRINTSUPPORT_DEFINES_X86_PLAT = -QTPRINTSUPPORT_DEFINES_X64_PLAT = -QTSERIALPORT_DEFINES_X86_PLAT = -QTSERIALPORT_DEFINES_X64_PLAT = -QTWIDGETS_DEFINES_X86_PLAT = -QTWIDGETS_DEFINES_X64_PLAT = -QTXML_DEFINES_X86_PLAT = -QTXML_DEFINES_X64_PLAT = +QTPLATFORMXCB_DEFINES_X86_PLAT = -DQT_LARGEFILE_SUPPORT=64 -DQT_QPA_DEFAULT_PLATFORM_NAME=\"xcb\" -DQT_FEATURE_fontconfig=1 -DQT_FEATURE_dbus=1 +QTPLATFORMXCB_DEFINES_X64_PLAT = -DQT_LARGEFILE_SUPPORT=64 -DQT_QPA_DEFAULT_PLATFORM_NAME=\"xcb\" -DQT_FEATURE_fontconfig=1 -DQT_FEATURE_dbus=1 +QTPLATFORMCOCOA_DEFINES_X86_PLAT = -DQT_LARGEFILE_SUPPORT=64 +QTPLATFORMCOCOA_DEFINES_X64_PLAT = -DQT_LARGEFILE_SUPPORT=64 +QTPRINTSUPPORT_DEFINES_X86_PLAT = -DQT_LARGEFILE_SUPPORT=64 +QTPRINTSUPPORT_DEFINES_X64_PLAT = -DQT_LARGEFILE_SUPPORT=64 +QTSERIALPORT_DEFINES_X86_PLAT = -DQT_LARGEFILE_SUPPORT=64 +QTSERIALPORT_DEFINES_X64_PLAT = -DQT_LARGEFILE_SUPPORT=64 +QTWIDGETS_DEFINES_X86_PLAT = -DQT_LARGEFILE_SUPPORT=64 +QTWIDGETS_DEFINES_X64_PLAT = -DQT_LARGEFILE_SUPPORT=64 +QTXML_DEFINES_X86_PLAT = -DQT_LARGEFILE_SUPPORT=64 +QTXML_DEFINES_X64_PLAT = -DQT_LARGEFILE_SUPPORT=64 SINGLEAPPLICATION_DEFINES_X86_PLAT = SINGLEAPPLICATION_DEFINES_X64_PLAT = @@ -213,7 +218,8 @@ endef ##################################################################################### # Linker -LINK = $(CXX) +LINK_X86 = $(CXX_X86) +LINK_X64 = $(CXX_X64) LINKFLAGS_X86 = $(CXXFLAGS_X86) LINKFLAGS_X64 = $(CXXFLAGS_X64) @@ -230,10 +236,10 @@ LINKLIBS_X64 = $(LINKLIBS_ALL) # Linker Functions define createbin32 - $(LINK) $(LINKFLAGS_X86) $(LINKPATH_X86) $(2) $(3) $(LINKLIBS_X86) -o $(BINDIR_X86)/$(1) + $(LINK_X86) $(LINKFLAGS_X86) $(LINKPATH_X86) $(2) $(3) $(LINKLIBS_X86) -o $(BINDIR_X86)/$(1) endef define createbin64 - $(LINK) $(LINKFLAGS_X64) $(LINKPATH_X64) $(2) $(3) $(LINKLIBS_X64) -o $(BINDIR_X64)/$(1) + $(LINK_X64) $(LINKFLAGS_X64) $(LINKPATH_X64) $(2) $(3) $(LINKLIBS_X64) -o $(BINDIR_X64)/$(1) endef ##################################################################################### @@ -533,7 +539,33 @@ QTGUI_MOCH = $(QTGUI_MOCH_ALL) QTGUI_MOCC = $(QTGUI_MOCC_ALL) QTGUI_UICH = $(QTGUI_UICH_ALL) QTGUI_RCCH = $(QTGUI_RCCH_ALL) -QTGUI_OBJS = $(QTGUI_OBJS_ALL) +QTGUI_OBJS = $(QTGUI_OBJS_ALL) \ + opengl/qopenglfunctions_1_0.o \ + opengl/qopenglfunctions_1_1.o \ + opengl/qopenglfunctions_1_2.o \ + opengl/qopenglfunctions_1_3.o \ + opengl/qopenglfunctions_1_4.o \ + opengl/qopenglfunctions_1_5.o \ + opengl/qopenglfunctions_2_0.o \ + opengl/qopenglfunctions_2_1.o \ + opengl/qopenglfunctions_3_0.o \ + opengl/qopenglfunctions_3_1.o \ + opengl/qopenglfunctions_3_2_compatibility.o \ + opengl/qopenglfunctions_3_2_core.o \ + opengl/qopenglfunctions_3_3_compatibility.o \ + opengl/qopenglfunctions_3_3_core.o \ + opengl/qopenglfunctions_4_0_compatibility.o \ + opengl/qopenglfunctions_4_0_core.o \ + opengl/qopenglfunctions_4_1_compatibility.o \ + opengl/qopenglfunctions_4_1_core.o \ + opengl/qopenglfunctions_4_2_compatibility.o \ + opengl/qopenglfunctions_4_2_core.o \ + opengl/qopenglfunctions_4_3_compatibility.o \ + opengl/qopenglfunctions_4_3_core.o \ + opengl/qopenglfunctions_4_4_compatibility.o \ + opengl/qopenglfunctions_4_4_core.o \ + opengl/qopenglfunctions_4_5_compatibility.o \ + opengl/qopenglfunctions_4_5_core.o QTGUI_OBJS_C = $(QTGUI_OBJS_C_ALL) QTGUI_OBJS_MOC = $(QTGUI_OBJS_MOC_ALL) QTGUI_OBJS_RCC = $(QTGUI_OBJS_RCC_ALL) @@ -707,6 +739,44 @@ SINGLEAPPLICATION_OBJS = $(SINGLEAPPLICATION_OBJS_ALL) SINGLEAPPLICATION_OBJS_MOC = $(SINGLEAPPLICATION_OBJS_MOC_ALL) SINGLEAPPLICATION_OBJS_RCC = $(SINGLEAPPLICATION_OBJS_RCC_ALL) +##################################################################################### +# Project Dependencies + +QTBLUETOOTH_DEPS_X86 = qt-moc-x86 qt-rcc-x86 qt-uic-x86 +QTBLUETOOTH_DEPS_X64 = qt-moc-x64 qt-rcc-x64 qt-uic-x64 +QTCORE_DEPS_X86 = qt-moc-x86 qt-rcc-x86 qt-uic-x86 +QTCORE_DEPS_X64 = qt-moc-x64 qt-rcc-x64 qt-uic-x64 +QTDBUS_DEPS_X86 = qt-moc-x86 qt-rcc-x86 qt-uic-x86 +QTDBUS_DEPS_X64 = qt-moc-x64 qt-rcc-x64 qt-uic-x64 +QTEVENTDISPATCHERS_DEPS_X86 = qt-moc-x86 qt-rcc-x86 qt-uic-x86 +QTEVENTDISPATCHERS_DEPS_X64 = qt-moc-x64 qt-rcc-x64 qt-uic-x64 +QTFONTDATABASES_DEPS_X86 = qt-moc-x86 qt-rcc-x86 qt-uic-x86 +QTFONTDATABASES_DEPS_X64 = qt-moc-x64 qt-rcc-x64 qt-uic-x64 +QTGAMEPAD_DEPS_X86 = qt-moc-x86 qt-rcc-x86 qt-uic-x86 +QTGAMEPAD_DEPS_X64 = qt-moc-x64 qt-rcc-x64 qt-uic-x64 +QTGUI_DEPS_X86 = qt-moc-x86 qt-rcc-x86 qt-uic-x86 +QTGUI_DEPS_X64 = qt-moc-x64 qt-rcc-x64 qt-uic-x64 +QTMULTIMEDIA_DEPS_X86 = qt-moc-x86 qt-rcc-x86 qt-uic-x86 +QTMULTIMEDIA_DEPS_X64 = qt-moc-x64 qt-rcc-x64 qt-uic-x64 +QTMULTIMEDIAWIDGETS_DEPS_X86 = qt-moc-x86 qt-rcc-x86 qt-uic-x86 +QTMULTIMEDIAWIDGETS_DEPS_X64 = qt-moc-x64 qt-rcc-x64 qt-uic-x64 +QTNETWORK_DEPS_X86 = qt-moc-x86 qt-rcc-x86 qt-uic-x86 +QTNETWORK_DEPS_X64 = qt-moc-x64 qt-rcc-x64 qt-uic-x64 +QTPLATFORMWINDOWS_DEPS_X86 = qt-moc-x86 qt-rcc-x86 qt-uic-x86 +QTPLATFORMWINDOWS_DEPS_X64 = qt-moc-x64 qt-rcc-x64 qt-uic-x64 +QTPLATFORMXCB_DEPS_X86 = qt-moc-x86 qt-rcc-x86 qt-uic-x86 +QTPLATFORMXCB_DEPS_X64 = qt-moc-x64 qt-rcc-x64 qt-uic-x64 +QTPLATFORMCOCOA_DEPS_X86 = qt-moc-x86 qt-rcc-x86 qt-uic-x86 +QTPLATFORMCOCOA_DEPS_X64 = qt-moc-x64 qt-rcc-x64 qt-uic-x64 +QTPRINTSUPPORT_DEPS_X86 = qt-moc-x86 qt-rcc-x86 qt-uic-x86 +QTPRINTSUPPORT_DEPS_X64 = qt-moc-x64 qt-rcc-x64 qt-uic-x64 +QTSERIALPORT_DEPS_X86 = qt-moc-x86 qt-rcc-x86 qt-uic-x86 +QTSERIALPORT_DEPS_X64 = qt-moc-x64 qt-rcc-x64 qt-uic-x64 +QTWIDGETS_DEPS_X86 = qt-moc-x86 qt-rcc-x86 qt-uic-x86 +QTWIDGETS_DEPS_X64 = qt-moc-x64 qt-rcc-x64 qt-uic-x64 +SINGLEAPPLICATION_DEPS_X86 = qt-moc-x86 qt-rcc-x86 qt-uic-x86 +SINGLEAPPLICATION_DEPS_X64 = qt-moc-x64 qt-rcc-x64 qt-uic-x64 + ##################################################################################### # Include Targets @@ -714,11 +784,19 @@ include Makefile.targets all-x86: all-common-x86 \ fontconfig-x86 \ + qt-bootstrap-x86 \ + qt-moc-x86 \ + qt-rcc-x86 \ + qt-uic-x86 \ qt-dbus-x86 \ qt-platform-xcb-x86 all-x64: all-common-x64 \ fontconfig-x64 \ + qt-bootstrap-x64 \ + qt-moc-x64 \ + qt-rcc-x64 \ + qt-uic-x64 \ qt-dbus-x64 \ qt-platform-xcb-x64 diff --git a/deps/build/make/Makefile.osx b/deps/build/make/Makefile.osx index 28480c754..aad1f2316 100644 --- a/deps/build/make/Makefile.osx +++ b/deps/build/make/Makefile.osx @@ -8,7 +8,8 @@ TARGET_X64 = x86_64-apple-darwin19.2.0 OSX_MINVER = 10.12 # flags shared between all -FLAGS = -O2 \ +FLAGS = -O3 \ + -fpic \ -mmacosx-version-min=$(OSX_MINVER) \ -D_SILENCE_CXX17_OLD_ALLOCATOR_MEMBERS_DEPRECATION_WARNING \ -Wno-deprecated-declarations \ @@ -18,16 +19,18 @@ FLAGS = -O2 \ -Wno-int-conversion # Architecture flags -ARCHFLAGS_X86 = -msse -msse2 -ARCHFLAGS_X64 = -msse -msse2 +ARCHFLAGS_X86 = -mtune=intel -msse -msse2 -msse3 -mssse3 +ARCHFLAGS_X64 = -mtune=intel -msse -msse2 -msse3 -mssse3 # C Compiler -CC = clang +CC_X86 = clang +CC_X64 = clang CFLAGS_X86 = -m32 --target=$(TARGET_X86) $(ARCHFLAGS_X86) $(FLAGS) CFLAGS_X64 = -m64 --target=$(TARGET_X64) $(ARCHFLAGS_X64) $(FLAGS) # C++ Compiler -CXX = clang++ +CXX_X86 = clang++ +CXX_X64 = clang++ CXXFLAGS_ALL = -Xclang -fmodules $(FLAGS) CXXFLAGS_A_X86 = -m32 -target $(TARGET_X86) $(ARCHFLAGS_X86) $(CXXFLAGS_ALL) CXXFLAGS_A_X64 = -m64 -target $(TARGET_X64) $(ARCHFLAGS_X64) $(CXXFLAGS_ALL) @@ -42,10 +45,10 @@ define deletefilepattern endef # Platform Specific additional defines -LIBCRYPTO_DEFINES_X86_PLAT = -DOPENSSLDIR=\"/etc/ssl\" -DENGINESDIR=\".\" -LIBCRYPTO_DEFINES_X64_PLAT = -DOPENSSLDIR=\"/etc/ssl\" -DENGINESDIR=\".\" -LIBSSL_DEFINES_X86_PLAT = -DOPENSSLDIR=\"/etc/ssl\" -DENGINESDIR=\".\" -LIBSSL_DEFINES_X64_PLAT = -DOPENSSLDIR=\"/etc/ssl\" -DENGINESDIR=\".\" +LIBCRYPTO_DEFINES_X86_PLAT = -DOPENSSL_IA32_SSE2 -DOPENSSLDIR=\"/etc/ssl\" -DENGINESDIR=\".\" +LIBCRYPTO_DEFINES_X64_PLAT = -DOPENSSL_IA32_SSE2 -DOPENSSLDIR=\"/etc/ssl\" -DENGINESDIR=\".\" +LIBSSL_DEFINES_X86_PLAT = -DOPENSSL_IA32_SSE2 -DOPENSSLDIR=\"/etc/ssl\" -DENGINESDIR=\".\" +LIBSSL_DEFINES_X64_PLAT = -DOPENSSL_IA32_SSE2 -DOPENSSLDIR=\"/etc/ssl\" -DENGINESDIR=\".\" FONTCONFIG_DEFINES_X86_PLAT = FONTCONFIG_DEFINES_X64_PLAT = OPENCVCORE_DEFINES_X86_PLAT = @@ -56,52 +59,52 @@ OPENCVIMGPROC_DEFINES_X86_PLAT = OPENCVIMGPROC_DEFINES_X64_PLAT = OPENCVVIDEOIO_DEFINES_X86_PLAT = OPENCVVIDEOIO_DEFINES_X64_PLAT = -QTBOOTSTRAP_DEFINES_X86_PLAT = -QTBOOTSTRAP_DEFINES_X64_PLAT = -QTMOC_DEFINES_X86_PLAT = -QTMOC_DEFINES_X64_PLAT = -QTRCC_DEFINES_X86_PLAT = -QTRCC_DEFINES_X64_PLAT = -QTUIC_DEFINES_X86_PLAT = -QTUIC_DEFINES_X64_PLAT = -QTBLUETOOTH_DEFINES_X86_PLAT = -DQT_OSX_BLUETOOTH -DQT_FEATURE_bluez=-1 -DQT_FEATURE_dbus=-1 -QTBLUETOOTH_DEFINES_X64_PLAT = -DQT_OSX_BLUETOOTH -DQT_FEATURE_bluez=-1 -DQT_FEATURE_dbus=-1 -QTCONCURRENT_DEFINES_X86_PLAT = -QTCONCURRENT_DEFINES_X64_PLAT = -QTCORE_DEFINES_X86_PLAT = -DQT_UNIX_SEMAPHORE -DQT_FEATURE_dbus=-1 -QTCORE_DEFINES_X64_PLAT = -DQT_UNIX_SEMAPHORE -DQT_FEATURE_dbus=-1 -QTDBUS_DEFINES_X86_PLAT = -QTDBUS_DEFINES_X64_PLAT = -QTEVENTDISPATCHERS_DEFINES_X86_PLAT = -QTEVENTDISPATCHERS_DEFINES_X64_PLAT = -QTFONTDATABASES_DEFINES_X86_PLAT = -QTFONTDATABASES_DEFINES_X64_PLAT = -QTGAMEPAD_DEFINES_X86_PLAT = -QTGAMEPAD_DEFINES_X64_PLAT = -QTGUI_DEFINES_X86_PLAT = -DQT_QPA_DEFAULT_PLATFORM_NAME=\"cocoa\" -DQT_FEATURE_dbus=-1 -QTGUI_DEFINES_X64_PLAT = -DQT_QPA_DEFAULT_PLATFORM_NAME=\"cocoa\" -DQT_FEATURE_dbus=-1 -QTMULTIMEDIA_DEFINES_X86_PLAT = -QTMULTIMEDIA_DEFINES_X64_PLAT = -QTMULTIMEDIAWIDGETS_DEFINES_X86_PLAT= -QTMULTIMEDIAWIDGETS_DEFINES_X64_PLAT= -QTNETWORK_DEFINES_X86_PLAT = -DOPENSSLDIR=\"/etc/ssl\" -DENGINESDIR=\".\" -QTNETWORK_DEFINES_X64_PLAT = -DOPENSSLDIR=\"/etc/ssl\" -DENGINESDIR=\".\" -QTOPENGL_DEFINES_X86_PLAT = -QTOPENGL_DEFINES_X64_PLAT = +QTBOOTSTRAP_DEFINES_X86_PLAT = -DQT_LARGEFILE_SUPPORT=64 +QTBOOTSTRAP_DEFINES_X64_PLAT = -DQT_LARGEFILE_SUPPORT=64 +QTMOC_DEFINES_X86_PLAT = -DQT_LARGEFILE_SUPPORT=64 +QTMOC_DEFINES_X64_PLAT = -DQT_LARGEFILE_SUPPORT=64 +QTRCC_DEFINES_X86_PLAT = -DQT_LARGEFILE_SUPPORT=64 +QTRCC_DEFINES_X64_PLAT = -DQT_LARGEFILE_SUPPORT=64 +QTUIC_DEFINES_X86_PLAT = -DQT_LARGEFILE_SUPPORT=64 +QTUIC_DEFINES_X64_PLAT = -DQT_LARGEFILE_SUPPORT=64 +QTBLUETOOTH_DEFINES_X86_PLAT = -DQT_LARGEFILE_SUPPORT=64 -DQT_OSX_BLUETOOTH -DQT_FEATURE_bluez=-1 -DQT_FEATURE_dbus=-1 +QTBLUETOOTH_DEFINES_X64_PLAT = -DQT_LARGEFILE_SUPPORT=64 -DQT_OSX_BLUETOOTH -DQT_FEATURE_bluez=-1 -DQT_FEATURE_dbus=-1 +QTCONCURRENT_DEFINES_X86_PLAT = -DQT_LARGEFILE_SUPPORT=64 +QTCONCURRENT_DEFINES_X64_PLAT = -DQT_LARGEFILE_SUPPORT=64 +QTCORE_DEFINES_X86_PLAT = -DQT_LARGEFILE_SUPPORT=64 -DQT_UNIX_SEMAPHORE -DQT_FEATURE_dbus=-1 +QTCORE_DEFINES_X64_PLAT = -DQT_LARGEFILE_SUPPORT=64 -DQT_UNIX_SEMAPHORE -DQT_FEATURE_dbus=-1 +QTDBUS_DEFINES_X86_PLAT = -DQT_LARGEFILE_SUPPORT=64 +QTDBUS_DEFINES_X64_PLAT = -DQT_LARGEFILE_SUPPORT=64 +QTEVENTDISPATCHERS_DEFINES_X86_PLAT = -DQT_LARGEFILE_SUPPORT=64 +QTEVENTDISPATCHERS_DEFINES_X64_PLAT = -DQT_LARGEFILE_SUPPORT=64 +QTFONTDATABASES_DEFINES_X86_PLAT = -DQT_LARGEFILE_SUPPORT=64 +QTFONTDATABASES_DEFINES_X64_PLAT = -DQT_LARGEFILE_SUPPORT=64 +QTGAMEPAD_DEFINES_X86_PLAT = -DQT_LARGEFILE_SUPPORT=64 +QTGAMEPAD_DEFINES_X64_PLAT = -DQT_LARGEFILE_SUPPORT=64 +QTGUI_DEFINES_X86_PLAT = -DQT_LARGEFILE_SUPPORT=64 -DQT_QPA_DEFAULT_PLATFORM_NAME=\"cocoa\" -DQT_FEATURE_dbus=-1 +QTGUI_DEFINES_X64_PLAT = -DQT_LARGEFILE_SUPPORT=64 -DQT_QPA_DEFAULT_PLATFORM_NAME=\"cocoa\" -DQT_FEATURE_dbus=-1 +QTMULTIMEDIA_DEFINES_X86_PLAT = -DQT_LARGEFILE_SUPPORT=64 +QTMULTIMEDIA_DEFINES_X64_PLAT = -DQT_LARGEFILE_SUPPORT=64 +QTMULTIMEDIAWIDGETS_DEFINES_X86_PLAT= -DQT_LARGEFILE_SUPPORT=64 +QTMULTIMEDIAWIDGETS_DEFINES_X64_PLAT= -DQT_LARGEFILE_SUPPORT=64 +QTNETWORK_DEFINES_X86_PLAT = -DQT_LARGEFILE_SUPPORT=64 -DOPENSSLDIR=\"/etc/ssl\" -DENGINESDIR=\".\" +QTNETWORK_DEFINES_X64_PLAT = -DQT_LARGEFILE_SUPPORT=64 -DOPENSSLDIR=\"/etc/ssl\" -DENGINESDIR=\".\" +QTOPENGL_DEFINES_X86_PLAT = -DQT_LARGEFILE_SUPPORT=64 +QTOPENGL_DEFINES_X64_PLAT = -DQT_LARGEFILE_SUPPORT=64 QTPLATFORMWINDOWS_DEFINES_X86_PLAT = QTPLATFORMWINDOWS_DEFINES_X64_PLAT = QTPLATFORMXCB_DEFINES_X86_PLAT = QTPLATFORMXCB_DEFINES_X64_PLAT = -QTPLATFORMCOCOA_DEFINES_X86_PLAT = -DQT_QPA_DEFAULT_PLATFORM_NAME=\"cocoa\" -QTPLATFORMCOCOA_DEFINES_X64_PLAT = -DQT_QPA_DEFAULT_PLATFORM_NAME=\"cocoa\" -QTPRINTSUPPORT_DEFINES_X86_PLAT = -QTPRINTSUPPORT_DEFINES_X64_PLAT = -QTSERIALPORT_DEFINES_X86_PLAT = -QTSERIALPORT_DEFINES_X64_PLAT = -QTWIDGETS_DEFINES_X86_PLAT = -QTWIDGETS_DEFINES_X64_PLAT = -QTXML_DEFINES_X86_PLAT = -QTXML_DEFINES_X64_PLAT = +QTPLATFORMCOCOA_DEFINES_X86_PLAT = -DQT_LARGEFILE_SUPPORT=64 -DQT_QPA_DEFAULT_PLATFORM_NAME=\"cocoa\" +QTPLATFORMCOCOA_DEFINES_X64_PLAT = -DQT_LARGEFILE_SUPPORT=64 -DQT_QPA_DEFAULT_PLATFORM_NAME=\"cocoa\" +QTPRINTSUPPORT_DEFINES_X86_PLAT = -DQT_LARGEFILE_SUPPORT=64 +QTPRINTSUPPORT_DEFINES_X64_PLAT = -DQT_LARGEFILE_SUPPORT=64 +QTSERIALPORT_DEFINES_X86_PLAT = -DQT_LARGEFILE_SUPPORT=64 +QTSERIALPORT_DEFINES_X64_PLAT = -DQT_LARGEFILE_SUPPORT=64 +QTWIDGETS_DEFINES_X86_PLAT = -DQT_LARGEFILE_SUPPORT=64 +QTWIDGETS_DEFINES_X64_PLAT = -DQT_LARGEFILE_SUPPORT=64 +QTXML_DEFINES_X86_PLAT = -DQT_LARGEFILE_SUPPORT=64 +QTXML_DEFINES_X64_PLAT = -DQT_LARGEFILE_SUPPORT=64 SINGLEAPPLICATION_DEFINES_X86_PLAT = SINGLEAPPLICATION_DEFINES_X64_PLAT = @@ -216,7 +219,8 @@ endef ##################################################################################### # Linker -LINK = $(CXX) +LINK_X86 = $(CXX_X86) +LINK_X64 = $(CXX_X64) LINKFLAGS_X86 = $(CXXFLAGS_X86) -framework AppKit LINKFLAGS_X64 = $(CXXFLAGS_X64) -framework AppKit @@ -233,10 +237,10 @@ LINKLIBS_X64 = $(LINKLIBS_ALL) # Linker Functions define createbin32 - $(LINK) $(LINKFLAGS_X86) $(LINKPATH_X86) $(2) $(3) $(LINKLIBS_X86) -o $(BINDIR_X86)/$(1) + $(LINK_X86) $(LINKFLAGS_X86) $(LINKPATH_X86) $(2) $(3) $(LINKLIBS_X86) -o $(BINDIR_X86)/$(1) endef define createbin64 - $(LINK) $(LINKFLAGS_X64) $(LINKPATH_X64) $(2) $(3) $(LINKLIBS_X64) -o $(BINDIR_X64)/$(1) + $(LINK_X64) $(LINKFLAGS_X64) $(LINKPATH_X64) $(2) $(3) $(LINKLIBS_X64) -o $(BINDIR_X64)/$(1) endef ##################################################################################### @@ -429,6 +433,32 @@ QTGUI_RCCH = $(QTGUI_RCCH_ALL) QTGUI_OBJS = $(QTGUI_OBJS_ALL) \ accessible/qaccessiblecache_mac.omm \ image/qimage_darwin.omm \ + opengl/qopenglfunctions_1_0.o \ + opengl/qopenglfunctions_1_1.o \ + opengl/qopenglfunctions_1_2.o \ + opengl/qopenglfunctions_1_3.o \ + opengl/qopenglfunctions_1_4.o \ + opengl/qopenglfunctions_1_5.o \ + opengl/qopenglfunctions_2_0.o \ + opengl/qopenglfunctions_2_1.o \ + opengl/qopenglfunctions_3_0.o \ + opengl/qopenglfunctions_3_1.o \ + opengl/qopenglfunctions_3_2_compatibility.o \ + opengl/qopenglfunctions_3_2_core.o \ + opengl/qopenglfunctions_3_3_compatibility.o \ + opengl/qopenglfunctions_3_3_core.o \ + opengl/qopenglfunctions_4_0_compatibility.o \ + opengl/qopenglfunctions_4_0_core.o \ + opengl/qopenglfunctions_4_1_compatibility.o \ + opengl/qopenglfunctions_4_1_core.o \ + opengl/qopenglfunctions_4_2_compatibility.o \ + opengl/qopenglfunctions_4_2_core.o \ + opengl/qopenglfunctions_4_3_compatibility.o \ + opengl/qopenglfunctions_4_3_core.o \ + opengl/qopenglfunctions_4_4_compatibility.o \ + opengl/qopenglfunctions_4_4_core.o \ + opengl/qopenglfunctions_4_5_compatibility.o \ + opengl/qopenglfunctions_4_5_core.o \ painting/qcoregraphics.omm QTGUI_OBJS_C = $(QTGUI_OBJS_C_ALL) QTGUI_OBJS_MOC = $(QTGUI_OBJS_MOC_ALL) @@ -586,15 +616,61 @@ SINGLEAPPLICATION_OBJS = $(SINGLEAPPLICATION_OBJS_ALL) SINGLEAPPLICATION_OBJS_MOC = $(SINGLEAPPLICATION_OBJS_MOC_ALL) SINGLEAPPLICATION_OBJS_RCC = $(SINGLEAPPLICATION_OBJS_RCC_ALL) +##################################################################################### +# Project Dependencies + +QTBLUETOOTH_DEPS_X86 = qt-moc-x86 qt-rcc-x86 qt-uic-x86 +QTBLUETOOTH_DEPS_X64 = qt-moc-x64 qt-rcc-x64 qt-uic-x64 +QTCORE_DEPS_X86 = qt-moc-x86 qt-rcc-x86 qt-uic-x86 +QTCORE_DEPS_X64 = qt-moc-x64 qt-rcc-x64 qt-uic-x64 +QTDBUS_DEPS_X86 = qt-moc-x86 qt-rcc-x86 qt-uic-x86 +QTDBUS_DEPS_X64 = qt-moc-x64 qt-rcc-x64 qt-uic-x64 +QTEVENTDISPATCHERS_DEPS_X86 = qt-moc-x86 qt-rcc-x86 qt-uic-x86 +QTEVENTDISPATCHERS_DEPS_X64 = qt-moc-x64 qt-rcc-x64 qt-uic-x64 +QTFONTDATABASES_DEPS_X86 = qt-moc-x86 qt-rcc-x86 qt-uic-x86 +QTFONTDATABASES_DEPS_X64 = qt-moc-x64 qt-rcc-x64 qt-uic-x64 +QTGAMEPAD_DEPS_X86 = qt-moc-x86 qt-rcc-x86 qt-uic-x86 +QTGAMEPAD_DEPS_X64 = qt-moc-x64 qt-rcc-x64 qt-uic-x64 +QTGUI_DEPS_X86 = qt-moc-x86 qt-rcc-x86 qt-uic-x86 +QTGUI_DEPS_X64 = qt-moc-x64 qt-rcc-x64 qt-uic-x64 +QTMULTIMEDIA_DEPS_X86 = qt-moc-x86 qt-rcc-x86 qt-uic-x86 +QTMULTIMEDIA_DEPS_X64 = qt-moc-x64 qt-rcc-x64 qt-uic-x64 +QTMULTIMEDIAWIDGETS_DEPS_X86 = qt-moc-x86 qt-rcc-x86 qt-uic-x86 +QTMULTIMEDIAWIDGETS_DEPS_X64 = qt-moc-x64 qt-rcc-x64 qt-uic-x64 +QTNETWORK_DEPS_X86 = qt-moc-x86 qt-rcc-x86 qt-uic-x86 +QTNETWORK_DEPS_X64 = qt-moc-x64 qt-rcc-x64 qt-uic-x64 +QTPLATFORMWINDOWS_DEPS_X86 = qt-moc-x86 qt-rcc-x86 qt-uic-x86 +QTPLATFORMWINDOWS_DEPS_X64 = qt-moc-x64 qt-rcc-x64 qt-uic-x64 +QTPLATFORMXCB_DEPS_X86 = qt-moc-x86 qt-rcc-x86 qt-uic-x86 +QTPLATFORMXCB_DEPS_X64 = qt-moc-x64 qt-rcc-x64 qt-uic-x64 +QTPLATFORMCOCOA_DEPS_X86 = qt-moc-x86 qt-rcc-x86 qt-uic-x86 +QTPLATFORMCOCOA_DEPS_X64 = qt-moc-x64 qt-rcc-x64 qt-uic-x64 +QTPRINTSUPPORT_DEPS_X86 = qt-moc-x86 qt-rcc-x86 qt-uic-x86 +QTPRINTSUPPORT_DEPS_X64 = qt-moc-x64 qt-rcc-x64 qt-uic-x64 +QTSERIALPORT_DEPS_X86 = qt-moc-x86 qt-rcc-x86 qt-uic-x86 +QTSERIALPORT_DEPS_X64 = qt-moc-x64 qt-rcc-x64 qt-uic-x64 +QTWIDGETS_DEPS_X86 = qt-moc-x86 qt-rcc-x86 qt-uic-x86 +QTWIDGETS_DEPS_X64 = qt-moc-x64 qt-rcc-x64 qt-uic-x64 +SINGLEAPPLICATION_DEPS_X86 = qt-moc-x86 qt-rcc-x86 qt-uic-x86 +SINGLEAPPLICATION_DEPS_X64 = qt-moc-x64 qt-rcc-x64 qt-uic-x64 + ##################################################################################### # Include Targets include Makefile.targets all-x86: all-common-x86 \ + qt-bootstrap-x86 \ + qt-moc-x86 \ + qt-rcc-x86 \ + qt-uic-x86 \ qt-platform-cocoa-x86 all-x64: all-common-x64 \ + qt-bootstrap-x64 \ + qt-moc-x64 \ + qt-rcc-x64 \ + qt-uic-x64 \ qt-platform-cocoa-x64 all: all-x86 all-x64 diff --git a/deps/build/make/Makefile.targets b/deps/build/make/Makefile.targets index 0a815dd9d..1cd40e89d 100644 --- a/deps/build/make/Makefile.targets +++ b/deps/build/make/Makefile.targets @@ -513,6 +513,7 @@ tinyxml-x64-clean: $(call deletefilepattern,$(TINYXML_OBJDIR_X64),*.o) tinyxml-clean: tinyxml-x86-clean tinyxml-x64-clean + ################################################################################################################### # QT-BOOTSTRAP ################################################################################################################### @@ -627,12 +628,11 @@ QTBLUETOOTH_PRES_X64 := $(QTBLUETOOTH_MOCH_X64) $(QTBLUETOOTH_MOCC_X64) $( QTBLUETOOTH_OBLS_X86 := $(QTBLUETOOTH_OBJS_X86) $(QTBLUETOOTH_OBJS_MOC_X86) $(QTBLUETOOTH_OBJS_MOCMM_X86) QTBLUETOOTH_OBLS_X64 := $(QTBLUETOOTH_OBJS_X64) $(QTBLUETOOTH_OBJS_MOC_X64) $(QTBLUETOOTH_OBJS_MOCMM_X64) +$(QTBLUETOOTH_PRES_X86) : $(QTBLUETOOTH_DEPS_X86) +$(QTBLUETOOTH_PRES_X64) : $(QTBLUETOOTH_DEPS_X64) $(QTBLUETOOTH_OBLS_X86) : $(QTBLUETOOTH_PRES_X86) $(QTBLUETOOTH_OBLS_X64) : $(QTBLUETOOTH_PRES_X64) -$(QTBLUETOOTH_PRES_X86) : qt-moc-x86 qt-rcc-x86 qt-uic-x86 -$(QTBLUETOOTH_PRES_X64) : qt-moc-x64 qt-rcc-x64 qt-uic-x64 - qt-bluetooth-x86: $(QTBLUETOOTH_PRES_X86) $(QTBLUETOOTH_OBLS_X86) $(call createlib32,qt-bluetooth,$(QTBLUETOOTH_OBLS_X86)) @@ -707,12 +707,11 @@ QTCORE_PRES_X64 := $(QTCORE_MOCH_X64) $(QTCORE_MOCC_X64) $(QTCORE_UICH_X64) QTCORE_OBLS_X86 := $(QTCORE_OBJS_X86) $(QTCORE_OBJS_MOC_X86) $(QTCORE_OBJS_RCC_X86) QTCORE_OBLS_X64 := $(QTCORE_OBJS_X64) $(QTCORE_OBJS_MOC_X64) $(QTCORE_OBJS_RCC_X64) +$(QTCORE_PRES_X86) : $(QTCORE_DEPS_X86) +$(QTCORE_PRES_X64) : $(QTCORE_DEPS_X64) $(QTCORE_OBLS_X86) : $(QTCORE_PRES_X86) $(QTCORE_OBLS_X64) : $(QTCORE_PRES_X64) -$(QTCORE_PRES_X86) : qt-moc-x86 qt-rcc-x86 qt-uic-x86 -$(QTCORE_PRES_X64) : qt-moc-x64 qt-rcc-x64 qt-uic-x64 - qt-core-x86: $(QTCORE_PRES_X86) $(QTCORE_OBLS_X86) $(call createlib32,qt-core,$(QTCORE_OBLS_X86)) @@ -762,12 +761,11 @@ QTDBUS_PRES_X64 := $(QTDBUS_MOCH_X64) $(QTDBUS_MOCC_X64) $(QTDBUS_UICH_X64) QTDBUS_OBLS_X86 := $(QTDBUS_OBJS_X86) $(QTDBUS_OBJS_MOC_X86) $(QTDBUS_OBJS_RCC_X86) QTDBUS_OBLS_X64 := $(QTDBUS_OBJS_X64) $(QTDBUS_OBJS_MOC_X64) $(QTDBUS_OBJS_RCC_X64) +$(QTDBUS_PRES_X86) : $(QTDBUS_DEPS_X86) +$(QTDBUS_PRES_X64) : $(QTDBUS_DEPS_X64) $(QTDBUS_OBLS_X86) : $(QTDBUS_PRES_X86) $(QTDBUS_OBLS_X64) : $(QTDBUS_PRES_X64) -$(QTDBUS_PRES_X86) : qt-moc-x86 qt-rcc-x86 qt-uic-x86 -$(QTDBUS_PRES_X64) : qt-moc-x64 qt-rcc-x64 qt-uic-x64 - qt-dbus-x86: $(QTDBUS_PRES_X86) $(QTDBUS_OBLS_X86) $(call createlib32,qt-dbus,$(QTDBUS_OBLS_X86)) @@ -813,12 +811,11 @@ QTEVENTDISPATCHERS_PRES_X64 := $(QTEVENTDISPATCHERS_MOCH_X64) $(QTEVENTDISPA QTEVENTDISPATCHERS_OBLS_X86 := $(QTEVENTDISPATCHERS_OBJS_X86) $(QTEVENTDISPATCHERS_OBJS_MOC_X86) $(QTEVENTDISPATCHERS_OBJS_RCC_X86) QTEVENTDISPATCHERS_OBLS_X64 := $(QTEVENTDISPATCHERS_OBJS_X64) $(QTEVENTDISPATCHERS_OBJS_MOC_X64) $(QTEVENTDISPATCHERS_OBJS_RCC_X64) +$(QTEVENTDISPATCHERS_PRES_X86) : $(QTEVENTDISPATCHERS_DEPS_X86) +$(QTEVENTDISPATCHERS_PRES_X64) : $(QTEVENTDISPATCHERS_DEPS_X64) $(QTEVENTDISPATCHERS_OBLS_X86) : $(QTEVENTDISPATCHERS_PRES_X86) $(QTEVENTDISPATCHERS_OBLS_X64) : $(QTEVENTDISPATCHERS_PRES_X64) -$(QTEVENTDISPATCHERS_PRES_X86) : qt-moc-x86 qt-rcc-x86 qt-uic-x86 -$(QTEVENTDISPATCHERS_PRES_X64) : qt-moc-x64 qt-rcc-x64 qt-uic-x64 - qt-eventdispatchers-x86: $(QTEVENTDISPATCHERS_PRES_X86) $(QTEVENTDISPATCHERS_OBLS_X86) $(call createlib32,qt-eventdispatchers,$(QTEVENTDISPATCHERS_OBLS_X86)) @@ -864,12 +861,11 @@ QTFONTDATABASES_PRES_X64 := $(QTFONTDATABASES_MOCH_X64) $(QTFONTDATABASES_MO QTFONTDATABASES_OBLS_X86 := $(QTFONTDATABASES_OBJS_X86) $(QTFONTDATABASES_OBJS_MOC_X86) $(QTFONTDATABASES_OBJS_RCC_X86) QTFONTDATABASES_OBLS_X64 := $(QTFONTDATABASES_OBJS_X64) $(QTFONTDATABASES_OBJS_MOC_X64) $(QTFONTDATABASES_OBJS_RCC_X64) +$(QTFONTDATABASES_PRES_X86) : $(QTFONTDATABASES_DEPS_X86) +$(QTFONTDATABASES_PRES_X64) : $(QTFONTDATABASES_DEPS_X64) $(QTFONTDATABASES_OBLS_X86) : $(QTFONTDATABASES_PRES_X86) $(QTFONTDATABASES_OBLS_X64) : $(QTFONTDATABASES_PRES_X64) -$(QTFONTDATABASES_PRES_X86) : qt-moc-x86 qt-rcc-x86 qt-uic-x86 -$(QTFONTDATABASES_PRES_X64) : qt-moc-x64 qt-rcc-x64 qt-uic-x64 - qt-fontdatabases-x86: $(QTFONTDATABASES_PRES_X86) $(QTFONTDATABASES_OBLS_X86) $(call createlib32,qt-fontdatabases,$(QTFONTDATABASES_OBLS_X86)) @@ -905,12 +901,11 @@ QTGAMEPAD_PRES_X64 := $(QTGAMEPAD_MOCH_X64) $(QTGAMEPAD_MOCC_X64) QTGAMEPAD_OBLS_X86 := $(QTGAMEPAD_OBJS_X86) $(QTGAMEPAD_OBJS_MOC_X86) QTGAMEPAD_OBLS_X64 := $(QTGAMEPAD_OBJS_X64) $(QTGAMEPAD_OBJS_MOC_X64) +$(QTGAMEPAD_PRES_X86) : $(QTGAMEPAD_DEPS_X86) +$(QTGAMEPAD_PRES_X64) : $(QTGAMEPAD_DEPS_X64) $(QTGAMEPAD_OBLS_X86) : $(QTGAMEPAD_PRES_X86) $(QTGAMEPAD_OBLS_X64) : $(QTGAMEPAD_PRES_X64) -$(QTGAMEPAD_PRES_X86) : qt-moc-x86 qt-rcc-x86 qt-uic-x86 -$(QTGAMEPAD_PRES_X64) : qt-moc-x64 qt-rcc-x64 qt-uic-x64 - qt-gamepad-x86: $(QTGAMEPAD_PRES_X86) $(QTGAMEPAD_OBLS_X86) $(call createlib32,qt-gamepad,$(QTGAMEPAD_OBLS_X86)) @@ -958,12 +953,11 @@ QTGUI_PRES_X64 := $(QTGUI_MOCH_X64) $(QTGUI_MOCC_X64) $(QTGUI_UICH_X64) $(QT QTGUI_OBLS_X86 := $(QTGUI_OBJS_X86) $(QTGUI_OBJS_C_X86) $(QTGUI_OBJS_MOC_X86) $(QTGUI_OBJS_RCC_X86) QTGUI_OBLS_X64 := $(QTGUI_OBJS_X64) $(QTGUI_OBJS_C_X64) $(QTGUI_OBJS_MOC_X64) $(QTGUI_OBJS_RCC_X64) +$(QTGUI_PRES_X86) : $(QTGUI_DEPS_X86) +$(QTGUI_PRES_X64) : $(QTGUI_DEPS_X64) $(QTGUI_OBLS_X86) : $(QTGUI_PRES_X86) $(QTGUI_OBLS_X64) : $(QTGUI_PRES_X64) -$(QTGUI_PRES_X86) : qt-moc-x86 qt-rcc-x86 qt-uic-x86 -$(QTGUI_PRES_X64) : qt-moc-x64 qt-rcc-x64 qt-uic-x64 - qt-gui-x86: $(QTGUI_PRES_X86) $(QTGUI_OBLS_X86) $(call createlib32,qt-gui,$(QTGUI_OBLS_X86)) @@ -1015,12 +1009,11 @@ QTMULTIMEDIA_PRES_X64 := $(QTMULTIMEDIA_MOCH_X64) $(QTMULTIMEDIA_MOCC_X64) $ QTMULTIMEDIA_OBLS_X86 := $(QTMULTIMEDIA_OBJS_X86) $(QTMULTIMEDIA_OBJS_MOC_X86) $(QTMULTIMEDIA_OBJS_RCC_X86) QTMULTIMEDIA_OBLS_X64 := $(QTMULTIMEDIA_OBJS_X64) $(QTMULTIMEDIA_OBJS_MOC_X64) $(QTMULTIMEDIA_OBJS_RCC_X64) +$(QTMULTIMEDIA_PRES_X86) : $(QTMULTIMEDIA_DEPS_X86) +$(QTMULTIMEDIA_PRES_X64) : $(QTMULTIMEDIA_DEPS_X64) $(QTMULTIMEDIA_OBLS_X86) : $(QTMULTIMEDIA_PRES_X86) $(QTMULTIMEDIA_OBLS_X64) : $(QTMULTIMEDIA_PRES_X64) -$(QTMULTIMEDIA_PRES_X86) : qt-moc-x86 qt-rcc-x86 qt-uic-x86 -$(QTMULTIMEDIA_PRES_X64) : qt-moc-x64 qt-rcc-x64 qt-uic-x64 - qt-multimedia-x86: $(QTMULTIMEDIA_PRES_X86) $(QTMULTIMEDIA_OBLS_X86) $(call createlib32,qt-multimedia,$(QTMULTIMEDIA_OBLS_X86)) @@ -1066,12 +1059,11 @@ QTMULTIMEDIAWIDGETS_PRES_X64 := $(QTMULTIMEDIAWIDGETS_MOCH_X64) $(QTMULTIMED QTMULTIMEDIAWIDGETS_OBLS_X86 := $(QTMULTIMEDIAWIDGETS_OBJS_X86) $(QTMULTIMEDIAWIDGETS_OBJS_MOC_X86) $(QTMULTIMEDIAWIDGETS_OBJS_RCC_X86) QTMULTIMEDIAWIDGETS_OBLS_X64 := $(QTMULTIMEDIAWIDGETS_OBJS_X64) $(QTMULTIMEDIAWIDGETS_OBJS_MOC_X64) $(QTMULTIMEDIAWIDGETS_OBJS_RCC_X64) +$(QTMULTIMEDIAWIDGETS_PRES_X86) : $(QTMULTIMEDIAWIDGETS_DEPS_X86) +$(QTMULTIMEDIAWIDGETS_PRES_X64) : $(QTMULTIMEDIAWIDGETS_DEPS_X64) $(QTMULTIMEDIAWIDGETS_OBLS_X86) : $(QTMULTIMEDIAWIDGETS_PRES_X86) $(QTMULTIMEDIAWIDGETS_OBLS_X64) : $(QTMULTIMEDIAWIDGETS_PRES_X64) -$(QTMULTIMEDIAWIDGETS_PRES_X86) : qt-moc-x86 qt-rcc-x86 qt-uic-x86 -$(QTMULTIMEDIAWIDGETS_PRES_X64) : qt-moc-x64 qt-rcc-x64 qt-uic-x64 - qt-multimediawidgets-x86: $(QTMULTIMEDIAWIDGETS_PRES_X86) $(QTMULTIMEDIAWIDGETS_OBLS_X86) $(call createlib32,qt-multimediawidgets,$(QTMULTIMEDIAWIDGETS_OBLS_X86)) @@ -1117,12 +1109,11 @@ QTNETWORK_PRES_X64 := $(QTNETWORK_MOCH_X64) $(QTNETWORK_MOCC_X64) $(QTNETWOR QTNETWORK_OBLS_X86 := $(QTNETWORK_OBJS_X86) $(QTNETWORK_OBJS_MOC_X86) $(QTNETWORK_OBJS_RCC_X86) QTNETWORK_OBLS_X64 := $(QTNETWORK_OBJS_X64) $(QTNETWORK_OBJS_MOC_X64) $(QTNETWORK_OBJS_RCC_X64) +$(QTNETWORK_PRES_X86) : $(QTNETWORK_DEPS_X86) +$(QTNETWORK_PRES_X64) : $(QTNETWORK_DEPS_X64) $(QTNETWORK_OBLS_X86) : $(QTNETWORK_PRES_X86) $(QTNETWORK_OBLS_X64) : $(QTNETWORK_PRES_X64) -$(QTNETWORK_PRES_X86) : qt-moc-x86 qt-rcc-x86 qt-uic-x86 -$(QTNETWORK_PRES_X64) : qt-moc-x64 qt-rcc-x64 qt-uic-x64 - qt-network-x86: $(QTNETWORK_PRES_X86) $(QTNETWORK_OBLS_X86) $(call createlib32,qt-network,$(QTNETWORK_OBLS_X86)) @@ -1191,12 +1182,11 @@ QTPLATFORMWINDOWS_PRES_X64 := $(QTPLATFORMWINDOWS_MOCH_X64) $(QTPLATFORMWIND QTPLATFORMWINDOWS_OBLS_X86 := $(QTPLATFORMWINDOWS_OBJS_X86) $(QTPLATFORMWINDOWS_OBJS_MOC_X86) $(QTPLATFORMWINDOWS_OBJS_RCC_X86) QTPLATFORMWINDOWS_OBLS_X64 := $(QTPLATFORMWINDOWS_OBJS_X64) $(QTPLATFORMWINDOWS_OBJS_MOC_X64) $(QTPLATFORMWINDOWS_OBJS_RCC_X64) +$(QTPLATFORMWINDOWS_PRES_X86) : $(QTPLATFORMWINDOWS_DEPS_X86) +$(QTPLATFORMWINDOWS_PRES_X64) : $(QTPLATFORMWINDOWS_DEPS_X64) $(QTPLATFORMWINDOWS_OBLS_X86) : $(QTPLATFORMWINDOWS_PRES_X86) $(QTPLATFORMWINDOWS_OBLS_X64) : $(QTPLATFORMWINDOWS_PRES_X64) -$(QTPLATFORMWINDOWS_PRES_X86) : qt-moc-x86 qt-rcc-x86 qt-uic-x86 -$(QTPLATFORMWINDOWS_PRES_X64) : qt-moc-x64 qt-rcc-x64 qt-uic-x64 - qt-platform-windows-x86: $(QTPLATFORMWINDOWS_PRES_X86) $(QTPLATFORMWINDOWS_OBLS_X86) $(call createlib32,qt-platform-windows,$(QTPLATFORMWINDOWS_OBLS_X86)) @@ -1246,12 +1236,11 @@ QTPLATFORMXCB_PRES_X64 := $(QTPLATFORMXCB_MOCH_X64) $(QTPLATFORMXCB_MOCC_X64 QTPLATFORMXCB_OBLS_X86 := $(QTPLATFORMXCB_OBJS_X86) $(QTPLATFORMXCB_OBJS_MOC_X86) $(QTPLATFORMXCB_OBJS_RCC_X86) QTPLATFORMXCB_OBLS_X64 := $(QTPLATFORMXCB_OBJS_X64) $(QTPLATFORMXCB_OBJS_MOC_X64) $(QTPLATFORMXCB_OBJS_RCC_X64) +$(QTPLATFORMXCB_PRES_X86) : $(QTPLATFORMXCB_DEPS_X86) +$(QTPLATFORMXCB_PRES_X64) : $(QTPLATFORMXCB_DEPS_X64) $(QTPLATFORMXCB_OBLS_X86) : $(QTPLATFORMXCB_PRES_X86) $(QTPLATFORMXCB_OBLS_X64) : $(QTPLATFORMXCB_PRES_X64) -$(QTPLATFORMXCB_PRES_X86) : qt-moc-x86 qt-rcc-x86 qt-uic-x86 -$(QTPLATFORMXCB_PRES_X64) : qt-moc-x64 qt-rcc-x64 qt-uic-x64 - qt-platform-xcb-x86: $(QTPLATFORMXCB_PRES_X86) $(QTPLATFORMXCB_OBLS_X86) $(call createlib32,qt-platform-xcb,$(QTPLATFORMXCB_OBLS_X86)) @@ -1297,12 +1286,11 @@ QTPLATFORMCOCOA_PRES_X64 := $(QTPLATFORMCOCOA_MOCH_X64) $(QTPLATFORMCOCOA_MO QTPLATFORMCOCOA_OBLS_X86 := $(QTPLATFORMCOCOA_OBJS_X86) $(QTPLATFORMCOCOA_OBJS_MOC_X86) $(QTPLATFORMCOCOA_OBJS_RCC_X86) QTPLATFORMCOCOA_OBLS_X64 := $(QTPLATFORMCOCOA_OBJS_X64) $(QTPLATFORMCOCOA_OBJS_MOC_X64) $(QTPLATFORMCOCOA_OBJS_RCC_X64) +$(QTPLATFORMCOCOA_PRES_X86) : $(QTPLATFORMCOCOA_DEPS_X86) +$(QTPLATFORMCOCOA_PRES_X64) : $(QTPLATFORMCOCOA_DEPS_X64) $(QTPLATFORMCOCOA_OBLS_X86) : $(QTPLATFORMCOCOA_PRES_X86) $(QTPLATFORMCOCOA_OBLS_X64) : $(QTPLATFORMCOCOA_PRES_X64) -$(QTPLATFORMCOCOA_PRES_X86) : qt-moc-x86 qt-rcc-x86 qt-uic-x86 -$(QTPLATFORMCOCOA_PRES_X64) : qt-moc-x64 qt-rcc-x64 qt-uic-x64 - qt-platform-cocoa-x86: $(QTPLATFORMCOCOA_PRES_X86) $(QTPLATFORMCOCOA_OBLS_X86) $(call createlib32,qt-platform-cocoa,$(QTPLATFORMCOCOA_OBLS_X86)) @@ -1350,12 +1338,11 @@ QTPRINTSUPPORT_PRES_X64 := $(QTPRINTSUPPORT_MOCH_X64) $(QTPRINTSUPPORT_MOCC_ QTPRINTSUPPORT_OBLS_X86 := $(QTPRINTSUPPORT_OBJS_X86) $(QTPRINTSUPPORT_OBJS_MOC_X86) $(QTPRINTSUPPORT_OBJS_RCC_X86) QTPRINTSUPPORT_OBLS_X64 := $(QTPRINTSUPPORT_OBJS_X64) $(QTPRINTSUPPORT_OBJS_MOC_X64) $(QTPRINTSUPPORT_OBJS_RCC_X64) +$(QTPRINTSUPPORT_PRES_X86) : $(QTPRINTSUPPORT_DEPS_X86) +$(QTPRINTSUPPORT_PRES_X64) : $(QTPRINTSUPPORT_DEPS_X64) $(QTPRINTSUPPORT_OBLS_X86) : $(QTPRINTSUPPORT_PRES_X86) $(QTPRINTSUPPORT_OBLS_X64) : $(QTPRINTSUPPORT_PRES_X64) -$(QTPRINTSUPPORT_PRES_X86) : qt-moc-x86 qt-rcc-x86 qt-uic-x86 -$(QTPRINTSUPPORT_PRES_X64) : qt-moc-x64 qt-rcc-x64 qt-uic-x64 - qt-printsupport-x86: $(QTPRINTSUPPORT_PRES_X86) $(QTPRINTSUPPORT_OBLS_X86) $(call createlib32,qt-printsupport,$(QTPRINTSUPPORT_OBLS_X86)) @@ -1401,12 +1388,11 @@ QTSERIALPORT_PRES_X64 := $(QTSERIALPORT_MOCH_X64) $(QTSERIALPORT_MOCC_X64) QTSERIALPORT_OBLS_X86 := $(QTSERIALPORT_OBJS_X86) $(QTSERIALPORT_OBJS_MOC_X86) QTSERIALPORT_OBLS_X64 := $(QTSERIALPORT_OBJS_X64) $(QTSERIALPORT_OBJS_MOC_X64) +$(QTSERIALPORT_PRES_X86) : $(QTSERIALPORT_DEPS_X86) +$(QTSERIALPORT_PRES_X64) : $(QTSERIALPORT_DEPS_X64) $(QTSERIALPORT_OBLS_X86) : $(QTSERIALPORT_PRES_X86) $(QTSERIALPORT_OBLS_X64) : $(QTSERIALPORT_PRES_X64) -$(QTSERIALPORT_PRES_X86) : qt-moc-x86 qt-rcc-x86 qt-uic-x86 -$(QTSERIALPORT_PRES_X64) : qt-moc-x64 qt-rcc-x64 qt-uic-x64 - qt-serialport-x86: $(QTSERIALPORT_PRES_X86) $(QTSERIALPORT_OBLS_X86) $(call createlib32,qt-serialport,$(QTSERIALPORT_OBLS_X86)) @@ -1452,12 +1438,11 @@ QTWIDGETS_PRES_X64 := $(QTWIDGETS_MOCH_X64) $(QTWIDGETS_MOCC_X64) $(QTWIDGET QTWIDGETS_OBLS_X86 := $(QTWIDGETS_OBJS_X86) $(QTWIDGETS_OBJS_MOC_X86) $(QTWIDGETS_OBJS_RCC_X86) QTWIDGETS_OBLS_X64 := $(QTWIDGETS_OBJS_X64) $(QTWIDGETS_OBJS_MOC_X64) $(QTWIDGETS_OBJS_RCC_X64) +$(QTWIDGETS_PRES_X86) : $(QTWIDGETS_DEPS_X86) +$(QTWIDGETS_PRES_X64) : $(QTWIDGETS_DEPS_X64) $(QTWIDGETS_OBLS_X86) : $(QTWIDGETS_PRES_X86) $(QTWIDGETS_OBLS_X64) : $(QTWIDGETS_PRES_X64) -$(QTWIDGETS_PRES_X86) : qt-moc-x86 qt-rcc-x86 qt-uic-x86 -$(QTWIDGETS_PRES_X64) : qt-moc-x64 qt-rcc-x64 qt-uic-x64 - qt-widgets-x86: $(QTWIDGETS_PRES_X86) $(QTWIDGETS_OBLS_X86) $(call createlib32,qt-widgets,$(QTWIDGETS_OBLS_X86)) @@ -1534,12 +1519,11 @@ SINGLEAPPLICATION_PRES_X64 := $(SINGLEAPPLICATION_MOCH_X64) $(SINGLEAPPLICAT SINGLEAPPLICATION_OBLS_X86 := $(SINGLEAPPLICATION_OBJS_X86) $(SINGLEAPPLICATION_OBJS_MOC_X86) $(SINGLEAPPLICATION_OBJS_RCC_X86) SINGLEAPPLICATION_OBLS_X64 := $(SINGLEAPPLICATION_OBJS_X64) $(SINGLEAPPLICATION_OBJS_MOC_X64) $(SINGLEAPPLICATION_OBJS_RCC_X64) +$(SINGLEAPPLICATION_PRES_X86) : $(SINGLEAPPLICATION_DEPS_X86) +$(SINGLEAPPLICATION_PRES_X64) : $(SINGLEAPPLICATION_DEPS_X64) $(SINGLEAPPLICATION_OBLS_X86) : $(SINGLEAPPLICATION_PRES_X86) $(SINGLEAPPLICATION_OBLS_X64) : $(SINGLEAPPLICATION_PRES_X64) -$(SINGLEAPPLICATION_PRES_X86) : qt-moc-x86 qt-rcc-x86 qt-uic-x86 -$(SINGLEAPPLICATION_PRES_X64) : qt-moc-x64 qt-rcc-x64 qt-uic-x64 - singleapplication-x86: $(SINGLEAPPLICATION_PRES_X86) $(SINGLEAPPLICATION_OBLS_X86) $(call createlib32,singleapplication,$(SINGLEAPPLICATION_OBLS_X86)) @@ -1555,7 +1539,6 @@ singleapplication-x86-clean: $(call deletefilepattern,$(SINGLEAPPLICATION_OBJDIR_X86),*.orcc) $(call deletefilepattern,$(SINGLEAPPLICATION_MOCDIR_X86),*.cpp) $(call deletefilepattern,$(SINGLEAPPLICATION_MOCDIR_X86),*.moc) - $(call deletefilepattern,$(SINGLEAPPLICATION_RCCDIR_X86),*.cpp) singleapplication-x64-clean: $(call deletefilepattern,$(LIBDIR_X64),singleapplication.*) @@ -1564,7 +1547,6 @@ singleapplication-x64-clean: $(call deletefilepattern,$(SINGLEAPPLICATION_OBJDIR_X64),*.orcc) $(call deletefilepattern,$(SINGLEAPPLICATION_MOCDIR_X64),*.cpp) $(call deletefilepattern,$(SINGLEAPPLICATION_MOCDIR_X64),*.moc) - $(call deletefilepattern,$(SINGLEAPPLICATION_RCCDIR_X64),*.cpp) singleapplication-clean: singleapplication-x86-clean singleapplication-x64-clean ################################################################################################################### @@ -1591,10 +1573,6 @@ all-common-x86: zlib-x86 \ tinyaes-x86 \ tinyobjloader-x86 \ tinyxml-x86 \ - qt-bootstrap-x86 \ - qt-moc-x86 \ - qt-rcc-x86 \ - qt-uic-x86 \ qt-bluetooth-x86 \ qt-concurrent-x86 \ qt-core-x86 \ @@ -1633,10 +1611,6 @@ all-common-x64: zlib-x64 \ tinyaes-x64 \ tinyobjloader-x64 \ tinyxml-x64 \ - qt-bootstrap-x64 \ - qt-moc-x64 \ - qt-rcc-x64 \ - qt-uic-x64 \ qt-bluetooth-x64 \ qt-concurrent-x64 \ qt-core-x64 \ @@ -1698,7 +1672,8 @@ clean-x86: zlib-x86-clean \ qt-printsupport-x86-clean \ qt-serialport-x86-clean \ qt-widgets-x86-clean \ - qt-xml-x86-clean + qt-xml-x86-clean \ + singleapplication-x86-clean clean-x64: zlib-x64-clean \ libcrypto-x64-clean \ @@ -1744,6 +1719,7 @@ clean-x64: zlib-x64-clean \ qt-printsupport-x64-clean \ qt-serialport-x64-clean \ qt-widgets-x64-clean \ - qt-xml-x64-clean + qt-xml-x64-clean \ + singleapplication-x64-clean clean: clean-x86 clean-x64 \ No newline at end of file diff --git a/deps/build/make/Makefile.win b/deps/build/make/Makefile.win index 767e7919e..6d34a6c63 100644 --- a/deps/build/make/Makefile.win +++ b/deps/build/make/Makefile.win @@ -23,12 +23,14 @@ ARCHFLAGS_X86 = -msse -msse2 ARCHFLAGS_X64 = -msse -msse2 # C Compiler -CC = clang-cl +CC_X86 = clang-cl +CC_X64 = clang-cl CFLAGS_X86 = -MT -TC -m32 --target=$(TARGET_X86) $(ARCHFLAGS_X86) $(FLAGS) CFLAGS_X64 = -MT -TC -m64 --target=$(TARGET_X64) $(ARCHFLAGS_X64) $(FLAGS) # C++ Compiler -CXX = clang++ +CXX_X86 = clang++ +CXX_X64 = clang++ CXXFLAGS_ALL = -MT -TP -Xclang -flto-visibility-public-std $(FLAGS) CXXFLAGS_A_X86 = -m32 -target $(TARGET_X86) $(ARCHFLAGS_X86) $(CXXFLAGS_ALL) CXXFLAGS_A_X64 = -m64 -target $(TARGET_X64) $(ARCHFLAGS_X64) $(CXXFLAGS_ALL) @@ -43,10 +45,10 @@ define deletefilepattern endef # Platform Specific additional defines -LIBCRYPTO_DEFINES_X86_PLAT = -DOPENSSL_SYS_WIN32 -DDSO_WIN32 -DWIN32_LEAN_AND_MEAN -DOPENSSLDIR=\".\" -DENGINESDIR=\".\" -LIBCRYPTO_DEFINES_X64_PLAT = -DOPENSSL_SYS_WIN64 -DDSO_WIN32 -DWIN32_LEAN_AND_MEAN -DOPENSSLDIR=\".\" -DENGINESDIR=\".\" -LIBSSL_DEFINES_X86_PLAT = -DOPENSSL_SYS_WIN32 -DDSO_WIN32 -DWIN32_LEAN_AND_MEAN -DOPENSSL_USE_APPLINK -DOPENSSLDIR=\".\" -DENGINESDIR=\".\" -LIBSSL_DEFINES_X64_PLAT = -DOPENSSL_SYS_WIN64 -DDSO_WIN32 -DWIN32_LEAN_AND_MEAN -DOPENSSL_USE_APPLINK -DOPENSSLDIR=\".\" -DENGINESDIR=\".\" +LIBCRYPTO_DEFINES_X86_PLAT = -DOPENSSL_IA32_SSE2 -DOPENSSL_SYS_WIN32 -DDSO_WIN32 -DWIN32_LEAN_AND_MEAN -DOPENSSLDIR=\".\" -DENGINESDIR=\".\" +LIBCRYPTO_DEFINES_X64_PLAT = -DOPENSSL_IA32_SSE2 -DOPENSSL_SYS_WIN64 -DDSO_WIN32 -DWIN32_LEAN_AND_MEAN -DOPENSSLDIR=\".\" -DENGINESDIR=\".\" +LIBSSL_DEFINES_X86_PLAT = -DOPENSSL_IA32_SSE2 -DOPENSSL_SYS_WIN32 -DDSO_WIN32 -DWIN32_LEAN_AND_MEAN -DOPENSSL_USE_APPLINK -DOPENSSLDIR=\".\" -DENGINESDIR=\".\" +LIBSSL_DEFINES_X64_PLAT = -DOPENSSL_IA32_SSE2 -DOPENSSL_SYS_WIN64 -DDSO_WIN32 -DWIN32_LEAN_AND_MEAN -DOPENSSL_USE_APPLINK -DOPENSSLDIR=\".\" -DENGINESDIR=\".\" FONTCONFIG_DEFINES_X86_PLAT = FONTCONFIG_DEFINES_X64_PLAT = OPENCVCORE_DEFINES_X86_PLAT = @@ -57,52 +59,52 @@ OPENCVIMGPROC_DEFINES_X86_PLAT = OPENCVIMGPROC_DEFINES_X64_PLAT = OPENCVVIDEOIO_DEFINES_X86_PLAT = OPENCVVIDEOIO_DEFINES_X64_PLAT = -QTBOOTSTRAP_DEFINES_X86_PLAT = -QTBOOTSTRAP_DEFINES_X64_PLAT = -QTMOC_DEFINES_X86_PLAT = -QTMOC_DEFINES_X64_PLAT = -QTRCC_DEFINES_X86_PLAT = -QTRCC_DEFINES_X64_PLAT = -QTUIC_DEFINES_X86_PLAT = -QTUIC_DEFINES_X64_PLAT = -QTBLUETOOTH_DEFINES_X86_PLAT = -DQT_WINRT_BLUETOOTH -DQT_FEATURE_bluez=-1 -DQT_FEATURE_dbus=-1 -QTBLUETOOTH_DEFINES_X64_PLAT = -DQT_WINRT_BLUETOOTH -DQT_FEATURE_bluez=-1 -DQT_FEATURE_dbus=-1 -QTCONCURRENT_DEFINES_X86_PLAT = -QTCONCURRENT_DEFINES_X64_PLAT = -QTCORE_DEFINES_X86_PLAT = -DQT_FEATURE_dbus=-1 -QTCORE_DEFINES_X64_PLAT = -DQT_FEATURE_dbus=-1 -QTDBUS_DEFINES_X86_PLAT = -QTDBUS_DEFINES_X64_PLAT = -QTEVENTDISPATCHERS_DEFINES_X86_PLAT = -QTEVENTDISPATCHERS_DEFINES_X64_PLAT = -QTFONTDATABASES_DEFINES_X86_PLAT = -DQT_NO_FONTCONFIG -QTFONTDATABASES_DEFINES_X64_PLAT = -DQT_NO_FONTCONFIG -QTGAMEPAD_DEFINES_X86_PLAT = -QTGAMEPAD_DEFINES_X64_PLAT = -QTGUI_DEFINES_X86_PLAT = -DQT_QPA_DEFAULT_PLATFORM_NAME=\"windows\" -DQT_NO_FONTCONFIG -DQT_FEATURE_dbus=-1 -QTGUI_DEFINES_X64_PLAT = -DQT_QPA_DEFAULT_PLATFORM_NAME=\"windows\" -DQT_NO_FONTCONFIG -DQT_FEATURE_dbus=-1 -QTMULTIMEDIA_DEFINES_X86_PLAT = -QTMULTIMEDIA_DEFINES_X64_PLAT = -QTMULTIMEDIAWIDGETS_DEFINES_X86_PLAT= -QTMULTIMEDIAWIDGETS_DEFINES_X64_PLAT= -QTNETWORK_DEFINES_X86_PLAT = -DOPENSSLDIR=\".\" -DENGINESDIR=\".\" -QTNETWORK_DEFINES_X64_PLAT = -DOPENSSLDIR=\".\" -DENGINESDIR=\".\" -QTOPENGL_DEFINES_X86_PLAT = -QTOPENGL_DEFINES_X64_PLAT = -QTPLATFORMWINDOWS_DEFINES_X86_PLAT = -DQT_QPA_DEFAULT_PLATFORM_NAME=\"windows\" -DQT_NO_FONTCONFIG -QTPLATFORMWINDOWS_DEFINES_X64_PLAT = -DQT_QPA_DEFAULT_PLATFORM_NAME=\"windows\" -DQT_NO_FONTCONFIG -QTPLATFORMXCB_DEFINES_X86_PLAT = -QTPLATFORMXCB_DEFINES_X64_PLAT = +QTBOOTSTRAP_DEFINES_X86_PLAT = -DQT_LARGEFILE_SUPPORT=64 +QTBOOTSTRAP_DEFINES_X64_PLAT = -DQT_LARGEFILE_SUPPORT=64 +QTMOC_DEFINES_X86_PLAT = -DQT_LARGEFILE_SUPPORT=64 +QTMOC_DEFINES_X64_PLAT = -DQT_LARGEFILE_SUPPORT=64 +QTRCC_DEFINES_X86_PLAT = -DQT_LARGEFILE_SUPPORT=64 +QTRCC_DEFINES_X64_PLAT = -DQT_LARGEFILE_SUPPORT=64 +QTUIC_DEFINES_X86_PLAT = -DQT_LARGEFILE_SUPPORT=64 +QTUIC_DEFINES_X64_PLAT = -DQT_LARGEFILE_SUPPORT=64 +QTBLUETOOTH_DEFINES_X86_PLAT = -DQT_LARGEFILE_SUPPORT=64 -DQT_WINRT_BLUETOOTH -DQT_FEATURE_bluez=-1 -DQT_FEATURE_dbus=-1 +QTBLUETOOTH_DEFINES_X64_PLAT = -DQT_LARGEFILE_SUPPORT=64 -DQT_WINRT_BLUETOOTH -DQT_FEATURE_bluez=-1 -DQT_FEATURE_dbus=-1 +QTCONCURRENT_DEFINES_X86_PLAT = -DQT_LARGEFILE_SUPPORT=64 +QTCONCURRENT_DEFINES_X64_PLAT = -DQT_LARGEFILE_SUPPORT=64 +QTCORE_DEFINES_X86_PLAT = -DQT_LARGEFILE_SUPPORT=64 -DQT_FEATURE_dbus=-1 +QTCORE_DEFINES_X64_PLAT = -DQT_LARGEFILE_SUPPORT=64 -DQT_FEATURE_dbus=-1 +QTDBUS_DEFINES_X86_PLAT = -DQT_LARGEFILE_SUPPORT=64 +QTDBUS_DEFINES_X64_PLAT = -DQT_LARGEFILE_SUPPORT=64 +QTEVENTDISPATCHERS_DEFINES_X86_PLAT = -DQT_LARGEFILE_SUPPORT=64 +QTEVENTDISPATCHERS_DEFINES_X64_PLAT = -DQT_LARGEFILE_SUPPORT=64 +QTFONTDATABASES_DEFINES_X86_PLAT = -DQT_LARGEFILE_SUPPORT=64 -DQT_NO_FONTCONFIG +QTFONTDATABASES_DEFINES_X64_PLAT = -DQT_LARGEFILE_SUPPORT=64 -DQT_NO_FONTCONFIG +QTGAMEPAD_DEFINES_X86_PLAT = -DQT_LARGEFILE_SUPPORT=64 +QTGAMEPAD_DEFINES_X64_PLAT = -DQT_LARGEFILE_SUPPORT=64 +QTGUI_DEFINES_X86_PLAT = -DQT_LARGEFILE_SUPPORT=64 -DQT_QPA_DEFAULT_PLATFORM_NAME=\"windows\" -DQT_NO_FONTCONFIG -DQT_FEATURE_dbus=-1 +QTGUI_DEFINES_X64_PLAT = -DQT_LARGEFILE_SUPPORT=64 -DQT_QPA_DEFAULT_PLATFORM_NAME=\"windows\" -DQT_NO_FONTCONFIG -DQT_FEATURE_dbus=-1 +QTMULTIMEDIA_DEFINES_X86_PLAT = -DQT_LARGEFILE_SUPPORT=64 +QTMULTIMEDIA_DEFINES_X64_PLAT = -DQT_LARGEFILE_SUPPORT=64 +QTMULTIMEDIAWIDGETS_DEFINES_X86_PLAT= -DQT_LARGEFILE_SUPPORT=64 +QTMULTIMEDIAWIDGETS_DEFINES_X64_PLAT= -DQT_LARGEFILE_SUPPORT=64 +QTNETWORK_DEFINES_X86_PLAT = -DQT_LARGEFILE_SUPPORT=64 -DOPENSSLDIR=\".\" -DENGINESDIR=\".\" +QTNETWORK_DEFINES_X64_PLAT = -DQT_LARGEFILE_SUPPORT=64 -DOPENSSLDIR=\".\" -DENGINESDIR=\".\" +QTOPENGL_DEFINES_X86_PLAT = -DQT_LARGEFILE_SUPPORT=64 +QTOPENGL_DEFINES_X64_PLAT = -DQT_LARGEFILE_SUPPORT=64 +QTPLATFORMWINDOWS_DEFINES_X86_PLAT = -DQT_LARGEFILE_SUPPORT=64 -DQT_QPA_DEFAULT_PLATFORM_NAME=\"windows\" -DQT_NO_FONTCONFIG +QTPLATFORMWINDOWS_DEFINES_X64_PLAT = -DQT_LARGEFILE_SUPPORT=64 -DQT_QPA_DEFAULT_PLATFORM_NAME=\"windows\" -DQT_NO_FONTCONFIG +QTPLATFORMXCB_DEFINES_X86_PLAT = +QTPLATFORMXCB_DEFINES_X64_PLAT = QTPLATFORMCOCOA_DEFINES_X86_PLAT = QTPLATFORMCOCOA_DEFINES_X64_PLAT = -QTPRINTSUPPORT_DEFINES_X86_PLAT = -QTPRINTSUPPORT_DEFINES_X64_PLAT = -QTSERIALPORT_DEFINES_X86_PLAT = -QTSERIALPORT_DEFINES_X64_PLAT = -QTWIDGETS_DEFINES_X86_PLAT = -QTWIDGETS_DEFINES_X64_PLAT = -QTXML_DEFINES_X86_PLAT = -QTXML_DEFINES_X64_PLAT = +QTPRINTSUPPORT_DEFINES_X86_PLAT = -DQT_LARGEFILE_SUPPORT=64 +QTPRINTSUPPORT_DEFINES_X64_PLAT = -DQT_LARGEFILE_SUPPORT=64 +QTSERIALPORT_DEFINES_X86_PLAT = -DQT_LARGEFILE_SUPPORT=64 +QTSERIALPORT_DEFINES_X64_PLAT = -DQT_LARGEFILE_SUPPORT=64 +QTWIDGETS_DEFINES_X86_PLAT = -DQT_LARGEFILE_SUPPORT=64 +QTWIDGETS_DEFINES_X64_PLAT = -DQT_LARGEFILE_SUPPORT=64 +QTXML_DEFINES_X86_PLAT = -DQT_LARGEFILE_SUPPORT=64 +QTXML_DEFINES_X64_PLAT = -DQT_LARGEFILE_SUPPORT=64 SINGLEAPPLICATION_DEFINES_X86_PLAT = SINGLEAPPLICATION_DEFINES_X64_PLAT = @@ -432,7 +434,33 @@ QTGUI_MOCC = $(QTGUI_MOCC_ALL) QTGUI_UICH = $(QTGUI_UICH_ALL) QTGUI_RCCH = $(QTGUI_RCCH_ALL) QTGUI_OBJS = $(QTGUI_OBJS_ALL) \ - image/qpixmap_win.o + image/qpixmap_win.o \ + opengl/qopenglfunctions_1_0.o \ + opengl/qopenglfunctions_1_1.o \ + opengl/qopenglfunctions_1_2.o \ + opengl/qopenglfunctions_1_3.o \ + opengl/qopenglfunctions_1_4.o \ + opengl/qopenglfunctions_1_5.o \ + opengl/qopenglfunctions_2_0.o \ + opengl/qopenglfunctions_2_1.o \ + opengl/qopenglfunctions_3_0.o \ + opengl/qopenglfunctions_3_1.o \ + opengl/qopenglfunctions_3_2_compatibility.o \ + opengl/qopenglfunctions_3_2_core.o \ + opengl/qopenglfunctions_3_3_compatibility.o \ + opengl/qopenglfunctions_3_3_core.o \ + opengl/qopenglfunctions_4_0_compatibility.o \ + opengl/qopenglfunctions_4_0_core.o \ + opengl/qopenglfunctions_4_1_compatibility.o \ + opengl/qopenglfunctions_4_1_core.o \ + opengl/qopenglfunctions_4_2_compatibility.o \ + opengl/qopenglfunctions_4_2_core.o \ + opengl/qopenglfunctions_4_3_compatibility.o \ + opengl/qopenglfunctions_4_3_core.o \ + opengl/qopenglfunctions_4_4_compatibility.o \ + opengl/qopenglfunctions_4_4_core.o \ + opengl/qopenglfunctions_4_5_compatibility.o \ + opengl/qopenglfunctions_4_5_core.o QTGUI_OBJS_C = $(QTGUI_OBJS_C_ALL) QTGUI_OBJS_MOC = $(QTGUI_OBJS_MOC_ALL) QTGUI_OBJS_RCC = $(QTGUI_OBJS_RCC_ALL) @@ -595,15 +623,61 @@ SINGLEAPPLICATION_OBJS = $(SINGLEAPPLICATION_OBJS_ALL) SINGLEAPPLICATION_OBJS_MOC = $(SINGLEAPPLICATION_OBJS_MOC_ALL) SINGLEAPPLICATION_OBJS_RCC = $(SINGLEAPPLICATION_OBJS_RCC_ALL) +##################################################################################### +# Project Dependencies + +QTBLUETOOTH_DEPS_X86 = qt-moc-x86 qt-rcc-x86 qt-uic-x86 +QTBLUETOOTH_DEPS_X64 = qt-moc-x64 qt-rcc-x64 qt-uic-x64 +QTCORE_DEPS_X86 = qt-moc-x86 qt-rcc-x86 qt-uic-x86 +QTCORE_DEPS_X64 = qt-moc-x64 qt-rcc-x64 qt-uic-x64 +QTDBUS_DEPS_X86 = qt-moc-x86 qt-rcc-x86 qt-uic-x86 +QTDBUS_DEPS_X64 = qt-moc-x64 qt-rcc-x64 qt-uic-x64 +QTEVENTDISPATCHERS_DEPS_X86 = qt-moc-x86 qt-rcc-x86 qt-uic-x86 +QTEVENTDISPATCHERS_DEPS_X64 = qt-moc-x64 qt-rcc-x64 qt-uic-x64 +QTFONTDATABASES_DEPS_X86 = qt-moc-x86 qt-rcc-x86 qt-uic-x86 +QTFONTDATABASES_DEPS_X64 = qt-moc-x64 qt-rcc-x64 qt-uic-x64 +QTGAMEPAD_DEPS_X86 = qt-moc-x86 qt-rcc-x86 qt-uic-x86 +QTGAMEPAD_DEPS_X64 = qt-moc-x64 qt-rcc-x64 qt-uic-x64 +QTGUI_DEPS_X86 = qt-moc-x86 qt-rcc-x86 qt-uic-x86 +QTGUI_DEPS_X64 = qt-moc-x64 qt-rcc-x64 qt-uic-x64 +QTMULTIMEDIA_DEPS_X86 = qt-moc-x86 qt-rcc-x86 qt-uic-x86 +QTMULTIMEDIA_DEPS_X64 = qt-moc-x64 qt-rcc-x64 qt-uic-x64 +QTMULTIMEDIAWIDGETS_DEPS_X86 = qt-moc-x86 qt-rcc-x86 qt-uic-x86 +QTMULTIMEDIAWIDGETS_DEPS_X64 = qt-moc-x64 qt-rcc-x64 qt-uic-x64 +QTNETWORK_DEPS_X86 = qt-moc-x86 qt-rcc-x86 qt-uic-x86 +QTNETWORK_DEPS_X64 = qt-moc-x64 qt-rcc-x64 qt-uic-x64 +QTPLATFORMWINDOWS_DEPS_X86 = qt-moc-x86 qt-rcc-x86 qt-uic-x86 +QTPLATFORMWINDOWS_DEPS_X64 = qt-moc-x64 qt-rcc-x64 qt-uic-x64 +QTPLATFORMXCB_DEPS_X86 = qt-moc-x86 qt-rcc-x86 qt-uic-x86 +QTPLATFORMXCB_DEPS_X64 = qt-moc-x64 qt-rcc-x64 qt-uic-x64 +QTPLATFORMCOCOA_DEPS_X86 = qt-moc-x86 qt-rcc-x86 qt-uic-x86 +QTPLATFORMCOCOA_DEPS_X64 = qt-moc-x64 qt-rcc-x64 qt-uic-x64 +QTPRINTSUPPORT_DEPS_X86 = qt-moc-x86 qt-rcc-x86 qt-uic-x86 +QTPRINTSUPPORT_DEPS_X64 = qt-moc-x64 qt-rcc-x64 qt-uic-x64 +QTSERIALPORT_DEPS_X86 = qt-moc-x86 qt-rcc-x86 qt-uic-x86 +QTSERIALPORT_DEPS_X64 = qt-moc-x64 qt-rcc-x64 qt-uic-x64 +QTWIDGETS_DEPS_X86 = qt-moc-x86 qt-rcc-x86 qt-uic-x86 +QTWIDGETS_DEPS_X64 = qt-moc-x64 qt-rcc-x64 qt-uic-x64 +SINGLEAPPLICATION_DEPS_X86 = qt-moc-x86 qt-rcc-x86 qt-uic-x86 +SINGLEAPPLICATION_DEPS_X64 = qt-moc-x64 qt-rcc-x64 qt-uic-x64 + ##################################################################################### # Include Targets include Makefile.targets all-x86: all-common-x86 \ + qt-bootstrap-x86 \ + qt-moc-x86 \ + qt-rcc-x86 \ + qt-uic-x86 \ qt-platform-windows-x86 all-x64: all-common-x64 \ + qt-bootstrap-x64 \ + qt-moc-x64 \ + qt-rcc-x64 \ + qt-uic-x64 \ qt-platform-windows-x64 all: all-x86 all-x64 diff --git a/deps/build/vs/qt-bluetooth.vcxproj b/deps/build/vs/qt-bluetooth.vcxproj index 4bb501f36..cb74ea560 100644 --- a/deps/build/vs/qt-bluetooth.vcxproj +++ b/deps/build/vs/qt-bluetooth.vcxproj @@ -402,7 +402,7 @@ NotUsing MultiThreadedDebug Level3 - WIN32;_WINDOWS;_UNICODE;QT_STATIC;QT_USE_QSTRINGBUILDER;QT_WINRT_BLUETOOTH;QT_FEATURE_bluez=-1;QT_FEATURE_dbus=-1;CLASSIC_APP_BUILD;_ENABLE_EXTENDED_ALIGNED_STORAGE;_DEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;_WINDOWS;_UNICODE;QT_STATIC;QT_LARGEFILE_SUPPORT=64;QT_USE_QSTRINGBUILDER;QT_WINRT_BLUETOOTH;QT_FEATURE_bluez=-1;QT_FEATURE_dbus=-1;CLASSIC_APP_BUILD;_ENABLE_EXTENDED_ALIGNED_STORAGE;_DEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) Debug $(IntDir) $(OutDir)$(TargetName).pdb @@ -443,7 +443,7 @@ qt-bluetooth.cmd NotUsing MultiThreadedDebug Level3 - WIN32;_WINDOWS;_UNICODE;QT_STATIC;QT_USE_QSTRINGBUILDER;QT_WINRT_BLUETOOTH;QT_FEATURE_bluez=-1;QT_FEATURE_dbus=-1;CLASSIC_APP_BUILD;_ENABLE_EXTENDED_ALIGNED_STORAGE;_DEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;_WINDOWS;_UNICODE;QT_STATIC;QT_LARGEFILE_SUPPORT=64;QT_USE_QSTRINGBUILDER;QT_WINRT_BLUETOOTH;QT_FEATURE_bluez=-1;QT_FEATURE_dbus=-1;CLASSIC_APP_BUILD;_ENABLE_EXTENDED_ALIGNED_STORAGE;_DEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) Debug $(IntDir) $(OutDir)$(TargetName).pdb @@ -482,7 +482,7 @@ qt-bluetooth.cmd MultiThreaded Level3 None - WIN32;_WINDOWS;_UNICODE;QT_STATIC;QT_USE_QSTRINGBUILDER;QT_WINRT_BLUETOOTH;QT_FEATURE_bluez=-1;QT_FEATURE_dbus=-1;QT_NO_DEBUG;CLASSIC_APP_BUILD;_ENABLE_EXTENDED_ALIGNED_STORAGE;NDEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;_WINDOWS;_UNICODE;QT_STATIC;QT_LARGEFILE_SUPPORT=64;QT_USE_QSTRINGBUILDER;QT_WINRT_BLUETOOTH;QT_FEATURE_bluez=-1;QT_FEATURE_dbus=-1;QT_NO_DEBUG;CLASSIC_APP_BUILD;_ENABLE_EXTENDED_ALIGNED_STORAGE;NDEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) Release $(IntDir) $(OutDir)$(TargetName).pdb @@ -532,7 +532,7 @@ qt-bluetooth.cmd MultiThreaded Level3 None - WIN32;_WINDOWS;_UNICODE;QT_STATIC;QT_USE_QSTRINGBUILDER;QT_WINRT_BLUETOOTH;QT_FEATURE_bluez=-1;QT_FEATURE_dbus=-1;QT_NO_DEBUG;CLASSIC_APP_BUILD;_ENABLE_EXTENDED_ALIGNED_STORAGE;NDEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;_WINDOWS;_UNICODE;QT_STATIC;QT_LARGEFILE_SUPPORT=64;QT_USE_QSTRINGBUILDER;QT_WINRT_BLUETOOTH;QT_FEATURE_bluez=-1;QT_FEATURE_dbus=-1;QT_NO_DEBUG;CLASSIC_APP_BUILD;_ENABLE_EXTENDED_ALIGNED_STORAGE;NDEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) Release $(IntDir) $(OutDir)$(TargetName).pdb diff --git a/deps/build/vs/qt-bootstrap.vcxproj b/deps/build/vs/qt-bootstrap.vcxproj index 242552c6a..e6a1dbf92 100644 --- a/deps/build/vs/qt-bootstrap.vcxproj +++ b/deps/build/vs/qt-bootstrap.vcxproj @@ -182,7 +182,7 @@ NotUsing MultiThreadedDebug Level3 - WIN32;_WINDOWS;_UNICODE;QT_VERSION_MAJOR=5;QT_VERSION_MINOR=12;QT_VERSION_PATCH=4;QT_VERSION_STR="\"5.12.4\"";QT_BOOTSTRAPPED;QT_BUILD_BOOTSTRAP_LIB;QT_BUILDING_QT;QT_MOC_COMPAT;QT_STATIC;QT_USE_QSTRINGBUILDER;QT_NO_EXCEPTIONS;QT_NO_FOREACH;QT_NO_CAST_TO_ASCII;_ENABLE_EXTENDED_ALIGNED_STORAGE;_ENABLE_EXTENDED_ALIGNED_STORAGE;_DEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;_WINDOWS;_UNICODE;QT_VERSION_MAJOR=5;QT_VERSION_MINOR=12;QT_VERSION_PATCH=4;QT_VERSION_STR="\"5.12.4\"";QT_BOOTSTRAPPED;QT_BUILD_BOOTSTRAP_LIB;QT_BUILDING_QT;QT_MOC_COMPAT;QT_STATIC;QT_LARGEFILE_SUPPORT=64;QT_USE_QSTRINGBUILDER;QT_NO_EXCEPTIONS;QT_NO_FOREACH;QT_NO_CAST_TO_ASCII;_ENABLE_EXTENDED_ALIGNED_STORAGE;_ENABLE_EXTENDED_ALIGNED_STORAGE;_DEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) Debug $(IntDir) $(OutDir)$(TargetName).pdb @@ -220,7 +220,7 @@ NotUsing MultiThreadedDebug Level3 - WIN32;_WINDOWS;_UNICODE;QT_VERSION_MAJOR=5;QT_VERSION_MINOR=12;QT_VERSION_PATCH=4;QT_VERSION_STR="\"5.12.4\"";QT_BOOTSTRAPPED;QT_BUILD_BOOTSTRAP_LIB;QT_BUILDING_QT;QT_MOC_COMPAT;QT_STATIC;QT_USE_QSTRINGBUILDER;QT_NO_EXCEPTIONS;QT_NO_FOREACH;QT_NO_CAST_TO_ASCII;_ENABLE_EXTENDED_ALIGNED_STORAGE;_ENABLE_EXTENDED_ALIGNED_STORAGE;_DEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;_WINDOWS;_UNICODE;QT_VERSION_MAJOR=5;QT_VERSION_MINOR=12;QT_VERSION_PATCH=4;QT_VERSION_STR="\"5.12.4\"";QT_BOOTSTRAPPED;QT_BUILD_BOOTSTRAP_LIB;QT_BUILDING_QT;QT_MOC_COMPAT;QT_STATIC;QT_LARGEFILE_SUPPORT=64;QT_USE_QSTRINGBUILDER;QT_NO_EXCEPTIONS;QT_NO_FOREACH;QT_NO_CAST_TO_ASCII;_ENABLE_EXTENDED_ALIGNED_STORAGE;_ENABLE_EXTENDED_ALIGNED_STORAGE;_DEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) Debug $(IntDir) $(OutDir)$(TargetName).pdb @@ -258,7 +258,7 @@ MultiThreaded Level3 None - WIN32;_WINDOWS;_UNICODE;QT_VERSION_MAJOR=5;QT_VERSION_MINOR=12;QT_VERSION_PATCH=4;QT_VERSION_STR="\"5.12.4\"";QT_BOOTSTRAPPED;QT_BUILD_BOOTSTRAP_LIB;QT_BUILDING_QT;QT_MOC_COMPAT;QT_STATIC;QT_USE_QSTRINGBUILDER;QT_NO_EXCEPTIONS;QT_NO_FOREACH;QT_NO_CAST_TO_ASCII;QT_NO_DEBUG;_ENABLE_EXTENDED_ALIGNED_STORAGE;NDEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;_WINDOWS;_UNICODE;QT_VERSION_MAJOR=5;QT_VERSION_MINOR=12;QT_VERSION_PATCH=4;QT_VERSION_STR="\"5.12.4\"";QT_BOOTSTRAPPED;QT_BUILD_BOOTSTRAP_LIB;QT_BUILDING_QT;QT_MOC_COMPAT;QT_STATIC;QT_LARGEFILE_SUPPORT=64;QT_USE_QSTRINGBUILDER;QT_NO_EXCEPTIONS;QT_NO_FOREACH;QT_NO_CAST_TO_ASCII;QT_NO_DEBUG;_ENABLE_EXTENDED_ALIGNED_STORAGE;NDEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) Release $(IntDir) $(OutDir)$(TargetName).pdb @@ -305,7 +305,7 @@ MultiThreaded Level3 None - WIN32;_WINDOWS;_UNICODE;QT_VERSION_MAJOR=5;QT_VERSION_MINOR=12;QT_VERSION_PATCH=4;QT_VERSION_STR="\"5.12.4\"";QT_BOOTSTRAPPED;QT_BUILD_BOOTSTRAP_LIB;QT_BUILDING_QT;QT_MOC_COMPAT;QT_STATIC;QT_USE_QSTRINGBUILDER;QT_NO_EXCEPTIONS;QT_NO_FOREACH;QT_NO_CAST_TO_ASCII;QT_NO_DEBUG;_ENABLE_EXTENDED_ALIGNED_STORAGE;NDEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;_WINDOWS;_UNICODE;QT_VERSION_MAJOR=5;QT_VERSION_MINOR=12;QT_VERSION_PATCH=4;QT_VERSION_STR="\"5.12.4\"";QT_BOOTSTRAPPED;QT_BUILD_BOOTSTRAP_LIB;QT_BUILDING_QT;QT_MOC_COMPAT;QT_STATIC;QT_LARGEFILE_SUPPORT=64;QT_USE_QSTRINGBUILDER;QT_NO_EXCEPTIONS;QT_NO_FOREACH;QT_NO_CAST_TO_ASCII;QT_NO_DEBUG;_ENABLE_EXTENDED_ALIGNED_STORAGE;NDEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) Release $(IntDir) $(OutDir)$(TargetName).pdb diff --git a/deps/build/vs/qt-concurrent.vcxproj b/deps/build/vs/qt-concurrent.vcxproj index fe70f11f1..e92282e24 100644 --- a/deps/build/vs/qt-concurrent.vcxproj +++ b/deps/build/vs/qt-concurrent.vcxproj @@ -123,7 +123,7 @@ NotUsing MultiThreadedDebug Level3 - WIN32;_WINDOWS;_UNICODE;QT_STATIC;QT_USE_QSTRINGBUILDER;_ENABLE_EXTENDED_ALIGNED_STORAGE;_DEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;_WINDOWS;_UNICODE;QT_STATIC;QT_LARGEFILE_SUPPORT=64;QT_USE_QSTRINGBUILDER;_ENABLE_EXTENDED_ALIGNED_STORAGE;_DEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) Debug $(IntDir) $(OutDir)$(TargetName).pdb @@ -161,7 +161,7 @@ NotUsing MultiThreadedDebug Level3 - WIN32;_WINDOWS;_UNICODE;QT_STATIC;QT_USE_QSTRINGBUILDER;_ENABLE_EXTENDED_ALIGNED_STORAGE;_DEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;_WINDOWS;_UNICODE;QT_STATIC;QT_LARGEFILE_SUPPORT=64;QT_USE_QSTRINGBUILDER;_ENABLE_EXTENDED_ALIGNED_STORAGE;_DEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) Debug $(IntDir) $(OutDir)$(TargetName).pdb @@ -199,7 +199,7 @@ MultiThreaded Level3 None - WIN32;_WINDOWS;_UNICODE;QT_STATIC;QT_USE_QSTRINGBUILDER;QT_NO_DEBUG;_ENABLE_EXTENDED_ALIGNED_STORAGE;NDEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;_WINDOWS;_UNICODE;QT_STATIC;QT_LARGEFILE_SUPPORT=64;QT_USE_QSTRINGBUILDER;QT_NO_DEBUG;_ENABLE_EXTENDED_ALIGNED_STORAGE;NDEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) Release $(IntDir) $(OutDir)$(TargetName).pdb @@ -246,7 +246,7 @@ MultiThreaded Level3 None - WIN32;_WINDOWS;_UNICODE;QT_STATIC;QT_USE_QSTRINGBUILDER;QT_NO_DEBUG;_ENABLE_EXTENDED_ALIGNED_STORAGE;NDEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;_WINDOWS;_UNICODE;QT_STATIC;QT_LARGEFILE_SUPPORT=64;QT_USE_QSTRINGBUILDER;QT_NO_DEBUG;_ENABLE_EXTENDED_ALIGNED_STORAGE;NDEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) Release $(IntDir) $(OutDir)$(TargetName).pdb diff --git a/deps/build/vs/qt-core.vcxproj b/deps/build/vs/qt-core.vcxproj index dddf7ce6b..4ebeeabe3 100644 --- a/deps/build/vs/qt-core.vcxproj +++ b/deps/build/vs/qt-core.vcxproj @@ -1152,7 +1152,7 @@ NotUsing MultiThreadedDebug Level3 - WIN32;_WINDOWS;_UNICODE;PCRE2_STATIC;QT_STATIC;QT_USE_QSTRINGBUILDER;QT_BUILD_CORE_LIB;QT_FEATURE_dbus=-1;_ENABLE_EXTENDED_ALIGNED_STORAGE;_DEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;_WINDOWS;_UNICODE;PCRE2_STATIC;QT_STATIC;QT_LARGEFILE_SUPPORT=64;QT_USE_QSTRINGBUILDER;QT_BUILD_CORE_LIB;QT_FEATURE_dbus=-1;_ENABLE_EXTENDED_ALIGNED_STORAGE;_DEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) Debug $(IntDir) $(OutDir)$(TargetName).pdb @@ -1194,7 +1194,7 @@ qt-core.cmd NotUsing MultiThreadedDebug Level3 - WIN32;_WINDOWS;_UNICODE;PCRE2_STATIC;QT_STATIC;QT_USE_QSTRINGBUILDER;QT_BUILD_CORE_LIB;QT_FEATURE_dbus=-1;_ENABLE_EXTENDED_ALIGNED_STORAGE;_DEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;_WINDOWS;_UNICODE;PCRE2_STATIC;QT_STATIC;QT_LARGEFILE_SUPPORT=64;QT_USE_QSTRINGBUILDER;QT_BUILD_CORE_LIB;QT_FEATURE_dbus=-1;_ENABLE_EXTENDED_ALIGNED_STORAGE;_DEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) Debug $(IntDir) $(OutDir)$(TargetName).pdb @@ -1236,7 +1236,7 @@ qt-core.cmd MultiThreaded Level3 None - WIN32;_WINDOWS;_UNICODE;PCRE2_STATIC;QT_STATIC;QT_USE_QSTRINGBUILDER;QT_BUILD_CORE_LIB;QT_FEATURE_dbus=-1;QT_NO_DEBUG;_ENABLE_EXTENDED_ALIGNED_STORAGE;_NDEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;_WINDOWS;_UNICODE;PCRE2_STATIC;QT_STATIC;QT_LARGEFILE_SUPPORT=64;QT_USE_QSTRINGBUILDER;QT_BUILD_CORE_LIB;QT_FEATURE_dbus=-1;QT_NO_DEBUG;_ENABLE_EXTENDED_ALIGNED_STORAGE;_NDEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) Release $(IntDir) $(OutDir)$(TargetName).pdb @@ -1287,7 +1287,7 @@ qt-core.cmd MultiThreaded Level3 None - WIN32;_WINDOWS;_UNICODE;PCRE2_STATIC;QT_STATIC;QT_USE_QSTRINGBUILDER;QT_BUILD_CORE_LIB;QT_FEATURE_dbus=-1;QT_NO_DEBUG;_ENABLE_EXTENDED_ALIGNED_STORAGE;_NDEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;_WINDOWS;_UNICODE;PCRE2_STATIC;QT_STATIC;QT_LARGEFILE_SUPPORT=64;QT_USE_QSTRINGBUILDER;QT_BUILD_CORE_LIB;QT_FEATURE_dbus=-1;QT_NO_DEBUG;_ENABLE_EXTENDED_ALIGNED_STORAGE;_NDEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) Release $(IntDir) $(OutDir)$(TargetName).pdb diff --git a/deps/build/vs/qt-eventdispatchers.vcxproj b/deps/build/vs/qt-eventdispatchers.vcxproj index 28ebfab89..4a9d07f35 100644 --- a/deps/build/vs/qt-eventdispatchers.vcxproj +++ b/deps/build/vs/qt-eventdispatchers.vcxproj @@ -120,7 +120,7 @@ NotUsing MultiThreadedDebug Level3 - WIN32;_WINDOWS;_UNICODE;QT_STATIC;QT_STATICPLUGIN;QT_USE_QSTRINGBUILDER;_ENABLE_EXTENDED_ALIGNED_STORAGE;_DEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;_WINDOWS;_UNICODE;QT_STATIC;QT_STATICPLUGIN;QT_LARGEFILE_SUPPORT=64;QT_USE_QSTRINGBUILDER;_ENABLE_EXTENDED_ALIGNED_STORAGE;_DEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) Debug $(IntDir) $(OutDir)$(TargetName).pdb @@ -161,7 +161,7 @@ qt-eventdispatchers.cmd NotUsing MultiThreadedDebug Level3 - WIN32;_WINDOWS;_UNICODE;QT_STATIC;QT_STATICPLUGIN;QT_USE_QSTRINGBUILDER;_ENABLE_EXTENDED_ALIGNED_STORAGE;_DEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;_WINDOWS;_UNICODE;QT_STATIC;QT_STATICPLUGIN;QT_LARGEFILE_SUPPORT=64;QT_USE_QSTRINGBUILDER;_ENABLE_EXTENDED_ALIGNED_STORAGE;_DEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) Debug $(IntDir) $(OutDir)$(TargetName).pdb @@ -202,7 +202,7 @@ qt-eventdispatchers.cmd MultiThreaded Level3 None - WIN32;_WINDOWS;_UNICODE;QT_STATIC;QT_STATICPLUGIN;QT_USE_QSTRINGBUILDER;QT_NO_DEBUG;_ENABLE_EXTENDED_ALIGNED_STORAGE;NDEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;_WINDOWS;_UNICODE;QT_STATIC;QT_STATICPLUGIN;QT_LARGEFILE_SUPPORT=64;QT_USE_QSTRINGBUILDER;QT_NO_DEBUG;_ENABLE_EXTENDED_ALIGNED_STORAGE;NDEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) Release $(IntDir) $(OutDir)$(TargetName).pdb @@ -253,7 +253,7 @@ qt-eventdispatchers.cmd MultiThreaded Level3 None - WIN32;_WINDOWS;_UNICODE;QT_STATIC;QT_STATICPLUGIN;QT_USE_QSTRINGBUILDER;QT_NO_DEBUG;_ENABLE_EXTENDED_ALIGNED_STORAGE;NDEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;_WINDOWS;_UNICODE;QT_STATIC;QT_STATICPLUGIN;QT_LARGEFILE_SUPPORT=64;QT_USE_QSTRINGBUILDER;QT_NO_DEBUG;_ENABLE_EXTENDED_ALIGNED_STORAGE;NDEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) Release $(IntDir) $(OutDir)$(TargetName).pdb diff --git a/deps/build/vs/qt-fontdatabases.vcxproj b/deps/build/vs/qt-fontdatabases.vcxproj index 725fb7e11..ae2ef5481 100644 --- a/deps/build/vs/qt-fontdatabases.vcxproj +++ b/deps/build/vs/qt-fontdatabases.vcxproj @@ -146,7 +146,7 @@ NotUsing MultiThreadedDebug Level3 - WIN32;_WINDOWS;_UNICODE;QT_STATIC;QT_STATICPLUGIN;QT_NO_FONTCONFIG;QT_USE_QSTRINGBUILDER;_ENABLE_EXTENDED_ALIGNED_STORAGE;_DEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;_WINDOWS;_UNICODE;QT_STATIC;QT_STATICPLUGIN;QT_LARGEFILE_SUPPORT=64;QT_NO_FONTCONFIG;QT_USE_QSTRINGBUILDER;_ENABLE_EXTENDED_ALIGNED_STORAGE;_DEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) Debug $(IntDir) $(OutDir)$(TargetName).pdb @@ -184,7 +184,7 @@ NotUsing MultiThreadedDebug Level3 - WIN32;_WINDOWS;_UNICODE;QT_STATIC;QT_STATICPLUGIN;QT_NO_FONTCONFIG;QT_USE_QSTRINGBUILDER;_ENABLE_EXTENDED_ALIGNED_STORAGE;_DEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;_WINDOWS;_UNICODE;QT_STATIC;QT_STATICPLUGIN;QT_LARGEFILE_SUPPORT=64;QT_NO_FONTCONFIG;QT_USE_QSTRINGBUILDER;_ENABLE_EXTENDED_ALIGNED_STORAGE;_DEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) Debug $(IntDir) $(OutDir)$(TargetName).pdb @@ -222,7 +222,7 @@ MultiThreaded Level3 None - WIN32;_WINDOWS;_UNICODE;QT_STATIC;QT_STATICPLUGIN;QT_NO_FONTCONFIG;QT_USE_QSTRINGBUILDER;QT_NO_DEBUG;_ENABLE_EXTENDED_ALIGNED_STORAGE;NDEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;_WINDOWS;_UNICODE;QT_STATIC;QT_STATICPLUGIN;QT_LARGEFILE_SUPPORT=64;QT_NO_FONTCONFIG;QT_USE_QSTRINGBUILDER;QT_NO_DEBUG;_ENABLE_EXTENDED_ALIGNED_STORAGE;NDEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) Release $(IntDir) $(OutDir)$(TargetName).pdb @@ -269,7 +269,7 @@ MultiThreaded Level3 None - WIN32;_WINDOWS;_UNICODE;QT_STATIC;QT_STATICPLUGIN;QT_NO_FONTCONFIG;QT_USE_QSTRINGBUILDER;QT_NO_DEBUG;_ENABLE_EXTENDED_ALIGNED_STORAGE;NDEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;_WINDOWS;_UNICODE;QT_STATIC;QT_STATICPLUGIN;QT_LARGEFILE_SUPPORT=64;QT_NO_FONTCONFIG;QT_USE_QSTRINGBUILDER;QT_NO_DEBUG;_ENABLE_EXTENDED_ALIGNED_STORAGE;NDEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) Release $(IntDir) $(OutDir)$(TargetName).pdb diff --git a/deps/build/vs/qt-gamepad.vcxproj b/deps/build/vs/qt-gamepad.vcxproj index cf2559ea5..0fbe33c9c 100644 --- a/deps/build/vs/qt-gamepad.vcxproj +++ b/deps/build/vs/qt-gamepad.vcxproj @@ -128,7 +128,7 @@ NotUsing MultiThreadedDebug Level3 - WIN32;_WINDOWS;_UNICODE;QT_STATIC;QT_USE_QSTRINGBUILDER;_ENABLE_EXTENDED_ALIGNED_STORAGE;_DEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;_WINDOWS;_UNICODE;QT_STATIC;QT_LARGEFILE_SUPPORT=64;QT_USE_QSTRINGBUILDER;_ENABLE_EXTENDED_ALIGNED_STORAGE;_DEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) Debug $(IntDir) $(OutDir)$(TargetName).pdb @@ -170,7 +170,7 @@ qt-gamepad.cmd NotUsing MultiThreadedDebug Level3 - WIN32;_WINDOWS;_UNICODE;QT_STATIC;QT_USE_QSTRINGBUILDER;_ENABLE_EXTENDED_ALIGNED_STORAGE;_DEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;_WINDOWS;_UNICODE;QT_STATIC;QT_LARGEFILE_SUPPORT=64;QT_USE_QSTRINGBUILDER;_ENABLE_EXTENDED_ALIGNED_STORAGE;_DEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) Debug $(IntDir) $(OutDir)$(TargetName).pdb @@ -212,7 +212,7 @@ qt-gamepad.cmd MultiThreaded Level3 None - WIN32;_WINDOWS;_UNICODE;QT_STATIC;QT_USE_QSTRINGBUILDER;QT_NO_DEBUG;_ENABLE_EXTENDED_ALIGNED_STORAGE;NDEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;_WINDOWS;_UNICODE;QT_STATIC;QT_LARGEFILE_SUPPORT=64;QT_USE_QSTRINGBUILDER;QT_NO_DEBUG;_ENABLE_EXTENDED_ALIGNED_STORAGE;NDEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) Release $(IntDir) $(OutDir)$(TargetName).pdb @@ -263,7 +263,7 @@ qt-gamepad.cmd MultiThreaded Level3 None - WIN32;_WINDOWS;_UNICODE;QT_STATIC;QT_USE_QSTRINGBUILDER;QT_NO_DEBUG;_ENABLE_EXTENDED_ALIGNED_STORAGE;NDEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;_WINDOWS;_UNICODE;QT_STATIC;QT_LARGEFILE_SUPPORT=64;QT_USE_QSTRINGBUILDER;QT_NO_DEBUG;_ENABLE_EXTENDED_ALIGNED_STORAGE;NDEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) Release $(IntDir) $(OutDir)$(TargetName).pdb diff --git a/deps/build/vs/qt-gui.vcxproj b/deps/build/vs/qt-gui.vcxproj index a63d97912..5e9f13c40 100644 --- a/deps/build/vs/qt-gui.vcxproj +++ b/deps/build/vs/qt-gui.vcxproj @@ -838,7 +838,7 @@ NotUsing MultiThreadedDebug Level3 - WIN32;_WINDOWS;_UNICODE;QT_STATIC;QT_USE_QSTRINGBUILDER;QT_NO_FONTCONFIG;QT_FEATURE_dbus=-1;QT_QPA_DEFAULT_PLATFORM_NAME="windows";_ENABLE_EXTENDED_ALIGNED_STORAGE;_DEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;_WINDOWS;_UNICODE;QT_STATIC;QT_LARGEFILE_SUPPORT=64;QT_USE_QSTRINGBUILDER;QT_NO_FONTCONFIG;QT_FEATURE_dbus=-1;QT_QPA_DEFAULT_PLATFORM_NAME="windows";_ENABLE_EXTENDED_ALIGNED_STORAGE;_DEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) Debug $(IntDir) $(OutDir)$(TargetName).pdb @@ -880,7 +880,7 @@ qt-gui.cmd NotUsing MultiThreadedDebug Level3 - WIN32;_WINDOWS;_UNICODE;QT_STATIC;QT_USE_QSTRINGBUILDER;QT_NO_FONTCONFIG;QT_FEATURE_dbus=-1;QT_QPA_DEFAULT_PLATFORM_NAME="windows";_ENABLE_EXTENDED_ALIGNED_STORAGE;_DEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;_WINDOWS;_UNICODE;QT_STATIC;QT_LARGEFILE_SUPPORT=64;QT_USE_QSTRINGBUILDER;QT_NO_FONTCONFIG;QT_FEATURE_dbus=-1;QT_QPA_DEFAULT_PLATFORM_NAME="windows";_ENABLE_EXTENDED_ALIGNED_STORAGE;_DEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) Debug $(IntDir) $(OutDir)$(TargetName).pdb @@ -922,7 +922,7 @@ qt-gui.cmd MultiThreaded Level3 None - WIN32;_WINDOWS;_UNICODE;QT_STATIC;QT_USE_QSTRINGBUILDER;QT_NO_FONTCONFIG;QT_FEATURE_dbus=-1;QT_QPA_DEFAULT_PLATFORM_NAME="windows";QT_NO_DEBUG;_ENABLE_EXTENDED_ALIGNED_STORAGE;NDEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;_WINDOWS;_UNICODE;QT_STATIC;QT_LARGEFILE_SUPPORT=64;QT_USE_QSTRINGBUILDER;QT_NO_FONTCONFIG;QT_FEATURE_dbus=-1;QT_QPA_DEFAULT_PLATFORM_NAME="windows";QT_NO_DEBUG;_ENABLE_EXTENDED_ALIGNED_STORAGE;NDEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) Release $(IntDir) $(OutDir)$(TargetName).pdb @@ -973,7 +973,7 @@ qt-gui.cmd MultiThreaded Level3 None - WIN32;_WINDOWS;_UNICODE;QT_STATIC;QT_USE_QSTRINGBUILDER;QT_NO_FONTCONFIG;QT_FEATURE_dbus=-1;QT_QPA_DEFAULT_PLATFORM_NAME="windows";QT_NO_DEBUG;_ENABLE_EXTENDED_ALIGNED_STORAGE;NDEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;_WINDOWS;_UNICODE;QT_STATIC;QT_LARGEFILE_SUPPORT=64;QT_USE_QSTRINGBUILDER;QT_NO_FONTCONFIG;QT_FEATURE_dbus=-1;QT_QPA_DEFAULT_PLATFORM_NAME="windows";QT_NO_DEBUG;_ENABLE_EXTENDED_ALIGNED_STORAGE;NDEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) Release $(IntDir) $(OutDir)$(TargetName).pdb diff --git a/deps/build/vs/qt-moc.vcxproj b/deps/build/vs/qt-moc.vcxproj index f6423d05f..3ba5ca48e 100644 --- a/deps/build/vs/qt-moc.vcxproj +++ b/deps/build/vs/qt-moc.vcxproj @@ -106,7 +106,7 @@ NotUsing MultiThreadedDebug Level3 - WIN32;_WINDOWS;QT_STATIC;QT_MOC;QT_NO_CAST_FROM_ASCII;QT_NO_CAST_FROM_BYTEARRAY;QT_NO_COMPRESS;QT_NO_FOREACH;QT_NO_NARROWING_CONVERSIONS_IN_CONNECT;QT_USE_QSTRINGBUILDER;QT_NO_EXCEPTIONS;QT_NO_DEBUG;QT_BOOTSTRAP_LIB;QT_VERSION_STR="5.12.4";QT_VERSION_MAJOR=5;QT_VERSION_MINOR=12;QT_VERSION_PATCH=4;QT_BOOTSTRAPPED;QT_NO_CAST_TO_ASCII;_DEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;_WINDOWS;QT_STATIC;QT_MOC;QT_NO_CAST_FROM_ASCII;QT_NO_CAST_FROM_BYTEARRAY;QT_NO_COMPRESS;QT_NO_FOREACH;QT_NO_NARROWING_CONVERSIONS_IN_CONNECT;QT_USE_QSTRINGBUILDER;QT_NO_EXCEPTIONS;QT_NO_DEBUG;QT_BOOTSTRAP_LIB;QT_VERSION_STR="5.12.4";QT_VERSION_MAJOR=5;QT_VERSION_MINOR=12;QT_VERSION_PATCH=4;QT_BOOTSTRAPPED;QT_LARGEFILE_SUPPORT=64;QT_NO_CAST_TO_ASCII;_DEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) Debug $(IntDir) $(OutDir)$(TargetName).pdb @@ -144,7 +144,7 @@ NotUsing MultiThreadedDebug Level3 - WIN32;_WINDOWS;QT_STATIC;QT_MOC;QT_NO_CAST_FROM_ASCII;QT_NO_CAST_FROM_BYTEARRAY;QT_NO_COMPRESS;QT_NO_FOREACH;QT_NO_NARROWING_CONVERSIONS_IN_CONNECT;QT_USE_QSTRINGBUILDER;QT_NO_EXCEPTIONS;QT_NO_DEBUG;QT_BOOTSTRAP_LIB;QT_VERSION_STR="5.12.4";QT_VERSION_MAJOR=5;QT_VERSION_MINOR=12;QT_VERSION_PATCH=4;QT_BOOTSTRAPPED;QT_NO_CAST_TO_ASCII;_DEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;_WINDOWS;QT_STATIC;QT_MOC;QT_NO_CAST_FROM_ASCII;QT_NO_CAST_FROM_BYTEARRAY;QT_NO_COMPRESS;QT_NO_FOREACH;QT_NO_NARROWING_CONVERSIONS_IN_CONNECT;QT_USE_QSTRINGBUILDER;QT_NO_EXCEPTIONS;QT_NO_DEBUG;QT_BOOTSTRAP_LIB;QT_VERSION_STR="5.12.4";QT_VERSION_MAJOR=5;QT_VERSION_MINOR=12;QT_VERSION_PATCH=4;QT_BOOTSTRAPPED;QT_LARGEFILE_SUPPORT=64;QT_NO_CAST_TO_ASCII;_DEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) Debug $(IntDir) $(OutDir)$(TargetName).pdb @@ -182,7 +182,7 @@ MultiThreaded Level3 None - WIN32;_WINDOWS;QT_STATIC;QT_MOC;QT_NO_CAST_FROM_ASCII;QT_NO_CAST_FROM_BYTEARRAY;QT_NO_COMPRESS;QT_NO_FOREACH;QT_NO_NARROWING_CONVERSIONS_IN_CONNECT;QT_USE_QSTRINGBUILDER;QT_NO_EXCEPTIONS;QT_NO_DEBUG;QT_BOOTSTRAP_LIB;QT_VERSION_STR="5.12.4";QT_VERSION_MAJOR=5;QT_VERSION_MINOR=12;QT_VERSION_PATCH=4;QT_BOOTSTRAPPED;QT_NO_CAST_TO_ASCII;NDEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;_WINDOWS;QT_STATIC;QT_MOC;QT_NO_CAST_FROM_ASCII;QT_NO_CAST_FROM_BYTEARRAY;QT_NO_COMPRESS;QT_NO_FOREACH;QT_NO_NARROWING_CONVERSIONS_IN_CONNECT;QT_USE_QSTRINGBUILDER;QT_NO_EXCEPTIONS;QT_NO_DEBUG;QT_BOOTSTRAP_LIB;QT_VERSION_STR="5.12.4";QT_VERSION_MAJOR=5;QT_VERSION_MINOR=12;QT_VERSION_PATCH=4;QT_BOOTSTRAPPED;QT_LARGEFILE_SUPPORT=64;QT_NO_CAST_TO_ASCII;NDEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) Release $(IntDir) $(OutDir)$(TargetName).pdb @@ -229,7 +229,7 @@ MultiThreaded Level3 None - WIN32;_WINDOWS;QT_STATIC;QT_MOC;QT_NO_CAST_FROM_ASCII;QT_NO_CAST_FROM_BYTEARRAY;QT_NO_COMPRESS;QT_NO_FOREACH;QT_NO_NARROWING_CONVERSIONS_IN_CONNECT;QT_USE_QSTRINGBUILDER;QT_NO_EXCEPTIONS;QT_NO_DEBUG;QT_BOOTSTRAP_LIB;QT_VERSION_STR="5.12.4";QT_VERSION_MAJOR=5;QT_VERSION_MINOR=12;QT_VERSION_PATCH=4;QT_BOOTSTRAPPED;QT_NO_CAST_TO_ASCII;NDEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;_WINDOWS;QT_STATIC;QT_MOC;QT_NO_CAST_FROM_ASCII;QT_NO_CAST_FROM_BYTEARRAY;QT_NO_COMPRESS;QT_NO_FOREACH;QT_NO_NARROWING_CONVERSIONS_IN_CONNECT;QT_USE_QSTRINGBUILDER;QT_NO_EXCEPTIONS;QT_NO_DEBUG;QT_BOOTSTRAP_LIB;QT_VERSION_STR="5.12.4";QT_VERSION_MAJOR=5;QT_VERSION_MINOR=12;QT_VERSION_PATCH=4;QT_BOOTSTRAPPED;QT_LARGEFILE_SUPPORT=64;QT_NO_CAST_TO_ASCII;NDEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) Release $(IntDir) $(OutDir)$(TargetName).pdb diff --git a/deps/build/vs/qt-multimedia.vcxproj b/deps/build/vs/qt-multimedia.vcxproj index a1eda9c16..f9f2f4956 100644 --- a/deps/build/vs/qt-multimedia.vcxproj +++ b/deps/build/vs/qt-multimedia.vcxproj @@ -639,7 +639,7 @@ NotUsing MultiThreadedDebug Level3 - WIN32;_WINDOWS;_UNICODE;QT_STATIC;QT_USE_QSTRINGBUILDER;_ENABLE_EXTENDED_ALIGNED_STORAGE;_DEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;_WINDOWS;_UNICODE;QT_STATIC;QT_LARGEFILE_SUPPORT=64;QT_USE_QSTRINGBUILDER;_ENABLE_EXTENDED_ALIGNED_STORAGE;_DEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) Debug $(IntDir) $(OutDir)$(TargetName).pdb @@ -681,7 +681,7 @@ qt-multimedia.cmd NotUsing MultiThreadedDebug Level3 - WIN32;_WINDOWS;_UNICODE;QT_STATIC;QT_USE_QSTRINGBUILDER;_ENABLE_EXTENDED_ALIGNED_STORAGE;_DEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;_WINDOWS;_UNICODE;QT_STATIC;QT_LARGEFILE_SUPPORT=64;QT_USE_QSTRINGBUILDER;_ENABLE_EXTENDED_ALIGNED_STORAGE;_DEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) Debug $(IntDir) $(OutDir)$(TargetName).pdb @@ -723,7 +723,7 @@ qt-multimedia.cmd MultiThreaded Level3 None - WIN32;_WINDOWS;_UNICODE;QT_STATIC;QT_USE_QSTRINGBUILDER;QT_NO_DEBUG;_ENABLE_EXTENDED_ALIGNED_STORAGE;NDEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;_WINDOWS;_UNICODE;QT_STATIC;QT_LARGEFILE_SUPPORT=64;QT_USE_QSTRINGBUILDER;QT_NO_DEBUG;_ENABLE_EXTENDED_ALIGNED_STORAGE;NDEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) Release $(IntDir) $(OutDir)$(TargetName).pdb @@ -774,7 +774,7 @@ qt-multimedia.cmd MultiThreaded Level3 None - WIN32;_WINDOWS;_UNICODE;QT_STATIC;QT_USE_QSTRINGBUILDER;QT_NO_DEBUG;_ENABLE_EXTENDED_ALIGNED_STORAGE;NDEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;_WINDOWS;_UNICODE;QT_STATIC;QT_LARGEFILE_SUPPORT=64;QT_USE_QSTRINGBUILDER;QT_NO_DEBUG;_ENABLE_EXTENDED_ALIGNED_STORAGE;NDEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) Release $(IntDir) $(OutDir)$(TargetName).pdb diff --git a/deps/build/vs/qt-multimediawidgets.vcxproj b/deps/build/vs/qt-multimediawidgets.vcxproj index d58505726..b931d1859 100644 --- a/deps/build/vs/qt-multimediawidgets.vcxproj +++ b/deps/build/vs/qt-multimediawidgets.vcxproj @@ -105,7 +105,7 @@ NotUsing MultiThreadedDebug Level3 - WIN32;_WINDOWS;_UNICODE;QT_STATIC;QT_USE_QSTRINGBUILDER;_ENABLE_EXTENDED_ALIGNED_STORAGE;_DEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;_WINDOWS;_UNICODE;QT_STATIC;QT_LARGEFILE_SUPPORT=64;QT_USE_QSTRINGBUILDER;_ENABLE_EXTENDED_ALIGNED_STORAGE;_DEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) Debug $(IntDir) $(OutDir)$(TargetName).pdb @@ -147,7 +147,7 @@ qt-multimediawidgets.cmd NotUsing MultiThreadedDebug Level3 - WIN32;_WINDOWS;_UNICODE;QT_STATIC;QT_USE_QSTRINGBUILDER;_ENABLE_EXTENDED_ALIGNED_STORAGE;_DEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;_WINDOWS;_UNICODE;QT_STATIC;QT_LARGEFILE_SUPPORT=64;QT_USE_QSTRINGBUILDER;_ENABLE_EXTENDED_ALIGNED_STORAGE;_DEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) Debug $(IntDir) $(OutDir)$(TargetName).pdb @@ -189,7 +189,7 @@ qt-multimediawidgets.cmd MultiThreaded Level3 None - WIN32;_WINDOWS;_UNICODE;QT_STATIC;QT_USE_QSTRINGBUILDER;QT_NO_DEBUG;_ENABLE_EXTENDED_ALIGNED_STORAGE;NDEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;_WINDOWS;_UNICODE;QT_STATIC;QT_LARGEFILE_SUPPORT=64;QT_USE_QSTRINGBUILDER;QT_NO_DEBUG;_ENABLE_EXTENDED_ALIGNED_STORAGE;NDEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) Release $(IntDir) $(OutDir)$(TargetName).pdb @@ -240,7 +240,7 @@ qt-multimediawidgets.cmd MultiThreaded Level3 None - WIN32;_WINDOWS;_UNICODE;QT_STATIC;QT_USE_QSTRINGBUILDER;QT_NO_DEBUG;_ENABLE_EXTENDED_ALIGNED_STORAGE;NDEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;_WINDOWS;_UNICODE;QT_STATIC;QT_LARGEFILE_SUPPORT=64;QT_USE_QSTRINGBUILDER;QT_NO_DEBUG;_ENABLE_EXTENDED_ALIGNED_STORAGE;NDEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) Release $(IntDir) $(OutDir)$(TargetName).pdb diff --git a/deps/build/vs/qt-network.vcxproj b/deps/build/vs/qt-network.vcxproj index e76860fd2..0e9b5b495 100644 --- a/deps/build/vs/qt-network.vcxproj +++ b/deps/build/vs/qt-network.vcxproj @@ -540,7 +540,7 @@ NotUsing MultiThreadedDebug Level3 - WIN32;_WINDOWS;_UNICODE;OPENSSL_STATIC;QT_STATIC;QT_LINKED_OPENSSL;QT_USE_QSTRINGBUILDER;_ENABLE_EXTENDED_ALIGNED_STORAGE;_DEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;_WINDOWS;_UNICODE;OPENSSL_STATIC;QT_STATIC;QT_LARGEFILE_SUPPORT=64;QT_LINKED_OPENSSL;QT_USE_QSTRINGBUILDER;_ENABLE_EXTENDED_ALIGNED_STORAGE;_DEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) Debug $(IntDir) $(OutDir)$(TargetName).pdb @@ -582,7 +582,7 @@ qt-network.cmd NotUsing MultiThreadedDebug Level3 - WIN32;_WINDOWS;_UNICODE;OPENSSL_STATIC;QT_STATIC;QT_LINKED_OPENSSL;QT_USE_QSTRINGBUILDER;_ENABLE_EXTENDED_ALIGNED_STORAGE;_DEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;_WINDOWS;_UNICODE;OPENSSL_STATIC;QT_STATIC;QT_LARGEFILE_SUPPORT=64;QT_LINKED_OPENSSL;QT_USE_QSTRINGBUILDER;_ENABLE_EXTENDED_ALIGNED_STORAGE;_DEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) Debug $(IntDir) $(OutDir)$(TargetName).pdb @@ -624,7 +624,7 @@ qt-network.cmd MultiThreaded Level3 None - WIN32;_WINDOWS;_UNICODE;OPENSSL_STATIC;QT_STATIC;QT_LINKED_OPENSSL;QT_USE_QSTRINGBUILDER;QT_NO_DEBUG;_ENABLE_EXTENDED_ALIGNED_STORAGE;NDEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;_WINDOWS;_UNICODE;OPENSSL_STATIC;QT_STATIC;QT_LARGEFILE_SUPPORT=64;QT_LINKED_OPENSSL;QT_USE_QSTRINGBUILDER;QT_NO_DEBUG;_ENABLE_EXTENDED_ALIGNED_STORAGE;NDEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) Release $(IntDir) $(OutDir)$(TargetName).pdb @@ -675,7 +675,7 @@ qt-network.cmd MultiThreaded Level3 None - WIN32;_WINDOWS;_UNICODE;OPENSSL_STATIC;QT_STATIC;QT_LINKED_OPENSSL;QT_USE_QSTRINGBUILDER;QT_NO_DEBUG;_ENABLE_EXTENDED_ALIGNED_STORAGE;NDEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;_WINDOWS;_UNICODE;OPENSSL_STATIC;QT_STATIC;QT_LARGEFILE_SUPPORT=64;QT_LINKED_OPENSSL;QT_USE_QSTRINGBUILDER;QT_NO_DEBUG;_ENABLE_EXTENDED_ALIGNED_STORAGE;NDEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) Release $(IntDir) $(OutDir)$(TargetName).pdb diff --git a/deps/build/vs/qt-opengl.vcxproj b/deps/build/vs/qt-opengl.vcxproj index 8008ba4ac..27fe54e88 100644 --- a/deps/build/vs/qt-opengl.vcxproj +++ b/deps/build/vs/qt-opengl.vcxproj @@ -115,7 +115,7 @@ NotUsing MultiThreadedDebug Level3 - WIN32;_WINDOWS;_UNICODE;QT_STATIC;QT_USE_QSTRINGBUILDER;_ENABLE_EXTENDED_ALIGNED_STORAGE;_DEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;_WINDOWS;_UNICODE;QT_STATIC;QT_LARGEFILE_SUPPORT=64;QT_USE_QSTRINGBUILDER;_ENABLE_EXTENDED_ALIGNED_STORAGE;_DEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) Debug $(IntDir) $(OutDir)$(TargetName).pdb @@ -153,7 +153,7 @@ NotUsing MultiThreadedDebug Level3 - WIN32;_WINDOWS;_UNICODE;QT_STATIC;QT_USE_QSTRINGBUILDER;_ENABLE_EXTENDED_ALIGNED_STORAGE;_DEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;_WINDOWS;_UNICODE;QT_STATIC;QT_LARGEFILE_SUPPORT=64;QT_USE_QSTRINGBUILDER;_ENABLE_EXTENDED_ALIGNED_STORAGE;_DEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) Debug $(IntDir) $(OutDir)$(TargetName).pdb @@ -191,7 +191,7 @@ MultiThreaded Level3 None - WIN32;_WINDOWS;_UNICODE;QT_STATIC;QT_USE_QSTRINGBUILDER;QT_NO_DEBUG;_ENABLE_EXTENDED_ALIGNED_STORAGE;NDEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;_WINDOWS;_UNICODE;QT_STATIC;QT_LARGEFILE_SUPPORT=64;QT_USE_QSTRINGBUILDER;QT_NO_DEBUG;_ENABLE_EXTENDED_ALIGNED_STORAGE;NDEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) Release $(IntDir) $(OutDir)$(TargetName).pdb @@ -238,7 +238,7 @@ MultiThreaded Level3 None - WIN32;_WINDOWS;_UNICODE;QT_STATIC;QT_USE_QSTRINGBUILDER;QT_NO_DEBUG;_ENABLE_EXTENDED_ALIGNED_STORAGE;NDEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;_WINDOWS;_UNICODE;QT_STATIC;QT_LARGEFILE_SUPPORT=64;QT_USE_QSTRINGBUILDER;QT_NO_DEBUG;_ENABLE_EXTENDED_ALIGNED_STORAGE;NDEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) Release $(IntDir) $(OutDir)$(TargetName).pdb diff --git a/deps/build/vs/qt-platform-windows.vcxproj b/deps/build/vs/qt-platform-windows.vcxproj index 5d195c00a..a2e6ea9b8 100644 --- a/deps/build/vs/qt-platform-windows.vcxproj +++ b/deps/build/vs/qt-platform-windows.vcxproj @@ -184,7 +184,7 @@ NotUsing MultiThreadedDebug Level3 - WIN32;_WINDOWS;_UNICODE;QT_STATIC;QT_STATICPLUGIN;QT_USE_QSTRINGBUILDER;QT_NO_FONTCONFIG;QT_QPA_DEFAULT_PLATFORM_NAME="windows";_ENABLE_EXTENDED_ALIGNED_STORAGE;_DEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;_WINDOWS;_UNICODE;QT_STATIC;QT_STATICPLUGIN;QT_LARGEFILE_SUPPORT=64;QT_USE_QSTRINGBUILDER;QT_NO_FONTCONFIG;QT_QPA_DEFAULT_PLATFORM_NAME="windows";_ENABLE_EXTENDED_ALIGNED_STORAGE;_DEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) Debug $(IntDir) $(OutDir)$(TargetName).pdb @@ -226,7 +226,7 @@ qt-platform-windows.cmd NotUsing MultiThreadedDebug Level3 - WIN32;_WINDOWS;_UNICODE;QT_STATIC;QT_STATICPLUGIN;QT_USE_QSTRINGBUILDER;QT_NO_FONTCONFIG;QT_QPA_DEFAULT_PLATFORM_NAME="windows";_ENABLE_EXTENDED_ALIGNED_STORAGE;_DEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;_WINDOWS;_UNICODE;QT_STATIC;QT_STATICPLUGIN;QT_LARGEFILE_SUPPORT=64;QT_USE_QSTRINGBUILDER;QT_NO_FONTCONFIG;QT_QPA_DEFAULT_PLATFORM_NAME="windows";_ENABLE_EXTENDED_ALIGNED_STORAGE;_DEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) Debug $(IntDir) $(OutDir)$(TargetName).pdb @@ -268,7 +268,7 @@ qt-platform-windows.cmd MultiThreaded Level3 None - WIN32;_WINDOWS;_UNICODE;QT_STATIC;QT_STATICPLUGIN;QT_USE_QSTRINGBUILDER;QT_NO_FONTCONFIG;QT_QPA_DEFAULT_PLATFORM_NAME="windows";QT_NO_DEBUG;_ENABLE_EXTENDED_ALIGNED_STORAGE;NDEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;_WINDOWS;_UNICODE;QT_STATIC;QT_STATICPLUGIN;QT_LARGEFILE_SUPPORT=64;QT_USE_QSTRINGBUILDER;QT_NO_FONTCONFIG;QT_QPA_DEFAULT_PLATFORM_NAME="windows";QT_NO_DEBUG;_ENABLE_EXTENDED_ALIGNED_STORAGE;NDEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) Release $(IntDir) $(OutDir)$(TargetName).pdb @@ -319,7 +319,7 @@ qt-platform-windows.cmd MultiThreaded Level3 None - WIN32;_WINDOWS;_UNICODE;QT_STATIC;QT_STATICPLUGIN;QT_USE_QSTRINGBUILDER;QT_NO_FONTCONFIG;QT_QPA_DEFAULT_PLATFORM_NAME="windows";QT_NO_DEBUG;_ENABLE_EXTENDED_ALIGNED_STORAGE;NDEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;_WINDOWS;_UNICODE;QT_STATIC;QT_STATICPLUGIN;QT_LARGEFILE_SUPPORT=64;QT_USE_QSTRINGBUILDER;QT_NO_FONTCONFIG;QT_QPA_DEFAULT_PLATFORM_NAME="windows";QT_NO_DEBUG;_ENABLE_EXTENDED_ALIGNED_STORAGE;NDEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) Release $(IntDir) $(OutDir)$(TargetName).pdb diff --git a/deps/build/vs/qt-printsupport.vcxproj b/deps/build/vs/qt-printsupport.vcxproj index 3a894019d..bcb3140e9 100644 --- a/deps/build/vs/qt-printsupport.vcxproj +++ b/deps/build/vs/qt-printsupport.vcxproj @@ -167,7 +167,7 @@ NotUsing MultiThreadedDebug Level3 - WIN32;_WINDOWS;_UNICODE;QT_STATIC;QT_USE_QSTRINGBUILDER;_ENABLE_EXTENDED_ALIGNED_STORAGE;_DEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;_WINDOWS;_UNICODE;QT_STATIC;QT_LARGEFILE_SUPPORT=64;QT_USE_QSTRINGBUILDER;_ENABLE_EXTENDED_ALIGNED_STORAGE;_DEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) Debug $(IntDir) $(OutDir)$(TargetName).pdb @@ -209,7 +209,7 @@ qt-printsupport.cmd NotUsing MultiThreadedDebug Level3 - WIN32;_WINDOWS;_UNICODE;QT_STATIC;QT_USE_QSTRINGBUILDER;_ENABLE_EXTENDED_ALIGNED_STORAGE;_DEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;_WINDOWS;_UNICODE;QT_STATIC;QT_LARGEFILE_SUPPORT=64;QT_USE_QSTRINGBUILDER;_ENABLE_EXTENDED_ALIGNED_STORAGE;_DEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) Debug $(IntDir) $(OutDir)$(TargetName).pdb @@ -251,7 +251,7 @@ qt-printsupport.cmd MultiThreaded Level3 None - WIN32;_WINDOWS;_UNICODE;QT_STATIC;QT_USE_QSTRINGBUILDER;QT_NO_DEBUG;_ENABLE_EXTENDED_ALIGNED_STORAGE;NDEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;_WINDOWS;_UNICODE;QT_STATIC;QT_LARGEFILE_SUPPORT=64;QT_USE_QSTRINGBUILDER;QT_NO_DEBUG;_ENABLE_EXTENDED_ALIGNED_STORAGE;NDEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) Release $(IntDir) $(OutDir)$(TargetName).pdb @@ -302,7 +302,7 @@ qt-printsupport.cmd MultiThreaded Level3 None - WIN32;_WINDOWS;_UNICODE;QT_STATIC;QT_USE_QSTRINGBUILDER;QT_NO_DEBUG;_ENABLE_EXTENDED_ALIGNED_STORAGE;NDEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;_WINDOWS;_UNICODE;QT_STATIC;QT_LARGEFILE_SUPPORT=64;QT_USE_QSTRINGBUILDER;QT_NO_DEBUG;_ENABLE_EXTENDED_ALIGNED_STORAGE;NDEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) Release $(IntDir) $(OutDir)$(TargetName).pdb diff --git a/deps/build/vs/qt-rcc.vcxproj b/deps/build/vs/qt-rcc.vcxproj index cf4ca6b96..5a7dd97ac 100644 --- a/deps/build/vs/qt-rcc.vcxproj +++ b/deps/build/vs/qt-rcc.vcxproj @@ -105,7 +105,7 @@ NotUsing MultiThreadedDebug Level3 - WIN32;_WINDOWS;QT_STATIC;QT_RCC;QT_NO_CAST_FROM_ASCII;QT_NO_CAST_FROM_BYTEARRAY;QT_NO_COMPRESS;QT_NO_FOREACH;QT_NO_NARROWING_CONVERSIONS_IN_CONNECT;QT_USE_QSTRINGBUILDER;QT_NO_EXCEPTIONS;QT_NO_DEBUG;QT_BOOTSTRAP_LIB;QT_VERSION_STR="5.12.4";QT_VERSION_MAJOR=5;QT_VERSION_MINOR=12;QT_VERSION_PATCH=4;QT_BOOTSTRAPPED;QT_NO_CAST_TO_ASCII;_DEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;_WINDOWS;QT_STATIC;QT_RCC;QT_NO_CAST_FROM_ASCII;QT_NO_CAST_FROM_BYTEARRAY;QT_NO_COMPRESS;QT_NO_FOREACH;QT_NO_NARROWING_CONVERSIONS_IN_CONNECT;QT_USE_QSTRINGBUILDER;QT_NO_EXCEPTIONS;QT_NO_DEBUG;QT_BOOTSTRAP_LIB;QT_VERSION_STR="5.12.4";QT_VERSION_MAJOR=5;QT_VERSION_MINOR=12;QT_VERSION_PATCH=4;QT_BOOTSTRAPPED;QT_LARGEFILE_SUPPORT=64;QT_NO_CAST_TO_ASCII;_DEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) Debug $(IntDir) $(OutDir)$(TargetName).pdb @@ -143,7 +143,7 @@ NotUsing MultiThreadedDebug Level3 - WIN32;_WINDOWS;QT_STATIC;QT_RCC;QT_NO_CAST_FROM_ASCII;QT_NO_CAST_FROM_BYTEARRAY;QT_NO_COMPRESS;QT_NO_FOREACH;QT_NO_NARROWING_CONVERSIONS_IN_CONNECT;QT_USE_QSTRINGBUILDER;QT_NO_EXCEPTIONS;QT_NO_DEBUG;QT_BOOTSTRAP_LIB;QT_VERSION_STR="5.12.4";QT_VERSION_MAJOR=5;QT_VERSION_MINOR=12;QT_VERSION_PATCH=4;QT_BOOTSTRAPPED;QT_NO_CAST_TO_ASCII;_DEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;_WINDOWS;QT_STATIC;QT_RCC;QT_NO_CAST_FROM_ASCII;QT_NO_CAST_FROM_BYTEARRAY;QT_NO_COMPRESS;QT_NO_FOREACH;QT_NO_NARROWING_CONVERSIONS_IN_CONNECT;QT_USE_QSTRINGBUILDER;QT_NO_EXCEPTIONS;QT_NO_DEBUG;QT_BOOTSTRAP_LIB;QT_VERSION_STR="5.12.4";QT_VERSION_MAJOR=5;QT_VERSION_MINOR=12;QT_VERSION_PATCH=4;QT_BOOTSTRAPPED;QT_LARGEFILE_SUPPORT=64;QT_NO_CAST_TO_ASCII;_DEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) Debug $(IntDir) $(OutDir)$(TargetName).pdb @@ -181,7 +181,7 @@ MultiThreaded Level3 None - WIN32;_WINDOWS;QT_STATIC;QT_RCC;QT_NO_CAST_FROM_ASCII;QT_NO_CAST_FROM_BYTEARRAY;QT_NO_COMPRESS;QT_NO_FOREACH;QT_NO_NARROWING_CONVERSIONS_IN_CONNECT;QT_USE_QSTRINGBUILDER;QT_NO_EXCEPTIONS;QT_NO_DEBUG;QT_BOOTSTRAP_LIB;QT_VERSION_STR="5.12.4";QT_VERSION_MAJOR=5;QT_VERSION_MINOR=12;QT_VERSION_PATCH=4;QT_BOOTSTRAPPED;QT_NO_CAST_TO_ASCII;NDEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;_WINDOWS;QT_STATIC;QT_RCC;QT_NO_CAST_FROM_ASCII;QT_NO_CAST_FROM_BYTEARRAY;QT_NO_COMPRESS;QT_NO_FOREACH;QT_NO_NARROWING_CONVERSIONS_IN_CONNECT;QT_USE_QSTRINGBUILDER;QT_NO_EXCEPTIONS;QT_NO_DEBUG;QT_BOOTSTRAP_LIB;QT_VERSION_STR="5.12.4";QT_VERSION_MAJOR=5;QT_VERSION_MINOR=12;QT_VERSION_PATCH=4;QT_BOOTSTRAPPED;QT_LARGEFILE_SUPPORT=64;QT_NO_CAST_TO_ASCII;NDEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) Release $(IntDir) $(OutDir)$(TargetName).pdb @@ -228,7 +228,7 @@ MultiThreaded Level3 None - WIN32;_WINDOWS;QT_STATIC;QT_RCC;QT_NO_CAST_FROM_ASCII;QT_NO_CAST_FROM_BYTEARRAY;QT_NO_COMPRESS;QT_NO_FOREACH;QT_NO_NARROWING_CONVERSIONS_IN_CONNECT;QT_USE_QSTRINGBUILDER;QT_NO_EXCEPTIONS;QT_NO_DEBUG;QT_BOOTSTRAP_LIB;QT_VERSION_STR="5.12.4";QT_VERSION_MAJOR=5;QT_VERSION_MINOR=12;QT_VERSION_PATCH=4;QT_BOOTSTRAPPED;QT_NO_CAST_TO_ASCII;NDEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;_WINDOWS;QT_STATIC;QT_RCC;QT_NO_CAST_FROM_ASCII;QT_NO_CAST_FROM_BYTEARRAY;QT_NO_COMPRESS;QT_NO_FOREACH;QT_NO_NARROWING_CONVERSIONS_IN_CONNECT;QT_USE_QSTRINGBUILDER;QT_NO_EXCEPTIONS;QT_NO_DEBUG;QT_BOOTSTRAP_LIB;QT_VERSION_STR="5.12.4";QT_VERSION_MAJOR=5;QT_VERSION_MINOR=12;QT_VERSION_PATCH=4;QT_BOOTSTRAPPED;QT_LARGEFILE_SUPPORT=64;QT_NO_CAST_TO_ASCII;NDEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) Release $(IntDir) $(OutDir)$(TargetName).pdb diff --git a/deps/build/vs/qt-serialport.vcxproj b/deps/build/vs/qt-serialport.vcxproj index 61f4f9939..227222d77 100644 --- a/deps/build/vs/qt-serialport.vcxproj +++ b/deps/build/vs/qt-serialport.vcxproj @@ -141,7 +141,7 @@ NotUsing MultiThreadedDebug Level3 - WIN32;_WINDOWS;_UNICODE;QT_STATIC;QT_USE_QSTRINGBUILDER;_ENABLE_EXTENDED_ALIGNED_STORAGE;_DEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;_WINDOWS;_UNICODE;QT_STATIC;QT_LARGEFILE_SUPPORT=64;QT_USE_QSTRINGBUILDER;_ENABLE_EXTENDED_ALIGNED_STORAGE;_DEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) Debug $(IntDir) $(OutDir)$(TargetName).pdb @@ -184,7 +184,7 @@ qt-serialport.cmd NotUsing MultiThreadedDebug Level3 - WIN32;_WINDOWS;_UNICODE;QT_STATIC;QT_USE_QSTRINGBUILDER;_ENABLE_EXTENDED_ALIGNED_STORAGE;_DEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;_WINDOWS;_UNICODE;QT_STATIC;QT_LARGEFILE_SUPPORT=64;QT_USE_QSTRINGBUILDER;_ENABLE_EXTENDED_ALIGNED_STORAGE;_DEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) Debug $(IntDir) $(OutDir)$(TargetName).pdb @@ -226,7 +226,7 @@ qt-serialport.cmd MultiThreaded Level3 None - WIN32;_WINDOWS;_UNICODE;QT_STATIC;QT_USE_QSTRINGBUILDER;QT_NO_DEBUG;_ENABLE_EXTENDED_ALIGNED_STORAGE;NDEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;_WINDOWS;_UNICODE;QT_STATIC;QT_LARGEFILE_SUPPORT=64;QT_USE_QSTRINGBUILDER;QT_NO_DEBUG;_ENABLE_EXTENDED_ALIGNED_STORAGE;NDEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) Release $(IntDir) $(OutDir)$(TargetName).pdb @@ -278,7 +278,7 @@ qt-serialport.cmd MultiThreaded Level3 None - WIN32;_WINDOWS;_UNICODE;QT_STATIC;QT_USE_QSTRINGBUILDER;QT_NO_DEBUG;_ENABLE_EXTENDED_ALIGNED_STORAGE;NDEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;_WINDOWS;_UNICODE;QT_STATIC;QT_LARGEFILE_SUPPORT=64;QT_USE_QSTRINGBUILDER;QT_NO_DEBUG;_ENABLE_EXTENDED_ALIGNED_STORAGE;NDEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) Release $(IntDir) $(OutDir)$(TargetName).pdb diff --git a/deps/build/vs/qt-uic.vcxproj b/deps/build/vs/qt-uic.vcxproj index 02a81f703..68cd55c0b 100644 --- a/deps/build/vs/qt-uic.vcxproj +++ b/deps/build/vs/qt-uic.vcxproj @@ -127,7 +127,7 @@ NotUsing MultiThreadedDebug Level3 - WIN32;_WINDOWS;QT_STATIC;QT_UIC;QT_NO_CAST_FROM_ASCII;QT_NO_CAST_FROM_BYTEARRAY;QT_NO_COMPRESS;QT_NO_FOREACH;QT_NO_NARROWING_CONVERSIONS_IN_CONNECT;QT_USE_QSTRINGBUILDER;QT_NO_EXCEPTIONS;QT_NO_DEBUG;QT_BOOTSTRAP_LIB;QT_VERSION_STR="5.12.4";QT_VERSION_MAJOR=5;QT_VERSION_MINOR=12;QT_VERSION_PATCH=4;QT_BOOTSTRAPPED;QT_NO_CAST_TO_ASCII;_DEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;_WINDOWS;QT_STATIC;QT_UIC;QT_NO_CAST_FROM_ASCII;QT_NO_CAST_FROM_BYTEARRAY;QT_NO_COMPRESS;QT_NO_FOREACH;QT_NO_NARROWING_CONVERSIONS_IN_CONNECT;QT_USE_QSTRINGBUILDER;QT_NO_EXCEPTIONS;QT_NO_DEBUG;QT_BOOTSTRAP_LIB;QT_VERSION_STR="5.12.4";QT_VERSION_MAJOR=5;QT_VERSION_MINOR=12;QT_VERSION_PATCH=4;QT_BOOTSTRAPPED;QT_LARGEFILE_SUPPORT=64;QT_NO_CAST_TO_ASCII;_DEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) Debug $(IntDir) $(OutDir)$(TargetName).pdb @@ -165,7 +165,7 @@ NotUsing MultiThreadedDebug Level3 - WIN32;_WINDOWS;QT_STATIC;QT_UIC;QT_NO_CAST_FROM_ASCII;QT_NO_CAST_FROM_BYTEARRAY;QT_NO_COMPRESS;QT_NO_FOREACH;QT_NO_NARROWING_CONVERSIONS_IN_CONNECT;QT_USE_QSTRINGBUILDER;QT_NO_EXCEPTIONS;QT_NO_DEBUG;QT_BOOTSTRAP_LIB;QT_VERSION_STR="5.12.4";QT_VERSION_MAJOR=5;QT_VERSION_MINOR=12;QT_VERSION_PATCH=4;QT_BOOTSTRAPPED;QT_NO_CAST_TO_ASCII;_DEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;_WINDOWS;QT_STATIC;QT_UIC;QT_NO_CAST_FROM_ASCII;QT_NO_CAST_FROM_BYTEARRAY;QT_NO_COMPRESS;QT_NO_FOREACH;QT_NO_NARROWING_CONVERSIONS_IN_CONNECT;QT_USE_QSTRINGBUILDER;QT_NO_EXCEPTIONS;QT_NO_DEBUG;QT_BOOTSTRAP_LIB;QT_VERSION_STR="5.12.4";QT_VERSION_MAJOR=5;QT_VERSION_MINOR=12;QT_VERSION_PATCH=4;QT_BOOTSTRAPPED;QT_LARGEFILE_SUPPORT=64;QT_NO_CAST_TO_ASCII;_DEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) Debug $(IntDir) $(OutDir)$(TargetName).pdb @@ -203,7 +203,7 @@ MultiThreaded Level3 None - WIN32;_WINDOWS;QT_STATIC;QT_UIC;QT_NO_CAST_FROM_ASCII;QT_NO_CAST_FROM_BYTEARRAY;QT_NO_COMPRESS;QT_NO_FOREACH;QT_NO_NARROWING_CONVERSIONS_IN_CONNECT;QT_USE_QSTRINGBUILDER;QT_NO_EXCEPTIONS;QT_NO_DEBUG;QT_BOOTSTRAP_LIB;QT_VERSION_STR="5.12.4";QT_VERSION_MAJOR=5;QT_VERSION_MINOR=12;QT_VERSION_PATCH=4;QT_BOOTSTRAPPED;QT_NO_CAST_TO_ASCII;NDEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;_WINDOWS;QT_STATIC;QT_UIC;QT_NO_CAST_FROM_ASCII;QT_NO_CAST_FROM_BYTEARRAY;QT_NO_COMPRESS;QT_NO_FOREACH;QT_NO_NARROWING_CONVERSIONS_IN_CONNECT;QT_USE_QSTRINGBUILDER;QT_NO_EXCEPTIONS;QT_NO_DEBUG;QT_BOOTSTRAP_LIB;QT_VERSION_STR="5.12.4";QT_VERSION_MAJOR=5;QT_VERSION_MINOR=12;QT_VERSION_PATCH=4;QT_BOOTSTRAPPED;QT_LARGEFILE_SUPPORT=64;QT_NO_CAST_TO_ASCII;NDEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) Release $(IntDir) $(OutDir)$(TargetName).pdb @@ -250,7 +250,7 @@ MultiThreaded Level3 None - WIN32;_WINDOWS;QT_STATIC;QT_UIC;QT_NO_CAST_FROM_ASCII;QT_NO_CAST_FROM_BYTEARRAY;QT_NO_COMPRESS;QT_NO_FOREACH;QT_NO_NARROWING_CONVERSIONS_IN_CONNECT;QT_USE_QSTRINGBUILDER;QT_NO_EXCEPTIONS;QT_NO_DEBUG;QT_BOOTSTRAP_LIB;QT_VERSION_STR="5.12.4";QT_VERSION_MAJOR=5;QT_VERSION_MINOR=12;QT_VERSION_PATCH=4;QT_BOOTSTRAPPED;QT_NO_CAST_TO_ASCII;NDEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;_WINDOWS;QT_STATIC;QT_UIC;QT_NO_CAST_FROM_ASCII;QT_NO_CAST_FROM_BYTEARRAY;QT_NO_COMPRESS;QT_NO_FOREACH;QT_NO_NARROWING_CONVERSIONS_IN_CONNECT;QT_USE_QSTRINGBUILDER;QT_NO_EXCEPTIONS;QT_NO_DEBUG;QT_BOOTSTRAP_LIB;QT_VERSION_STR="5.12.4";QT_VERSION_MAJOR=5;QT_VERSION_MINOR=12;QT_VERSION_PATCH=4;QT_BOOTSTRAPPED;QT_LARGEFILE_SUPPORT=64;QT_NO_CAST_TO_ASCII;NDEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) Release $(IntDir) $(OutDir)$(TargetName).pdb diff --git a/deps/build/vs/qt-widgets.vcxproj b/deps/build/vs/qt-widgets.vcxproj index e786bd0cd..a40dec2da 100644 --- a/deps/build/vs/qt-widgets.vcxproj +++ b/deps/build/vs/qt-widgets.vcxproj @@ -1195,7 +1195,7 @@ NotUsing MultiThreadedDebug Level3 - WIN32;_WINDOWS;_UNICODE;QT_STATIC;QT_USE_QSTRINGBUILDER;QT_NO_EXCEPTIONS;_ENABLE_EXTENDED_ALIGNED_STORAGE;_DEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;_WINDOWS;_UNICODE;QT_STATIC;QT_LARGEFILE_SUPPORT=64;QT_USE_QSTRINGBUILDER;QT_NO_EXCEPTIONS;_ENABLE_EXTENDED_ALIGNED_STORAGE;_DEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) Debug $(IntDir) $(OutDir)$(TargetName).pdb @@ -1237,7 +1237,7 @@ qt-widgets.cmd NotUsing MultiThreadedDebug Level3 - WIN32;_WINDOWS;_UNICODE;QT_STATIC;QT_USE_QSTRINGBUILDER;QT_NO_EXCEPTIONS;_ENABLE_EXTENDED_ALIGNED_STORAGE;_DEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;_WINDOWS;_UNICODE;QT_STATIC;QT_LARGEFILE_SUPPORT=64;QT_USE_QSTRINGBUILDER;QT_NO_EXCEPTIONS;_ENABLE_EXTENDED_ALIGNED_STORAGE;_DEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) Debug $(IntDir) $(OutDir)$(TargetName).pdb @@ -1279,7 +1279,7 @@ qt-widgets.cmd MultiThreaded Level3 None - WIN32;_WINDOWS;_UNICODE;QT_STATIC;QT_USE_QSTRINGBUILDER;QT_NO_EXCEPTIONS;QT_NO_DEBUG;_ENABLE_EXTENDED_ALIGNED_STORAGE;NDEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;_WINDOWS;_UNICODE;QT_STATIC;QT_LARGEFILE_SUPPORT=64;QT_USE_QSTRINGBUILDER;QT_NO_EXCEPTIONS;QT_NO_DEBUG;_ENABLE_EXTENDED_ALIGNED_STORAGE;NDEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) Release $(IntDir) $(OutDir)$(TargetName).pdb @@ -1330,7 +1330,7 @@ qt-widgets.cmd MultiThreaded Level3 None - WIN32;_WINDOWS;_UNICODE;QT_STATIC;QT_USE_QSTRINGBUILDER;QT_NO_DEBUG;QT_NO_EXCEPTIONS;_ENABLE_EXTENDED_ALIGNED_STORAGE;NDEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;_WINDOWS;_UNICODE;QT_STATIC;QT_LARGEFILE_SUPPORT=64;QT_USE_QSTRINGBUILDER;QT_NO_DEBUG;QT_NO_EXCEPTIONS;_ENABLE_EXTENDED_ALIGNED_STORAGE;NDEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) Release $(IntDir) $(OutDir)$(TargetName).pdb diff --git a/deps/build/vs/qt-xml.vcxproj b/deps/build/vs/qt-xml.vcxproj index fad5a672a..bd38de94a 100644 --- a/deps/build/vs/qt-xml.vcxproj +++ b/deps/build/vs/qt-xml.vcxproj @@ -106,7 +106,7 @@ NotUsing MultiThreadedDebug Level3 - WIN32;_WINDOWS;_UNICODE;QT_STATIC;QT_USE_QSTRINGBUILDER;_ENABLE_EXTENDED_ALIGNED_STORAGE;_DEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;_WINDOWS;_UNICODE;QT_STATIC;QT_LARGEFILE_SUPPORT=64;QT_USE_QSTRINGBUILDER;_ENABLE_EXTENDED_ALIGNED_STORAGE;_DEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) Debug $(IntDir) $(OutDir)$(TargetName).pdb @@ -144,7 +144,7 @@ NotUsing MultiThreadedDebug Level3 - WIN32;_WINDOWS;_UNICODE;QT_STATIC;QT_USE_QSTRINGBUILDER;_ENABLE_EXTENDED_ALIGNED_STORAGE;_DEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;_WINDOWS;_UNICODE;QT_STATIC;QT_LARGEFILE_SUPPORT=64;QT_USE_QSTRINGBUILDER;_ENABLE_EXTENDED_ALIGNED_STORAGE;_DEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) Debug $(IntDir) $(OutDir)$(TargetName).pdb @@ -182,7 +182,7 @@ MultiThreaded Level3 None - WIN32;_WINDOWS;_UNICODE;QT_STATIC;QT_USE_QSTRINGBUILDER;QT_NO_DEBUG;_ENABLE_EXTENDED_ALIGNED_STORAGE;NDEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;_WINDOWS;_UNICODE;QT_STATIC;QT_LARGEFILE_SUPPORT=64;QT_USE_QSTRINGBUILDER;QT_NO_DEBUG;_ENABLE_EXTENDED_ALIGNED_STORAGE;NDEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) Release $(IntDir) $(OutDir)$(TargetName).pdb @@ -229,7 +229,7 @@ MultiThreaded Level3 None - WIN32;_WINDOWS;_UNICODE;QT_STATIC;QT_USE_QSTRINGBUILDER;QT_NO_DEBUG;_ENABLE_EXTENDED_ALIGNED_STORAGE;NDEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;_WINDOWS;_UNICODE;QT_STATIC;QT_LARGEFILE_SUPPORT=64;QT_USE_QSTRINGBUILDER;QT_NO_DEBUG;_ENABLE_EXTENDED_ALIGNED_STORAGE;NDEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) Release $(IntDir) $(OutDir)$(TargetName).pdb diff --git a/deps/include/qt/QtAndroidExtras/QAndroidActivityResultReceiver b/deps/include/qt/QtAndroidExtras/QAndroidActivityResultReceiver new file mode 100644 index 000000000..b4143b4f5 --- /dev/null +++ b/deps/include/qt/QtAndroidExtras/QAndroidActivityResultReceiver @@ -0,0 +1 @@ +#include "qandroidactivityresultreceiver.h" diff --git a/deps/include/qt/QtAndroidExtras/QAndroidBinder b/deps/include/qt/QtAndroidExtras/QAndroidBinder new file mode 100644 index 000000000..96ccbc919 --- /dev/null +++ b/deps/include/qt/QtAndroidExtras/QAndroidBinder @@ -0,0 +1 @@ +#include "qandroidbinder.h" diff --git a/deps/include/qt/QtAndroidExtras/QAndroidIntent b/deps/include/qt/QtAndroidExtras/QAndroidIntent new file mode 100644 index 000000000..d842dcb95 --- /dev/null +++ b/deps/include/qt/QtAndroidExtras/QAndroidIntent @@ -0,0 +1 @@ +#include "qandroidintent.h" diff --git a/deps/include/qt/QtAndroidExtras/QAndroidJniEnvironment b/deps/include/qt/QtAndroidExtras/QAndroidJniEnvironment new file mode 100644 index 000000000..abbad28e5 --- /dev/null +++ b/deps/include/qt/QtAndroidExtras/QAndroidJniEnvironment @@ -0,0 +1 @@ +#include "qandroidjnienvironment.h" diff --git a/deps/include/qt/QtAndroidExtras/QAndroidJniExceptionCleaner b/deps/include/qt/QtAndroidExtras/QAndroidJniExceptionCleaner new file mode 100644 index 000000000..abbad28e5 --- /dev/null +++ b/deps/include/qt/QtAndroidExtras/QAndroidJniExceptionCleaner @@ -0,0 +1 @@ +#include "qandroidjnienvironment.h" diff --git a/deps/include/qt/QtAndroidExtras/QAndroidJniObject b/deps/include/qt/QtAndroidExtras/QAndroidJniObject new file mode 100644 index 000000000..b96916d3f --- /dev/null +++ b/deps/include/qt/QtAndroidExtras/QAndroidJniObject @@ -0,0 +1 @@ +#include "qandroidjniobject.h" diff --git a/deps/include/qt/QtAndroidExtras/QAndroidParcel b/deps/include/qt/QtAndroidExtras/QAndroidParcel new file mode 100644 index 000000000..fdd257dff --- /dev/null +++ b/deps/include/qt/QtAndroidExtras/QAndroidParcel @@ -0,0 +1 @@ +#include "qandroidparcel.h" diff --git a/deps/include/qt/QtAndroidExtras/QAndroidService b/deps/include/qt/QtAndroidExtras/QAndroidService new file mode 100644 index 000000000..e8c5242be --- /dev/null +++ b/deps/include/qt/QtAndroidExtras/QAndroidService @@ -0,0 +1 @@ +#include "qandroidservice.h" diff --git a/deps/include/qt/QtAndroidExtras/QAndroidServiceConnection b/deps/include/qt/QtAndroidExtras/QAndroidServiceConnection new file mode 100644 index 000000000..327fc5183 --- /dev/null +++ b/deps/include/qt/QtAndroidExtras/QAndroidServiceConnection @@ -0,0 +1 @@ +#include "qandroidserviceconnection.h" diff --git a/deps/include/qt/QtAndroidExtras/QtAndroid b/deps/include/qt/QtAndroidExtras/QtAndroid new file mode 100644 index 000000000..f75d66e00 --- /dev/null +++ b/deps/include/qt/QtAndroidExtras/QtAndroid @@ -0,0 +1 @@ +#include "qandroidfunctions.h" diff --git a/deps/include/qt/QtAndroidExtras/QtAndroidExtras b/deps/include/qt/QtAndroidExtras/QtAndroidExtras new file mode 100644 index 000000000..84d3a26a7 --- /dev/null +++ b/deps/include/qt/QtAndroidExtras/QtAndroidExtras @@ -0,0 +1,15 @@ +#ifndef QT_QTANDROIDEXTRAS_MODULE_H +#define QT_QTANDROIDEXTRAS_MODULE_H +#include +#include "qandroidextrasglobal.h" +#include "qandroidactivityresultreceiver.h" +#include "qandroidbinder.h" +#include "qandroidfunctions.h" +#include "qandroidintent.h" +#include "qandroidjnienvironment.h" +#include "qandroidjniobject.h" +#include "qandroidparcel.h" +#include "qandroidservice.h" +#include "qandroidserviceconnection.h" +#include "qtandroidextrasversion.h" +#endif diff --git a/deps/include/qt/QtAndroidExtras/QtAndroidExtrasDepends b/deps/include/qt/QtAndroidExtras/QtAndroidExtrasDepends new file mode 100644 index 000000000..e8d000a9c --- /dev/null +++ b/deps/include/qt/QtAndroidExtras/QtAndroidExtrasDepends @@ -0,0 +1,4 @@ +/* This file was generated by qmake with the info from /src/androidextras/androidextras.pro. */ +#ifdef __cplusplus /* create empty PCH in C mode */ +#include +#endif diff --git a/deps/include/qt/QtAndroidExtras/QtAndroidExtrasVersion b/deps/include/qt/QtAndroidExtras/QtAndroidExtrasVersion new file mode 100644 index 000000000..b7aa4715f --- /dev/null +++ b/deps/include/qt/QtAndroidExtras/QtAndroidExtrasVersion @@ -0,0 +1 @@ +#include "qtandroidextrasversion.h" diff --git a/deps/include/qt/QtAndroidExtras/private/qandroidactivityresultreceiver_p.h b/deps/include/qt/QtAndroidExtras/private/qandroidactivityresultreceiver_p.h new file mode 100644 index 000000000..21553d3de --- /dev/null +++ b/deps/include/qt/QtAndroidExtras/private/qandroidactivityresultreceiver_p.h @@ -0,0 +1,78 @@ +/**************************************************************************** +** +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or (at your option) the GNU General +** Public license version 3 or any later version approved by the KDE Free +** Qt Foundation. The licenses are as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-2.0.html and +** https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef QANDROIDACTIVITYRESULTRECEIVER_P_H +#define QANDROIDACTIVITYRESULTRECEIVER_P_H + +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + +#include +#include +#include "qandroidactivityresultreceiver.h" + +QT_BEGIN_NAMESPACE + +class QAndroidActivityResultReceiverPrivate: public QtAndroidPrivate::ActivityResultListener +{ +public: + QAndroidActivityResultReceiver *q; + mutable QHash localToGlobalRequestCode; + mutable QHash globalToLocalRequestCode; + + int globalRequestCode(int localRequestCode) const; + bool handleActivityResult(jint requestCode, jint resultCode, jobject data); + + static QAndroidActivityResultReceiverPrivate *get(QAndroidActivityResultReceiver *publicObject) + { + return publicObject->d.data(); + } +}; + +QT_END_NAMESPACE + +#endif // QANDROIDACTIVITYRESULTRECEIVER_P_H diff --git a/deps/include/qt/QtAndroidExtras/private/qandroidbinder_p.h b/deps/include/qt/QtAndroidExtras/private/qandroidbinder_p.h new file mode 100644 index 000000000..b132b330d --- /dev/null +++ b/deps/include/qt/QtAndroidExtras/private/qandroidbinder_p.h @@ -0,0 +1,77 @@ +/**************************************************************************** +** +** Copyright (C) 2017 BogDan Vatra +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or (at your option) the GNU General +** Public license version 3 or any later version approved by the KDE Free +** Qt Foundation. The licenses are as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-2.0.html and +** https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef QANDROIDBINDER_P_H +#define QANDROIDBINDER_P_H + +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + +#include "qandroidjniobject.h" + +#include +#include + +QT_BEGIN_NAMESPACE +class QAndroidBinder; +class QAndroidBinderPrivate +{ +public: + explicit QAndroidBinderPrivate(QAndroidBinder *binder); + explicit QAndroidBinderPrivate(const QAndroidJniObject &binder); + void setDeleteListener(const std::function &func) { m_deleteListener = func; } + ~QAndroidBinderPrivate(); + +private: + QAndroidJniObject handle; + std::function m_deleteListener; + bool m_isQtAndroidBinder; + friend class QAndroidBinder; +}; +QT_END_NAMESPACE + +#endif // QANDROIDBINDER_P_H diff --git a/deps/include/qt/QtAndroidExtras/private/qandroidparcel_p.h b/deps/include/qt/QtAndroidExtras/private/qandroidparcel_p.h new file mode 100644 index 000000000..0be55f8db --- /dev/null +++ b/deps/include/qt/QtAndroidExtras/private/qandroidparcel_p.h @@ -0,0 +1,78 @@ +/**************************************************************************** +** +** Copyright (C) 2017 BogDan Vatra +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or (at your option) the GNU General +** Public license version 3 or any later version approved by the KDE Free +** Qt Foundation. The licenses are as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-2.0.html and +** https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef QANDROIDPARCEL_P_H +#define QANDROIDPARCEL_P_H + +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + +#include +QT_BEGIN_NAMESPACE +class QAndroidBinder; +class QAndroidParcelPrivate +{ +public: + QAndroidParcelPrivate(); + explicit QAndroidParcelPrivate(const QAndroidJniObject& parcel); + + void writeData(const QByteArray &data) const; + void writeBinder(const QAndroidBinder &binder) const; + void writeFileDescriptor(int fd) const; + + QByteArray readData() const; + int readFileDescriptor() const; + QAndroidBinder readBinder() const; + +private: + friend class QAndroidBinder; + friend class QAndroidParcel; + QAndroidJniObject handle; +}; +QT_END_NAMESPACE + +#endif // QANDROIDPARCEL_P_H diff --git a/deps/include/qt/QtAndroidExtras/qandroidactivityresultreceiver.h b/deps/include/qt/QtAndroidExtras/qandroidactivityresultreceiver.h new file mode 100644 index 000000000..b71f8769d --- /dev/null +++ b/deps/include/qt/QtAndroidExtras/qandroidactivityresultreceiver.h @@ -0,0 +1,65 @@ +/**************************************************************************** +** +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or (at your option) the GNU General +** Public license version 3 or any later version approved by the KDE Free +** Qt Foundation. The licenses are as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-2.0.html and +** https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef QANDROIDACTIVITYRESULTRECEIVER_H +#define QANDROIDACTIVITYRESULTRECEIVER_H + +#include +#include + +QT_BEGIN_NAMESPACE + +class QAndroidActivityResultReceiverPrivate; +class Q_ANDROIDEXTRAS_EXPORT QAndroidActivityResultReceiver +{ +public: + QAndroidActivityResultReceiver(); + virtual ~QAndroidActivityResultReceiver(); + virtual void handleActivityResult(int receiverRequestCode, int resultCode, const QAndroidJniObject &data) = 0; + +private: + friend class QAndroidActivityResultReceiverPrivate; + Q_DISABLE_COPY(QAndroidActivityResultReceiver) + + QScopedPointer d; +}; + +QT_END_NAMESPACE + +#endif // QANDROIDACTIVITYRESULTRECEIVER_H diff --git a/deps/include/qt/QtAndroidExtras/qandroidbinder.h b/deps/include/qt/QtAndroidExtras/qandroidbinder.h new file mode 100644 index 000000000..1e73e7dd5 --- /dev/null +++ b/deps/include/qt/QtAndroidExtras/qandroidbinder.h @@ -0,0 +1,80 @@ +/**************************************************************************** +** +** Copyright (C) 2017 BogDan Vatra +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or (at your option) the GNU General +** Public license version 3 or any later version approved by the KDE Free +** Qt Foundation. The licenses are as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-2.0.html and +** https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef QANDROIDBINDER_H +#define QANDROIDBINDER_H + +#include +#include + +#include + +QT_BEGIN_NAMESPACE +class QAndroidBinderPrivate; +class QAndroidParcel; +class QAndroidJniObject; + +class Q_ANDROIDEXTRAS_EXPORT QAndroidBinder +{ +public: + enum class CallType { + Normal = 0, + OneWay = 1 + }; + +public: + explicit QAndroidBinder(); + QAndroidBinder(const QAndroidJniObject &binder); + + virtual ~QAndroidBinder(); + + virtual bool onTransact(int code, const QAndroidParcel &data, const QAndroidParcel &reply, CallType flags); + bool transact(int code, const QAndroidParcel &data, QAndroidParcel *reply = nullptr, CallType flags = CallType::Normal) const; + + QAndroidJniObject handle() const; + +private: + friend class QAndroidBinderPrivate; + friend class QAndroidParcelPrivate; + friend class QAndroidServicePrivate; + QSharedPointer d; +}; +QT_END_NAMESPACE + +#endif // QANDROIDBINDER_H diff --git a/deps/include/qt/QtAndroidExtras/qandroidextrasglobal.h b/deps/include/qt/QtAndroidExtras/qandroidextrasglobal.h new file mode 100644 index 000000000..90a78ad6f --- /dev/null +++ b/deps/include/qt/QtAndroidExtras/qandroidextrasglobal.h @@ -0,0 +1,59 @@ +/**************************************************************************** +** +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or (at your option) the GNU General +** Public license version 3 or any later version approved by the KDE Free +** Qt Foundation. The licenses are as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-2.0.html and +** https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef QTANDROIDEXTRASGLOBAL_H +#define QTANDROIDEXTRASGLOBAL_H + +#include + +QT_BEGIN_NAMESPACE + +#ifndef QT_STATIC +# if defined(QT_BUILD_ANDROIDEXTRAS_LIB) +# define Q_ANDROIDEXTRAS_EXPORT Q_DECL_EXPORT +# else +# define Q_ANDROIDEXTRAS_EXPORT Q_DECL_IMPORT +# endif +#else +# define Q_ANDROIDEXTRAS_EXPORT +#endif + +QT_END_NAMESPACE + +#endif // QTANDROIDEXTRASGLOBAL_H diff --git a/deps/include/qt/QtAndroidExtras/qandroidfunctions.h b/deps/include/qt/QtAndroidExtras/qandroidfunctions.h new file mode 100644 index 000000000..8dba43568 --- /dev/null +++ b/deps/include/qt/QtAndroidExtras/qandroidfunctions.h @@ -0,0 +1,112 @@ +/**************************************************************************** +** +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or (at your option) the GNU General +** Public license version 3 or any later version approved by the KDE Free +** Qt Foundation. The licenses are as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-2.0.html and +** https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef QANDROIDFUNCTIONS_H +#define QANDROIDFUNCTIONS_H + +#if 0 +#pragma qt_class(QtAndroid) +#endif + +#include +#include + +#include + +QT_BEGIN_NAMESPACE + +class QAndroidActivityResultReceiver; +class QAndroidServiceConnection; +class QAndroidIntent; + +namespace QtAndroid +{ + Q_ANDROIDEXTRAS_EXPORT QAndroidJniObject androidActivity(); + Q_ANDROIDEXTRAS_EXPORT QAndroidJniObject androidService(); + Q_ANDROIDEXTRAS_EXPORT QAndroidJniObject androidContext(); + Q_ANDROIDEXTRAS_EXPORT int androidSdkVersion(); + + Q_ANDROIDEXTRAS_EXPORT void startIntentSender(const QAndroidJniObject &intentSender, + int receiverRequestCode, + QAndroidActivityResultReceiver *resultReceiver = nullptr); + Q_ANDROIDEXTRAS_EXPORT void startActivity(const QAndroidJniObject &intent, + int receiverRequestCode, + QAndroidActivityResultReceiver *resultReceiver = nullptr); + + enum class BindFlag { + None = 0x00000000, + AutoCreate = 0x00000001, + DebugUnbind = 0x00000002, + NotForeground = 0x00000004, + AboveClient = 0x00000008, + AllowOomManagement = 0x00000010, + WaivePriority = 0x00000020, + Important = 0x00000040, + AdjustWithActivity = 0x00000080, + ExternalService = -2147483648 // 0x80000000 + + }; + Q_DECLARE_FLAGS(BindFlags, BindFlag) + + Q_ANDROIDEXTRAS_EXPORT bool bindService(const QAndroidIntent &serviceIntent, + const QAndroidServiceConnection &serviceConnection, + BindFlags flags = BindFlag::None); + + typedef std::function Runnable; + Q_ANDROIDEXTRAS_EXPORT void runOnAndroidThread(const Runnable &runnable); + Q_ANDROIDEXTRAS_EXPORT void runOnAndroidThreadSync(const Runnable &runnable, int timeoutMs = INT_MAX); + + Q_ANDROIDEXTRAS_EXPORT void hideSplashScreen(); // ### Qt6: merge with next overload + Q_ANDROIDEXTRAS_EXPORT void hideSplashScreen(int duration); + + enum class PermissionResult { + Granted, + Denied + }; + typedef QHash PermissionResultMap; + typedef std::function PermissionResultCallback; + Q_ANDROIDEXTRAS_EXPORT void requestPermissions(const QStringList &permissions, const PermissionResultCallback &callbackFunc); + Q_ANDROIDEXTRAS_EXPORT PermissionResultMap requestPermissionsSync(const QStringList &permissions, int timeoutMs = INT_MAX); + Q_ANDROIDEXTRAS_EXPORT PermissionResult checkPermission(const QString &permission); + Q_ANDROIDEXTRAS_EXPORT bool shouldShowRequestPermissionRationale(const QString &permission); +} + +QT_END_NAMESPACE + +#endif // QANDROIDFUNCTIONS_H diff --git a/deps/include/qt/QtAndroidExtras/qandroidintent.h b/deps/include/qt/QtAndroidExtras/qandroidintent.h new file mode 100644 index 000000000..3da569241 --- /dev/null +++ b/deps/include/qt/QtAndroidExtras/qandroidintent.h @@ -0,0 +1,70 @@ +/**************************************************************************** +** +** Copyright (C) 2017 BogDan Vatra +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or (at your option) the GNU General +** Public license version 3 or any later version approved by the KDE Free +** Qt Foundation. The licenses are as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-2.0.html and +** https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef QANDROIDINTENT_H +#define QANDROIDINTENT_H + +#include +#include + +QT_BEGIN_NAMESPACE +class QAndroidJniObject; +class Q_ANDROIDEXTRAS_EXPORT QAndroidIntent +{ +public: + QAndroidIntent(); + virtual ~QAndroidIntent(); + explicit QAndroidIntent(const QAndroidJniObject &intent); + explicit QAndroidIntent(const QString &action); + explicit QAndroidIntent(const QAndroidJniObject &packageContext, const char *className); + + void putExtra(const QString &key, const QByteArray &data); + QByteArray extraBytes(const QString &key); + + void putExtra(const QString &key, const QVariant &value); + QVariant extraVariant(const QString &key); + + QAndroidJniObject handle() const; + +private: + QAndroidJniObject m_handle; +}; +QT_END_NAMESPACE + +#endif // QANDROIDINTENT_H diff --git a/deps/include/qt/QtAndroidExtras/qandroidjnienvironment.h b/deps/include/qt/QtAndroidExtras/qandroidjnienvironment.h new file mode 100644 index 000000000..46d443dfe --- /dev/null +++ b/deps/include/qt/QtAndroidExtras/qandroidjnienvironment.h @@ -0,0 +1,86 @@ +/**************************************************************************** +** +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or (at your option) the GNU General +** Public license version 3 or any later version approved by the KDE Free +** Qt Foundation. The licenses are as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-2.0.html and +** https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef QANDROIDJNIENVIRONMENT_H +#define QANDROIDJNIENVIRONMENT_H + +#include +#include +#include +#include + +QT_BEGIN_NAMESPACE + +class QJNIEnvironmentPrivate; + +class Q_ANDROIDEXTRAS_EXPORT QAndroidJniEnvironment +{ +public: + QAndroidJniEnvironment(); + ~QAndroidJniEnvironment(); + static JavaVM *javaVM(); + JNIEnv *operator->(); + operator JNIEnv*() const; + jclass findClass(const char *className); + +private: + Q_DISABLE_COPY(QAndroidJniEnvironment) + QScopedPointer d; +}; + +class Q_ANDROIDEXTRAS_EXPORT QAndroidJniExceptionCleaner +{ +public: + enum class OutputMode { + Silent, + Verbose + }; + +public: + explicit QAndroidJniExceptionCleaner(OutputMode outputMode = OutputMode::Silent); + ~QAndroidJniExceptionCleaner(); + + void clean(); +private: + OutputMode m_outputMode; +}; + +QT_END_NAMESPACE + +#endif // QANDROIDJNIENVIRONMENT_H diff --git a/deps/include/qt/QtAndroidExtras/qandroidjniobject.h b/deps/include/qt/QtAndroidExtras/qandroidjniobject.h new file mode 100644 index 000000000..94bd9012a --- /dev/null +++ b/deps/include/qt/QtAndroidExtras/qandroidjniobject.h @@ -0,0 +1,215 @@ +/**************************************************************************** +** +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or (at your option) the GNU General +** Public license version 3 or any later version approved by the KDE Free +** Qt Foundation. The licenses are as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-2.0.html and +** https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef QANDROIDJNIOBJECT_H +#define QANDROIDJNIOBJECT_H + +#include +#include +#include +#include + +QT_BEGIN_NAMESPACE + +class QJNIObjectPrivate; + +class Q_ANDROIDEXTRAS_EXPORT QAndroidJniObject +{ +public: + QAndroidJniObject(); + explicit QAndroidJniObject(const char *className); + explicit QAndroidJniObject(const char *className, const char *sig, ...); + explicit QAndroidJniObject(jclass clazz); + explicit QAndroidJniObject(jclass clazz, const char *sig, ...); + QAndroidJniObject(jobject obj); + ~QAndroidJniObject(); + + template + inline T object() const { return static_cast(javaObject()); } +#ifndef Q_QDOC + inline jobject object() const { return javaObject(); } +#endif // Q_QDOC + + template + T callMethod(const char *methodName) const; + template + T callMethod(const char *methodName, const char *sig, ...) const; + template + QAndroidJniObject callObjectMethod(const char *methodName) const; + QAndroidJniObject callObjectMethod(const char *methodName, + const char *sig, + ...) const; + + template + static T callStaticMethod(const char *className, const char *methodName); + template + static T callStaticMethod(const char *className, const char *methodName, const char *sig, ...); + template + static QAndroidJniObject callStaticObjectMethod(const char *className, const char *methodName); + static QAndroidJniObject callStaticObjectMethod(const char *className, + const char *methodName, + const char *sig, ...); + template + static T callStaticMethod(jclass clazz, const char *methodName); + template + static T callStaticMethod(jclass clazz, const char *methodName, const char *sig, ...); + template + static QAndroidJniObject callStaticObjectMethod(jclass clazz, const char *methodName); + static QAndroidJniObject callStaticObjectMethod(jclass clazz, + const char *methodName, + const char *sig, ...); + template + T getField(const char *fieldName) const; + template + QAndroidJniObject getObjectField(const char *fieldName) const; +#if QT_DEPRECATED_SINCE(5, 5) +# ifndef Q_QDOC + template + QT_DEPRECATED_X("Use the non-template version instead") + QAndroidJniObject getObjectField(const char *fieldName, const char *sig) const; +# endif // Q_QDOC +#endif // QT_DEPRECATED_SINCE + QAndroidJniObject getObjectField(const char *fieldName, const char *sig) const; + template + void setField(const char *fieldName, T value); + template + void setField(const char *fieldName, const char *sig, T value); + template + static QAndroidJniObject getStaticObjectField(const char *className, const char *fieldName); +#if QT_DEPRECATED_SINCE(5, 5) +# ifndef Q_QDOC + template + QT_DEPRECATED_X("Use the non-template version instead") + static QAndroidJniObject getStaticObjectField(const char *className, + const char *fieldName, + const char *sig); +# endif // Q_QDOC +#endif // QT_DEPRECATED_SINCE + static QAndroidJniObject getStaticObjectField(const char *className, + const char *fieldName, + const char *sig); + template + static T getStaticField(const char *className, const char *fieldName); + template + static QAndroidJniObject getStaticObjectField(jclass clazz, const char *fieldName); +#if QT_DEPRECATED_SINCE(5, 5) +# ifndef Q_QDOC + template + QT_DEPRECATED_X("Use the non-template version instead") + static QAndroidJniObject getStaticObjectField(jclass clazz, + const char *fieldName, + const char *sig); +# endif // Q_QDOC +#endif // QT_DEPRECATED_SINCE + static QAndroidJniObject getStaticObjectField(jclass clazz, + const char *fieldName, + const char *sig); + template + static T getStaticField(jclass clazz, const char *fieldName); + + template + static void setStaticField(const char *className, + const char *fieldName, + const char *sig, + T value); + template + static void setStaticField(const char *className, const char *fieldName, T value); + template + static void setStaticField(jclass clazz, const char *fieldName, const char *sig, T value); + template + static void setStaticField(jclass clazz, const char *fieldName, T value); + + static QAndroidJniObject fromString(const QString &string); + QString toString() const; + + static bool isClassAvailable(const char *className); + bool isValid() const; + + static QAndroidJniObject fromLocalRef(jobject obj); + + template + inline QAndroidJniObject &operator=(T o) + { + assign(static_cast(o)); + return *this; + } + +private: + friend bool operator==(const QAndroidJniObject &, const QAndroidJniObject &); + friend bool operator!=(const QAndroidJniObject &, const QAndroidJniObject &); + template friend bool operator!=(const QAndroidJniObject &, const QAndroidJniObject &); + template friend bool operator==(const QAndroidJniObject &, const QAndroidJniObject &); + + QAndroidJniObject(const QJNIObjectPrivate &o); + + void assign(jobject o); + jobject javaObject() const; + bool isSameObject(jobject obj) const; + bool isSameObject(const QAndroidJniObject &obj) const; + + QSharedPointer d; +}; + +inline bool operator==(const QAndroidJniObject &obj1, const QAndroidJniObject &obj2) +{ + return obj1.isSameObject(obj2); +} + +inline bool operator!=(const QAndroidJniObject &obj1, const QAndroidJniObject &obj2) +{ + return !obj1.isSameObject(obj2); +} + +#if QT_DEPRECATED_SINCE(5, 5) +template +QT_DEPRECATED inline bool operator==(const QAndroidJniObject &obj1, const QAndroidJniObject &obj2) +{ + return obj1.isSameObject(obj2.object()); +} + +template +QT_DEPRECATED inline bool operator!=(const QAndroidJniObject &obj1, const QAndroidJniObject &obj2) +{ + return !obj1.isSameObject(obj2.object()); +} +#endif // QT_DEPRECATED_SINCE + +QT_END_NAMESPACE + +#endif // QANDROIDJNIOBJECT_H diff --git a/deps/include/qt/QtAndroidExtras/qandroidparcel.h b/deps/include/qt/QtAndroidExtras/qandroidparcel.h new file mode 100644 index 000000000..23d1edc8f --- /dev/null +++ b/deps/include/qt/QtAndroidExtras/qandroidparcel.h @@ -0,0 +1,78 @@ +/**************************************************************************** +** +** Copyright (C) 2017 BogDan Vatra +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or (at your option) the GNU General +** Public license version 3 or any later version approved by the KDE Free +** Qt Foundation. The licenses are as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-2.0.html and +** https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef QANDROIDPARCEL_H +#define QANDROIDPARCEL_H + +#include +#include +#include + +QT_BEGIN_NAMESPACE +class QAndroidBinder; +class QAndroidJniObject; +class QAndroidParcelPrivate; +class Q_ANDROIDEXTRAS_EXPORT QAndroidParcel +{ +public: + QAndroidParcel(); + explicit QAndroidParcel(const QAndroidJniObject& parcel); + virtual ~QAndroidParcel(); + + void writeData(const QByteArray &data) const; + void writeVariant(const QVariant &value) const; + void writeBinder(const QAndroidBinder &binder) const; + void writeFileDescriptor(int fd) const; + + QByteArray readData() const; + QVariant readVariant() const; + QAndroidBinder readBinder() const; + int readFileDescriptor() const; + + QAndroidJniObject handle() const; + +private: + friend class QAndroidParcelPrivate; + friend class QAndroidBinder; + QSharedPointer d; +}; + +QT_END_NAMESPACE + +#endif // QANDROIDPARCEL_H diff --git a/deps/include/qt/QtAndroidExtras/qandroidservice.h b/deps/include/qt/QtAndroidExtras/qandroidservice.h new file mode 100644 index 000000000..8c0855cdd --- /dev/null +++ b/deps/include/qt/QtAndroidExtras/qandroidservice.h @@ -0,0 +1,79 @@ +/**************************************************************************** +** +** Copyright (C) 2017 BogDan Vatra +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or (at your option) the GNU General +** Public license version 3 or any later version approved by the KDE Free +** Qt Foundation. The licenses are as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-2.0.html and +** https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef QANDROIDSERVICE_H +#define QANDROIDSERVICE_H + +#include +#include +#include +#include + +QT_BEGIN_NAMESPACE +class QAndroidServicePrivate; +class QAndroidIntent; +class QAndroidBinder; +class Q_ANDROIDEXTRAS_EXPORT QAndroidService : public QCoreApplication +{ +public: + QAndroidService(int &argc, char **argv +#ifndef Q_QDOC + , int flags = ApplicationFlags +#endif + ); + QAndroidService(int &argc, char **argv, + const std::function & binder +#ifndef Q_QDOC + , int flags = ApplicationFlags +#endif + ); + virtual ~QAndroidService(); + + virtual QAndroidBinder* onBind(const QAndroidIntent &intent); + +private: + friend class QAndroidServicePrivate; + Q_DISABLE_COPY(QAndroidService) + + QScopedPointer d; +}; + +QT_END_NAMESPACE + +#endif // QANDROIDSERVICE_H diff --git a/deps/include/qt/QtAndroidExtras/qandroidserviceconnection.h b/deps/include/qt/QtAndroidExtras/qandroidserviceconnection.h new file mode 100644 index 000000000..ed0b4e073 --- /dev/null +++ b/deps/include/qt/QtAndroidExtras/qandroidserviceconnection.h @@ -0,0 +1,66 @@ +/**************************************************************************** +** +** Copyright (C) 2017 BogDan Vatra +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or (at your option) the GNU General +** Public license version 3 or any later version approved by the KDE Free +** Qt Foundation. The licenses are as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-2.0.html and +** https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef QTANDROIDSERVICECONNECTION_H +#define QTANDROIDSERVICECONNECTION_H + +#include +#include + +QT_BEGIN_NAMESPACE +class QAndroidBinder; +class Q_ANDROIDEXTRAS_EXPORT QAndroidServiceConnection +{ +public: + QAndroidServiceConnection(); + explicit QAndroidServiceConnection(const QAndroidJniObject &serviceConnection); + virtual ~QAndroidServiceConnection(); + + virtual void onServiceConnected(const QString &name, const QAndroidBinder &serviceBinder) = 0; + virtual void onServiceDisconnected(const QString &name) = 0; + + QAndroidJniObject handle() const; +private: + Q_DISABLE_COPY(QAndroidServiceConnection) + QAndroidJniObject m_handle; +}; + +QT_END_NAMESPACE + +#endif // QTANDROIDSERVICECONNECTION_H diff --git a/deps/include/qt/QtAndroidExtras/qtandroidextrasversion.h b/deps/include/qt/QtAndroidExtras/qtandroidextrasversion.h new file mode 100644 index 000000000..ef7e6a064 --- /dev/null +++ b/deps/include/qt/QtAndroidExtras/qtandroidextrasversion.h @@ -0,0 +1,9 @@ +/* This file was generated by syncqt. */ +#ifndef QT_QTANDROIDEXTRAS_VERSION_H +#define QT_QTANDROIDEXTRAS_VERSION_H + +#define QTANDROIDEXTRAS_VERSION_STR "5.12.4" + +#define QTANDROIDEXTRAS_VERSION 0x050C04 + +#endif // QT_QTANDROIDEXTRAS_VERSION_H diff --git a/deps/include/qt/QtBluetooth/private/androidbroadcastreceiver_p.h b/deps/include/qt/QtBluetooth/private/android/androidbroadcastreceiver_p.h similarity index 100% rename from deps/include/qt/QtBluetooth/private/androidbroadcastreceiver_p.h rename to deps/include/qt/QtBluetooth/private/android/androidbroadcastreceiver_p.h diff --git a/deps/include/qt/QtBluetooth/private/devicediscoverybroadcastreceiver_p.h b/deps/include/qt/QtBluetooth/private/android/devicediscoverybroadcastreceiver_p.h similarity index 100% rename from deps/include/qt/QtBluetooth/private/devicediscoverybroadcastreceiver_p.h rename to deps/include/qt/QtBluetooth/private/android/devicediscoverybroadcastreceiver_p.h diff --git a/deps/include/qt/QtBluetooth/private/inputstreamthread_p.h b/deps/include/qt/QtBluetooth/private/android/inputstreamthread_p.h similarity index 100% rename from deps/include/qt/QtBluetooth/private/inputstreamthread_p.h rename to deps/include/qt/QtBluetooth/private/android/inputstreamthread_p.h diff --git a/deps/include/qt/QtBluetooth/private/jni_android_p.h b/deps/include/qt/QtBluetooth/private/android/jni_android_p.h similarity index 100% rename from deps/include/qt/QtBluetooth/private/jni_android_p.h rename to deps/include/qt/QtBluetooth/private/android/jni_android_p.h diff --git a/deps/include/qt/QtBluetooth/private/localdevicebroadcastreceiver_p.h b/deps/include/qt/QtBluetooth/private/android/localdevicebroadcastreceiver_p.h similarity index 100% rename from deps/include/qt/QtBluetooth/private/localdevicebroadcastreceiver_p.h rename to deps/include/qt/QtBluetooth/private/android/localdevicebroadcastreceiver_p.h diff --git a/deps/include/qt/QtBluetooth/private/lowenergynotificationhub_p.h b/deps/include/qt/QtBluetooth/private/android/lowenergynotificationhub_p.h similarity index 100% rename from deps/include/qt/QtBluetooth/private/lowenergynotificationhub_p.h rename to deps/include/qt/QtBluetooth/private/android/lowenergynotificationhub_p.h diff --git a/deps/include/qt/QtBluetooth/private/serveracceptancethread_p.h b/deps/include/qt/QtBluetooth/private/android/serveracceptancethread_p.h similarity index 100% rename from deps/include/qt/QtBluetooth/private/serveracceptancethread_p.h rename to deps/include/qt/QtBluetooth/private/android/serveracceptancethread_p.h diff --git a/deps/include/qt/QtBluetooth/private/servicediscoverybroadcastreceiver_p.h b/deps/include/qt/QtBluetooth/private/android/servicediscoverybroadcastreceiver_p.h similarity index 100% rename from deps/include/qt/QtBluetooth/private/servicediscoverybroadcastreceiver_p.h rename to deps/include/qt/QtBluetooth/private/android/servicediscoverybroadcastreceiver_p.h diff --git a/deps/include/qt/QtCore/qconfig.h b/deps/include/qt/QtCore/qconfig.h index 6b63ac05b..5c7fe4e1a 100644 --- a/deps/include/qt/QtCore/qconfig.h +++ b/deps/include/qt/QtCore/qconfig.h @@ -15,7 +15,6 @@ #define QT_FEATURE_concurrent 1 #define QT_FEATURE_pkg_config -1 #define QT_FEATURE_force_asserts -1 -#define QT_LARGEFILE_SUPPORT 64 #define QT_FEATURE_separate_debug_info -1 #define QT_FEATURE_simulator_and_device -1 #define QT_FEATURE_static 1 @@ -24,6 +23,9 @@ #define QT_VERSION_MINOR 12 #define QT_VERSION_PATCH 4 +// defined by platforms that want it +//#define QT_LARGEFILE_SUPPORT 64 + // TODO: Set optimized in build //#define QT_COMPILER_SUPPORTS_F16C 1 //#define QT_COMPILER_SUPPORTS_RDRND 1 diff --git a/deps/include/qt/QtGui/qtgui-config.h b/deps/include/qt/QtGui/qtgui-config.h index 041cf535b..e2a8eff90 100644 --- a/deps/include/qt/QtGui/qtgui-config.h +++ b/deps/include/qt/QtGui/qtgui-config.h @@ -43,3 +43,19 @@ #define QT_FEATURE_vulkan -1 #define QT_FEATURE_whatsthis 1 #define QT_FEATURE_wheelevent 1 + +// Use OpenGL ES for Android (ES 3.1 = API 21 = 5.0) +#ifdef ANDROID +#ifndef QT_OPENGL_ES + #define QT_OPENGL_ES +#endif +#ifndef QT_OPENGL_ES_2 + #define QT_OPENGL_ES_2 +#endif +#ifndef QT_OPENGL_ES_3 + #define QT_OPENGL_ES_3 +#endif +#ifndef QT_OPENGL_ES_3_1 + #define QT_OPENGL_ES_3_1 +#endif +#endif diff --git a/deps/prebuilt/linux/x64/qt-moc b/deps/prebuilt/linux/x64/qt-moc new file mode 100644 index 000000000..207786775 Binary files /dev/null and b/deps/prebuilt/linux/x64/qt-moc differ diff --git a/deps/prebuilt/linux/x64/qt-rcc b/deps/prebuilt/linux/x64/qt-rcc new file mode 100644 index 000000000..6ad296ad4 Binary files /dev/null and b/deps/prebuilt/linux/x64/qt-rcc differ diff --git a/deps/prebuilt/linux/x64/qt-uic b/deps/prebuilt/linux/x64/qt-uic new file mode 100644 index 000000000..5faded8df Binary files /dev/null and b/deps/prebuilt/linux/x64/qt-uic differ diff --git a/deps/prebuilt/osx/x64/qt-moc b/deps/prebuilt/osx/x64/qt-moc new file mode 100755 index 000000000..e2ffc3ba8 Binary files /dev/null and b/deps/prebuilt/osx/x64/qt-moc differ diff --git a/deps/prebuilt/osx/x64/qt-rcc b/deps/prebuilt/osx/x64/qt-rcc new file mode 100755 index 000000000..fe5f01a7c Binary files /dev/null and b/deps/prebuilt/osx/x64/qt-rcc differ diff --git a/deps/prebuilt/osx/x64/qt-uic b/deps/prebuilt/osx/x64/qt-uic new file mode 100755 index 000000000..0b2d02f6b Binary files /dev/null and b/deps/prebuilt/osx/x64/qt-uic differ diff --git a/deps/prebuilt/win/x64/qt-moc.exe b/deps/prebuilt/win/x64/qt-moc.exe new file mode 100644 index 000000000..6bf0d8049 Binary files /dev/null and b/deps/prebuilt/win/x64/qt-moc.exe differ diff --git a/deps/prebuilt/win/x64/qt-rcc.exe b/deps/prebuilt/win/x64/qt-rcc.exe new file mode 100644 index 000000000..2b2959528 Binary files /dev/null and b/deps/prebuilt/win/x64/qt-rcc.exe differ diff --git a/deps/prebuilt/win/x64/qt-uic.exe b/deps/prebuilt/win/x64/qt-uic.exe new file mode 100644 index 000000000..7d892a4e3 Binary files /dev/null and b/deps/prebuilt/win/x64/qt-uic.exe differ diff --git a/deps/prebuilt/win/x86/qt-moc.exe b/deps/prebuilt/win/x86/qt-moc.exe new file mode 100644 index 000000000..72d49c604 Binary files /dev/null and b/deps/prebuilt/win/x86/qt-moc.exe differ diff --git a/deps/prebuilt/win/x86/qt-rcc.exe b/deps/prebuilt/win/x86/qt-rcc.exe new file mode 100644 index 000000000..6cc0a8f40 Binary files /dev/null and b/deps/prebuilt/win/x86/qt-rcc.exe differ diff --git a/deps/prebuilt/win/x86/qt-uic.exe b/deps/prebuilt/win/x86/qt-uic.exe new file mode 100644 index 000000000..af06a318e Binary files /dev/null and b/deps/prebuilt/win/x86/qt-uic.exe differ diff --git a/src/EngineJNI/Java/com/neuromore/engine/ICallback.java b/src/EngineJNI/Java/com/neuromore/engine/ICallback.java new file mode 100644 index 000000000..bd1544750 --- /dev/null +++ b/src/EngineJNI/Java/com/neuromore/engine/ICallback.java @@ -0,0 +1,62 @@ +/**************************************************************************** +** +** Copyright 2019 neuromore co +** Contact: https://neuromore.com/contact +** +** Commercial License Usage +** Licensees holding valid commercial neuromore licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and neuromore. For licensing terms +** and conditions see https://neuromore.com/licensing. For further +** information use the contact form at https://neuromore.com/contact. +** +** neuromore Public License Usage +** Alternatively, this file may be used under the terms of the neuromore +** Public License version 1 as published by neuromore co with exceptions as +** appearing in the file neuromore-class-exception.md included in the +** packaging of this file. Please review the following information to +** ensure the neuromore Public License requirements will be met: +** https://neuromore.com/npl +** +****************************************************************************/ + +package com.neuromore.engine; + +/** + * This is the java equivalent to the neuromore Callback Interface. + * Therefore a neuromore Callback controller must implement this. + * Also these function signatures MUST match what is expected on the native side. + */ +public interface ICallback +{ + void OnStop(int status); // use EStatus + void OnPlayAudio(String url, int numLoops, double beginAt, double volume); + void OnStopAudio(String url); + void OnPauseAudio(String url, boolean unPause); + void OnSetAudioVolume(String url, double volume); + void OnSeekAudio(String url, int millisecs); + void OnPlayVideo(String url, int numLoops, double beginAt, double volume); + void OnStopVideo(); + void OnPauseVideo(String url, boolean unPause); + void OnSetVideoVolume(String url, double volume); + void OnSeekVideo(String url, int millisecs); + void OnShowImage(String url); + void OnHideImage(); + void OnShowText(String text, float colorR, float colorG, float colorB, float colorA); + void OnHideText(); + void OnShowButton(String text, int buttonId); + void OnClearButtons(); + void OnCommand(String url); + + void OnVolumeChanged(double volume); + void OnProgressChanged(double progress); + + void OnExperienceLoaded( + final boolean loaded, + final String[] feedbacks, + final String[] audios, + final String[] videos, + final String[] images, + final String userId); +} diff --git a/src/EngineJNI/Java/com/neuromore/engine/Wrapper.java b/src/EngineJNI/Java/com/neuromore/engine/Wrapper.java new file mode 100644 index 000000000..b4a567935 --- /dev/null +++ b/src/EngineJNI/Java/com/neuromore/engine/Wrapper.java @@ -0,0 +1,140 @@ +/**************************************************************************** +** +** Copyright 2019 neuromore co +** Contact: https://neuromore.com/contact +** +** Commercial License Usage +** Licensees holding valid commercial neuromore licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and neuromore. For licensing terms +** and conditions see https://neuromore.com/licensing. For further +** information use the contact form at https://neuromore.com/contact. +** +** neuromore Public License Usage +** Alternatively, this file may be used under the terms of the neuromore +** Public License version 1 as published by neuromore co with exceptions as +** appearing in the file neuromore-class-exception.md included in the +** packaging of this file. Please review the following information to +** ensure the neuromore Public License requirements will be met: +** https://neuromore.com/npl +** +****************************************************************************/ + +package com.neuromore.engine; + +/** + * This is a static, plain JNI wrapperclass for the native neuromore engine C-API calls. + * It does nothing but provide callable native function signatures and + * will load the necessary native library (*.so) before the first call is made. + * For handling callbacks see ICallback, which gets set in init(). + */ +public class Wrapper +{ + static + { + // load the neuromore library (libengine.so / engine.dll) + System.loadLibrary("EngineJNI"); + } + + /////////////////////////////////////////////////////////////////////////////////////////////// + // Engine initialization + /////////////////////////////////////////////////////////////////////////////////////////////// + + public static native boolean SetPowerLineFrequencyType(int powerLineFrequencyType); + public static native double GetPowerLineFrequency(); + public static native boolean SetBufferLength(double seconds); + public static native void Init(ICallback callback); + public static native boolean IsInitialized(); + public static native void Shutdown(); + + /////////////////////////////////////////////////////////////////////////////////////////////// + // Engine basics: Start, Stop, Cleanup, Update etc + /////////////////////////////////////////////////////////////////////////////////////////////// + + public static native boolean IsReady(); + public static native void SetSessionLength(double seconds); + public static native boolean Start(); + public static native boolean StartThreaded(); + public static native boolean Update(); + public static native boolean IsRunning(); + public static native boolean Stop(); + public static native boolean StopThreaded(); + public static native void Reset(); + + /////////////////////////////////////////////////////////////////////////////////////////////// + // Helpers + /////////////////////////////////////////////////////////////////////////////////////////////// + + public static native void EnableDebugLogging(); + public static native void SetAllowAssetStreaming(boolean allow); + + /////////////////////////////////////////////////////////////////////////////////////////////// + // Devices + /////////////////////////////////////////////////////////////////////////////////////////////// + + public static native int AddDevice(int deviceType); // use EDevice + public static native int GetNumDevices(); + public static native boolean RemoveDevice(int deviceIndex); + public static native int GetDevice(int deviceIndex); // returns EDevice + public static native boolean HasDevice(int deviceType); // use EDevice + public static native boolean ConnectDevice(int deviceIndex); + public static native boolean DisconnectDevice(int deviceIndex); + public static native int GetNumInputs(int deviceIndex); + public static native boolean AddInputSample(int deviceIndex, int inputIndex, double value); + public static native boolean SetBatteryChargeLevel(int deviceIndex, double normalizedCharge); + + /////////////////////////////////////////////////////////////////////////////////////////////// + // Classifier + /////////////////////////////////////////////////////////////////////////////////////////////// + + public static native boolean LoadClassifier(String jsonContent, String uuid, int revision); + public static native boolean HasClassifier(); + public static native boolean IsDeviceRequiredByClassifier(int deviceType); // use EDevice + public static native int GetNumFeedbacks(); + public static native String GetFeedbackName(int index); + public static native double GetCurrentFeedbackValue(int index); + //public static native void GetFeedbackRange(); + + /////////////////////////////////////////////////////////////////////////////////////////////// + // Cloud Data Serialization + /////////////////////////////////////////////////////////////////////////////////////////////// + + public static native String GetCreateDataChunkJson(String userId, String experienceUuid, int experienceRevision); + public static native int GetNumDataChunkChannels(); + public static native String GetDataChunkChannelJson(String userId, String dataChunkUuid, int channelIndex); + public static native byte[] GetDataChunkChannelData(int channelIndex); + + /////////////////////////////////////////////////////////////////////////////////////////////// + // Classifier Cloud Parameters + /////////////////////////////////////////////////////////////////////////////////////////////// + + public static native String CreateJSONRequestFindParameters(String userId); + public static native boolean HandleJSONReplyFindParameters(String jsonString, String userId); + public static native String CreateJSONRequestSetParameters(); + + /////////////////////////////////////////////////////////////////////////////////////////////// + // State Machine + /////////////////////////////////////////////////////////////////////////////////////////////// + + public static native boolean LoadStateMachine(String jsonContent, String uuid, int revision); + public static native boolean HasStateMachine(); + + /////////////////////////////////////////////////////////////////////////////////////////////// + // Multimedia Assets + /////////////////////////////////////////////////////////////////////////////////////////////// + + public static native int GetNumAssetsOfType(int assetType); // use EAssetType + public static native String GetAssetLocationOfType(int assetType, int index); // use EAssetType + public static native boolean GetAssetAllowStreamingOfType(int assetType, int index); // use EAssetType + + public static native int GetNumAssets(); + public static native String GetAssetLocation(int index); + public static native boolean GetAssetAllowStreaming(int index); + + public static native boolean ButtonClicked(int buttonId); + public static native boolean AudioLooped(String url); + public static native boolean VideoLooped(String url); + + /////////////////////////////////////////////////////////////////////////////////////////////// +} diff --git a/src/EngineJNI/Java/com/neuromore/engine/enums/EAssetType.java b/src/EngineJNI/Java/com/neuromore/engine/enums/EAssetType.java new file mode 100644 index 000000000..e8b496f3e --- /dev/null +++ b/src/EngineJNI/Java/com/neuromore/engine/enums/EAssetType.java @@ -0,0 +1,35 @@ +/**************************************************************************** +** +** Copyright 2019 neuromore co +** Contact: https://neuromore.com/contact +** +** Commercial License Usage +** Licensees holding valid commercial neuromore licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and neuromore. For licensing terms +** and conditions see https://neuromore.com/licensing. For further +** information use the contact form at https://neuromore.com/contact. +** +** neuromore Public License Usage +** Alternatively, this file may be used under the terms of the neuromore +** Public License version 1 as published by neuromore co with exceptions as +** appearing in the file neuromore-class-exception.md included in the +** packaging of this file. Please review the following information to +** ensure the neuromore Public License requirements will be met: +** https://neuromore.com/npl +** +****************************************************************************/ + +package com.neuromore.engine.enums; + +/** + * Must match AssetType in neuromoreEngine.h + */ +public final class EAssetType +{ + public static final int ASSET_NONE = 0; + public static final int ASSET_AUDIO = 1; + public static final int ASSET_VIDEO = 2; + public static final int ASSET_IMAGE = 3; +} \ No newline at end of file diff --git a/src/EngineJNI/Java/com/neuromore/engine/enums/EDevice.java b/src/EngineJNI/Java/com/neuromore/engine/enums/EDevice.java new file mode 100644 index 000000000..b31509229 --- /dev/null +++ b/src/EngineJNI/Java/com/neuromore/engine/enums/EDevice.java @@ -0,0 +1,78 @@ +/**************************************************************************** +** +** Copyright 2019 neuromore co +** Contact: https://neuromore.com/contact +** +** Commercial License Usage +** Licensees holding valid commercial neuromore licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and neuromore. For licensing terms +** and conditions see https://neuromore.com/licensing. For further +** information use the contact form at https://neuromore.com/contact. +** +** neuromore Public License Usage +** Alternatively, this file may be used under the terms of the neuromore +** Public License version 1 as published by neuromore co with exceptions as +** appearing in the file neuromore-class-exception.md included in the +** packaging of this file. Please review the following information to +** ensure the neuromore Public License requirements will be met: +** https://neuromore.com/npl +** +****************************************************************************/ + +package com.neuromore.engine.enums; + +/** + * Must match EDevice in neuromoreEngine.h + */ +public final class EDevice +{ + public static final int DEVICE_UNKNOWN = -1; // does not exist in C so far + + // Vital Signs Sensor Devices // Win/OSX/Linux / iOS / Android + public static final int DEVICE_GENERIC_HEARTRATE = 0; // org.bluetooth.service.heart_rate / HKQuantityTypeIdentifierHeartRate / android.hardware.Sensor TYPE_HEART_RATE (OR com.google.heart_rate from google fit) +// public static final int DEVICE_GENERIC_RESPIRATION = 1; // - / HKQuantityTypeIdentifierRespiratoryRate +// public static final int DEVICE_GENERIC_THERMOMETER = 2; // org.bluetooth.service.health_thermometer / HKQuantityTypeIdentifierBodyTemperature + + // Platform devices // Win/OSX/Linux / iOS / Android + public static final int DEVICE_GENERIC_ACCELEROMETER = 3; // platform specific driver / CMMotionManager / android.hardware.Sensor TYPE_ACCELEROMETER + public static final int DEVICE_GENERIC_GYROSCOPE = 4; // platform specific driver / CMMotionManager / android.hardware.Sensor TYPE_GYROSCOPE +// public static final int DEVICE_GENERIC_GEOPOSITION = 5; // platform specific driver / CLLocation / android.location.LocationManager +// public static final int DEVICE_GENERIC_AMBIENT_LIGHT = 6; // - / (n/a.. use camera) / android.hardware.Sensor TYPE_LIGHT +// public static final int DEVICE_GENERIC_AUDIO_IN = 7; // QT Audio / AudioUnits ? / android.media.AudioRecord +// public static final int DEVICE_GENERIC_AUDIO_OUT = 8; // QT Audio / AudioUnits ? / android.media.AudioTrack +// public static final int DEVICE_GENERIC_CAMERA = 9; // OpenCV / ? / android.hardware.camera2 + + // EEG devices + public static final int DEVICE_INTERAXON_MUSE = 10; + public static final int DEVICE_EMOTIV_EPOC = 11; + public static final int DEVICE_EMOTIV_INSIGHT = 12; + public static final int DEVICE_NEUROSKY_MINDWAVE = 13; + public static final int DEVICE_SENSELABS_VESUS = 14; + + // other devices + public static final int DEVICE_ESENSE_SKINRESPONSE = 15; + + /** + * Returns a default-name for a neuromore engine EDevice enum value + * @param deviceType neuromore EDevice value + * @return String containing default name + */ + public static String getDefaultNameForType(int deviceType) + { + switch(deviceType) + { + case EDevice.DEVICE_GENERIC_HEARTRATE: return "Generic Heart Rate Sensor"; + case EDevice.DEVICE_GENERIC_ACCELEROMETER: return "Generic Accelerometer"; + case EDevice.DEVICE_GENERIC_GYROSCOPE: return "Generic Gyroscope"; + case EDevice.DEVICE_INTERAXON_MUSE: return "Interaxon MUSE"; + case EDevice.DEVICE_EMOTIV_EPOC: return "DEVICE_EMOTIV_EPOC"; + case EDevice.DEVICE_EMOTIV_INSIGHT: return "DEVICE_EMOTIV_INSIGHT"; + case EDevice.DEVICE_NEUROSKY_MINDWAVE: return "DEVICE_NEUROSKY_MINDWAVE"; + case EDevice.DEVICE_SENSELABS_VESUS: return "DEVICE_SENSELABS_VESUS"; + case EDevice.DEVICE_ESENSE_SKINRESPONSE: return "eSense Skin response"; + default: return "DEVICE_UNKNOWN"; + } + } +} diff --git a/src/EngineJNI/Java/com/neuromore/engine/enums/EGenericDeviceInputs.java b/src/EngineJNI/Java/com/neuromore/engine/enums/EGenericDeviceInputs.java new file mode 100644 index 000000000..b8d8264f1 --- /dev/null +++ b/src/EngineJNI/Java/com/neuromore/engine/enums/EGenericDeviceInputs.java @@ -0,0 +1,41 @@ +/**************************************************************************** +** +** Copyright 2019 neuromore co +** Contact: https://neuromore.com/contact +** +** Commercial License Usage +** Licensees holding valid commercial neuromore licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and neuromore. For licensing terms +** and conditions see https://neuromore.com/licensing. For further +** information use the contact form at https://neuromore.com/contact. +** +** neuromore Public License Usage +** Alternatively, this file may be used under the terms of the neuromore +** Public License version 1 as published by neuromore co with exceptions as +** appearing in the file neuromore-class-exception.md included in the +** packaging of this file. Please review the following information to +** ensure the neuromore Public License requirements will be met: +** https://neuromore.com/npl +** +****************************************************************************/ + +package com.neuromore.engine.enums; + +/** + * Must match EGenericDeviceInputs in neuromoreEngine.h + */ +public final class EGenericDeviceInputs +{ + public static final int HEARTRATE_INPUT_BPM = 0; // < 10 Hz + public static final int HEARTRATE_INPUT_RR = 1; // - + + public static final int ACCELEROMETER_INPUT_X = 0; // < 50 Hz + public static final int ACCELEROMETER_INPUT_Y = 1; // < 50 Hz + public static final int ACCELEROMETER_INPUT_Z = 2; // < 50 Hz + + public static final int GYROSCOPE_INPUT_X = 0; // < 50 Hz + public static final int GYROSCOPE_INPUT_Y = 1; // < 50 Hz + public static final int GYROSCOPE_INPUT_Z = 2; // < 50 Hz +} diff --git a/src/EngineJNI/Java/com/neuromore/engine/enums/EMuseInputs.java b/src/EngineJNI/Java/com/neuromore/engine/enums/EMuseInputs.java new file mode 100644 index 000000000..732e79c9e --- /dev/null +++ b/src/EngineJNI/Java/com/neuromore/engine/enums/EMuseInputs.java @@ -0,0 +1,49 @@ +/**************************************************************************** +** +** Copyright 2019 neuromore co +** Contact: https://neuromore.com/contact +** +** Commercial License Usage +** Licensees holding valid commercial neuromore licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and neuromore. For licensing terms +** and conditions see https://neuromore.com/licensing. For further +** information use the contact form at https://neuromore.com/contact. +** +** neuromore Public License Usage +** Alternatively, this file may be used under the terms of the neuromore +** Public License version 1 as published by neuromore co with exceptions as +** appearing in the file neuromore-class-exception.md included in the +** packaging of this file. Please review the following information to +** ensure the neuromore Public License requirements will be met: +** https://neuromore.com/npl +** +****************************************************************************/ + +package com.neuromore.engine.enums; + +/** + * Must match EMuseInputs in neuromoreEngine.h + */ +public final class EMuseInputs +{ + public static final int MUSE_INPUT_EEG_TP9 = 0; // = 220 Hz + public static final int MUSE_INPUT_EEG_FP1 = 1; // = 220 Hz + public static final int MUSE_INPUT_EEG_FP2 = 2; // = 220 Hz + public static final int MUSE_INPUT_EEG_TP10 = 3; // = 220 Hz + public static final int MUSE_INPUT_CONCENTRATION = 4; // = 10 Hz + public static final int MUSE_INPUT_MELLOW = 5; // = 10 Hz + public static final int MUSE_INPUT_DRL = 6; // = 220 Hz + public static final int MUSE_INPUT_REF = 7; // = 220 Hz + public static final int MUSE_INPUT_ACC_FORWARD = 8; // = 50 Hz + public static final int MUSE_INPUT_ACC_UP = 9; // = 50 Hz + public static final int MUSE_INPUT_ACC_LEFT = 10; // = 50 Hz + public static final int MUSE_INPUT_EYEBLINK = 11; // = 10 Hz + public static final int MUSE_INPUT_JAWCLENCH = 12; // = 10 Hz + public static final int MUSE_INPUT_EEG_TP9_OK = 13; // < 10 Hz // Note: Mapping from HorseShoe Values to our scale: + public static final int MUSE_INPUT_EEG_FP1_OK = 14; // < 10 Hz // 1.0 => 1.0 + public static final int MUSE_INPUT_EEG_FP2_OK = 15; // < 10 Hz // 2.0 => 0.5 + public static final int MUSE_INPUT_EEG_TP10_OK = 16; // < 10 Hz // >3.0 => 0.0 + public static final int MUSE_INPUT_TOUCHING_FOREHEAD = 17; // < 10 Hz // Note: 1=true, 0=false +} \ No newline at end of file diff --git a/src/EngineJNI/Java/com/neuromore/engine/enums/EPowerLineFrequencyType.java b/src/EngineJNI/Java/com/neuromore/engine/enums/EPowerLineFrequencyType.java new file mode 100644 index 000000000..c82012f3d --- /dev/null +++ b/src/EngineJNI/Java/com/neuromore/engine/enums/EPowerLineFrequencyType.java @@ -0,0 +1,34 @@ +/**************************************************************************** +** +** Copyright 2019 neuromore co +** Contact: https://neuromore.com/contact +** +** Commercial License Usage +** Licensees holding valid commercial neuromore licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and neuromore. For licensing terms +** and conditions see https://neuromore.com/licensing. For further +** information use the contact form at https://neuromore.com/contact. +** +** neuromore Public License Usage +** Alternatively, this file may be used under the terms of the neuromore +** Public License version 1 as published by neuromore co with exceptions as +** appearing in the file neuromore-class-exception.md included in the +** packaging of this file. Please review the following information to +** ensure the neuromore Public License requirements will be met: +** https://neuromore.com/npl +** +****************************************************************************/ + +package com.neuromore.engine.enums; + +/** + * Must match EPowerLineFrequencyType in neuromoreEngine.h + */ +public final class EPowerLineFrequencyType +{ + //public static final int POWERLINEFREQ_AUTO = 0; + public static final int POWERLINEFREQ_50HZ = 1; + public static final int POWERLINEFREQ_60HZ = 2; +} \ No newline at end of file diff --git a/src/EngineJNI/Java/com/neuromore/engine/enums/ESenseSkinResponseInputs.java b/src/EngineJNI/Java/com/neuromore/engine/enums/ESenseSkinResponseInputs.java new file mode 100644 index 000000000..814bee176 --- /dev/null +++ b/src/EngineJNI/Java/com/neuromore/engine/enums/ESenseSkinResponseInputs.java @@ -0,0 +1,32 @@ +/**************************************************************************** +** +** Copyright 2019 neuromore co +** Contact: https://neuromore.com/contact +** +** Commercial License Usage +** Licensees holding valid commercial neuromore licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and neuromore. For licensing terms +** and conditions see https://neuromore.com/licensing. For further +** information use the contact form at https://neuromore.com/contact. +** +** neuromore Public License Usage +** Alternatively, this file may be used under the terms of the neuromore +** Public License version 1 as published by neuromore co with exceptions as +** appearing in the file neuromore-class-exception.md included in the +** packaging of this file. Please review the following information to +** ensure the neuromore Public License requirements will be met: +** https://neuromore.com/npl +** +****************************************************************************/ + +package com.neuromore.engine.enums; + +/** + * Must match eSenseSkinResponseInputs in neuromoreEngine.h + */ +public final class ESenseSkinResponseInputs +{ + public static final int ESENSE_SKINRESPONSE_INPUT = 0; +} diff --git a/src/EngineJNI/Java/com/neuromore/engine/enums/EStatus.java b/src/EngineJNI/Java/com/neuromore/engine/enums/EStatus.java new file mode 100644 index 000000000..a62aba5e2 --- /dev/null +++ b/src/EngineJNI/Java/com/neuromore/engine/enums/EStatus.java @@ -0,0 +1,35 @@ +/**************************************************************************** +** +** Copyright 2019 neuromore co +** Contact: https://neuromore.com/contact +** +** Commercial License Usage +** Licensees holding valid commercial neuromore licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and neuromore. For licensing terms +** and conditions see https://neuromore.com/licensing. For further +** information use the contact form at https://neuromore.com/contact. +** +** neuromore Public License Usage +** Alternatively, this file may be used under the terms of the neuromore +** Public License version 1 as published by neuromore co with exceptions as +** appearing in the file neuromore-class-exception.md included in the +** packaging of this file. Please review the following information to +** ensure the neuromore Public License requirements will be met: +** https://neuromore.com/npl +** +****************************************************************************/ + +package com.neuromore.engine.enums; + +/** + * Must match EStatus in neuromoreEngine.h + */ +public final class EStatus +{ + public static final int STATUS_OK = 0; // session completed successfully + public static final int STATUS_DEVICE_ERROR = 1; // aborted due to device error (no data/battery died) -> user or app/lib fault + public static final int STATUS_SIGNAL_ERROR = 2; // aborted due to very bad signal quality -> user or hardware fault + public static final int STATUS_ENGINE_ERROR = 3; // aborted due to internal engine error (thats the worst case) -> app/engine fault +}; diff --git a/src/EngineJNI/neuromoreEngineJni.cpp b/src/EngineJNI/neuromoreEngineJni.cpp new file mode 100644 index 000000000..1bcc14627 --- /dev/null +++ b/src/EngineJNI/neuromoreEngineJni.cpp @@ -0,0 +1,792 @@ +/**************************************************************************** +** +** Copyright 2019 neuromore co +** Contact: https://neuromore.com/contact +** +** Commercial License Usage +** Licensees holding valid commercial neuromore licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and neuromore. For licensing terms +** and conditions see https://neuromore.com/licensing. For further +** information use the contact form at https://neuromore.com/contact. +** +** neuromore Public License Usage +** Alternatively, this file may be used under the terms of the neuromore +** Public License version 1 as published by neuromore co with exceptions as +** appearing in the file neuromore-class-exception.md included in the +** packaging of this file. Please review the following information to +** ensure the neuromore Public License requirements will be met: +** https://neuromore.com/npl +** +****************************************************************************/ + +#include + +#include +#include +#include + +#ifdef ANDROID +#include +#define LOGI(...) ((void)__android_log_print(ANDROID_LOG_INFO, "neuromoreEngine", __VA_ARGS__)) +#define LOGW(...) ((void)__android_log_print(ANDROID_LOG_WARN, "neuromoreEngine", __VA_ARGS__)) +#define LOGE(...) ((void)__android_log_print(ANDROID_LOG_ERROR, "neuromoreEngine", __VA_ARGS__)) +#else +#define LOGI(...) +#define LOGW(...) +#define LOGE(...) +#endif + +#ifdef ANDROID +#define JENVCAST(x) (x) +#else +#define JENVCAST(x) ((void**)x) +#endif + +// a persistent reference to the JavaVM instance +// used to retrieve the JNIEnv* from anywhere +static JavaVM* javavm; + +/********************************************************/ +/* Implementation of the neuromore Callback class */ +/* Will invoke the callbacks on java interface */ +/********************************************************/ +class JNICallback : public neuromoreEngine::Callback +{ +protected: + jclass jcallback; + jmethodID methodOnStop; + jmethodID methodOnPlayAudio; + jmethodID methodOnStopAudio; + jmethodID methodOnPauseAudio; + jmethodID methodOnSetAudioVolume; + jmethodID methodOnSeekAudio; + jmethodID methodOnPlayVideo; + jmethodID methodOnStopVideo; + jmethodID methodOnPauseVideo; + jmethodID methodOnSetVideoVolume; + jmethodID methodOnSeekVideo; + jmethodID methodOnShowImage; + jmethodID methodOnHideImage; + jmethodID methodOnShowText; + jmethodID methodOnHideText; + jmethodID methodOnShowButton; + jmethodID methodOnClearButtons; + jmethodID methodOnCommand; + +private: + void callVoid(jmethodID method, ...) + { + if (!method) + return; + + va_list args; + JNIEnv* env; + + if (JNI_OK == javavm->AttachCurrentThread(JENVCAST(&env), NULL)) + { + va_start(args, method); + env->CallVoidMethod(jcallback, method, args); + va_end(args); + } + } + +public: + JNICallback(JNIEnv* env, jobject callback) + { + // turn java callback instance into a global ref so we can cache it + jcallback = (jclass)env->NewGlobalRef(callback); + + if (!jcallback) + { + LOGE("Failed to convert callback instance into global ref."); + return; + } + + env->DeleteLocalRef(callback); + + // get the java class implementing this ICallback java interface + jclass clazz = env->GetObjectClass(jcallback); + + if (!clazz) + { + LOGE("Failed to retrieve class of callback instance."); + return; + } + + // resolve callback methods from java class implementing callback interface + methodOnStop = env->GetMethodID(clazz, "OnStop", "(I)V"); + methodOnPlayAudio = env->GetMethodID(clazz, "OnPlayAudio", "(Ljava/lang/String;IDD)V"); + methodOnStopAudio = env->GetMethodID(clazz, "OnStopAudio", "(Ljava/lang/String;)V"); + methodOnPauseAudio = env->GetMethodID(clazz, "OnPauseAudio", "(Ljava/lang/String;Z)V"); + methodOnSetAudioVolume = env->GetMethodID(clazz, "OnSetAudioVolume", "(Ljava/lang/String;D)V"); + methodOnSeekAudio = env->GetMethodID(clazz, "OnSeekAudio", "(Ljava/lang/String;I)V"); + methodOnPlayVideo = env->GetMethodID(clazz, "OnPlayVideo", "(Ljava/lang/String;IDD)V"); + methodOnStopVideo = env->GetMethodID(clazz, "OnStopVideo", "()V"); + methodOnPauseVideo = env->GetMethodID(clazz, "OnPauseVideo", "(Ljava/lang/String;Z)V"); + methodOnSetVideoVolume = env->GetMethodID(clazz, "OnSetVideoVolume", "(Ljava/lang/String;D)V"); + methodOnSeekVideo = env->GetMethodID(clazz, "OnSeekVideo", "(Ljava/lang/String;I)V"); + methodOnShowImage = env->GetMethodID(clazz, "OnShowImage", "(Ljava/lang/String;)V"); + methodOnHideImage = env->GetMethodID(clazz, "OnHideImage", "()V"); + methodOnShowText = env->GetMethodID(clazz, "OnShowText", "(Ljava/lang/String;FFFF)V"); + methodOnHideText = env->GetMethodID(clazz, "OnHideText", "()V"); + methodOnShowButton = env->GetMethodID(clazz, "OnShowButton", "(Ljava/lang/String;I)V"); + methodOnClearButtons = env->GetMethodID(clazz, "OnClearButtons", "()V"); + methodOnCommand = env->GetMethodID(clazz, "OnCommand", "(Ljava/lang/String;)V"); + + // log about those not found + if (!methodOnStop) LOGW("Failed to find method 'OnStop' in callback instance."); + if (!methodOnPlayAudio) LOGW("Failed to find method 'OnPlayAudio' in callback instance."); + if (!methodOnStopAudio) LOGW("Failed to find method 'OnStopAudio' in callback instance."); + if (!methodOnPauseAudio) LOGW("Failed to find method 'OnPauseAudio' in callback instance."); + if (!methodOnSetAudioVolume) LOGW("Failed to find method 'OnSetAudioVolume' in callback instance."); + if (!methodOnSeekAudio) LOGW("Failed to find method 'OnSeekAudio' in callback instance."); + if (!methodOnPlayVideo) LOGW("Failed to find method 'OnPlayVideo' in callback instance."); + if (!methodOnStopVideo) LOGW("Failed to find method 'OnStopVideo' in callback instance."); + if (!methodOnPauseVideo) LOGW("Failed to find method 'OnPauseVideo' in callback instance."); + if (!methodOnSetVideoVolume) LOGW("Failed to find method 'OnSetVideoVolume' in callback instance."); + if (!methodOnSeekVideo) LOGW("Failed to find method 'OnSeekVideo' in callback instance."); + if (!methodOnShowImage) LOGW("Failed to find method 'OnShowImage' in callback instance."); + if (!methodOnHideImage) LOGW("Failed to find method 'OnHideImage' in callback instance."); + if (!methodOnShowText) LOGW("Failed to find method 'OnShowText' in callback instance."); + if (!methodOnHideText) LOGW("Failed to find method 'OnHideText' in callback instance."); + if (!methodOnShowButton) LOGW("Failed to find method 'OnShowButton' in callback instance."); + if (!methodOnClearButtons) LOGW("Failed to find method 'OnClearButtons' in callback instance."); + if (!methodOnCommand) LOGW("Failed to find method 'OnCommand' in callback instance."); + } + + ~JNICallback() + { + } + + virtual void OnStop(EStatus status) override + { + JNIEnv* env; + + if (!methodOnStop || (JNI_OK != javavm->AttachCurrentThread(JENVCAST(&env), NULL))) + return; + + env->CallVoidMethod(jcallback, methodOnStop, (int)status); + } + + virtual void OnLogBackend(const char* message, const char* logLevel, const char* logTime) override + { + LOGI(message); + } + + virtual void OnLog(const char* message) override + { + LOGI(message); + } + + //////////////////////////////////////////////// + // Multimedia Actions for State Machine + //////////////////////////////////////////////// + + virtual void OnPlayAudio(const char* url, int numLoops, double beginAt = 0.0, double volume = 1.0) override + { + JNIEnv* env; + + if (!methodOnPlayAudio || (JNI_OK != javavm->AttachCurrentThread(JENVCAST(&env), NULL))) + return; + + env->CallVoidMethod(jcallback, methodOnPlayAudio, + env->NewStringUTF(url), numLoops, beginAt, volume); + } + + virtual void OnStopAudio(const char* url) override + { + JNIEnv* env; + + if (!methodOnStopAudio || (JNI_OK != javavm->AttachCurrentThread(JENVCAST(&env), NULL))) + return; + + env->CallVoidMethod(jcallback, methodOnStopAudio, + env->NewStringUTF(url)); + } + + virtual void OnPauseAudio(const char* url, bool unPause) override + { + JNIEnv* env; + + if (!methodOnPauseAudio || (JNI_OK != javavm->AttachCurrentThread(JENVCAST(&env), NULL))) + return; + + env->CallVoidMethod(jcallback, methodOnPauseAudio, + env->NewStringUTF(url), unPause); + } + + virtual void OnSetAudioVolume(const char* url, double volume) override + { + JNIEnv* env; + + if (!methodOnSetAudioVolume || (JNI_OK != javavm->AttachCurrentThread(JENVCAST(&env), NULL))) + return; + + env->CallVoidMethod(jcallback, methodOnSetAudioVolume, + env->NewStringUTF(url), volume); + } + + virtual void OnSeekAudio(const char* url, int millisecs) override + { + JNIEnv* env; + + if (!methodOnSeekAudio || (JNI_OK != javavm->AttachCurrentThread(JENVCAST(&env), NULL))) + return; + + env->CallVoidMethod(jcallback, methodOnSeekAudio, + env->NewStringUTF(url), millisecs); + } + + virtual void OnPlayVideo(const char* url, int numLoops, double beginAt = 0.0, double volume = 1.0) override + { + JNIEnv* env; + + if (!methodOnPlayVideo || (JNI_OK != javavm->AttachCurrentThread(JENVCAST(&env), NULL))) + return; + + env->CallVoidMethod(jcallback, methodOnPlayVideo, + env->NewStringUTF(url), numLoops, beginAt, volume); + } + + virtual void OnStopVideo() override + { + JNIEnv* env; + + if (!methodOnStopVideo || (JNI_OK != javavm->AttachCurrentThread(JENVCAST(&env), NULL))) + return; + + env->CallVoidMethod(jcallback, methodOnStopVideo); + } + + virtual void OnPauseVideo(const char* url, bool unPause) override + { + JNIEnv* env; + + if (!methodOnPauseVideo || (JNI_OK != javavm->AttachCurrentThread(JENVCAST(&env), NULL))) + return; + + env->CallVoidMethod(jcallback, methodOnPauseVideo, + env->NewStringUTF(url), unPause); + } + + virtual void OnSetVideoVolume(const char* url, double volume) override + { + JNIEnv* env; + + if (!methodOnSetVideoVolume || (JNI_OK != javavm->AttachCurrentThread(JENVCAST(&env), NULL))) + return; + + env->CallVoidMethod(jcallback, methodOnSetVideoVolume, + env->NewStringUTF(url), volume); + } + + virtual void OnSeekVideo(const char* url, int millisecs) override + { + JNIEnv* env; + + if (!methodOnSeekVideo || (JNI_OK != javavm->AttachCurrentThread(JENVCAST(&env), NULL))) + return; + + env->CallVoidMethod(jcallback, methodOnSeekVideo, + env->NewStringUTF(url), millisecs); + } + + virtual void OnShowImage(const char* url) override + { + JNIEnv* env; + + if (!methodOnShowImage || (JNI_OK != javavm->AttachCurrentThread(JENVCAST(&env), NULL))) + return; + + env->CallVoidMethod(jcallback, methodOnShowImage, + env->NewStringUTF(url)); + } + + virtual void OnHideImage() override + { + JNIEnv* env; + + if (!methodOnHideImage || (JNI_OK != javavm->AttachCurrentThread(JENVCAST(&env), NULL))) + return; + + env->CallVoidMethod(jcallback, methodOnHideImage); + } + + virtual void OnShowText(const char* text, float colorR, float colorG, float colorB, float colorA) override + { + JNIEnv* env; + + if (!methodOnShowText || (JNI_OK != javavm->AttachCurrentThread(JENVCAST(&env), NULL))) + return; + + env->CallVoidMethod(jcallback, methodOnShowText, + env->NewStringUTF(text), colorR, colorG, colorB, colorA); + } + + virtual void OnHideText() override + { + JNIEnv* env; + + if (!methodOnHideText || (JNI_OK != javavm->AttachCurrentThread(JENVCAST(&env), NULL))) + return; + + env->CallVoidMethod(jcallback, methodOnHideText); + } + + virtual void OnShowButton(const char* text, int buttonId) override + { + JNIEnv* env; + + if (!methodOnShowButton || (JNI_OK != javavm->AttachCurrentThread(JENVCAST(&env), NULL))) + return; + + env->CallVoidMethod(jcallback, methodOnShowButton, + env->NewStringUTF(text), buttonId); + } + + virtual void OnClearButtons() override + { + JNIEnv* env; + + if (!methodOnClearButtons || (JNI_OK != javavm->AttachCurrentThread(JENVCAST(&env), NULL))) + return; + + env->CallVoidMethod(jcallback, methodOnClearButtons); + } + + virtual void OnCommand(const char* command) override + { + JNIEnv* env; + + if (!methodOnCommand || (JNI_OK != javavm->AttachCurrentThread(JENVCAST(&env), NULL))) + return; + + env->CallVoidMethod(jcallback, methodOnCommand, + env->NewStringUTF(command)); + } +}; + +// stores an instance of our callback implementation +// note: this is destroyed by the neuromore shutdown. +static JNICallback* callback; + +/***********************************************************************************************************************************************************************/ +/******************************************************************** JNI API ***********************************************************************************/ +/***********************************************************************************************************************************************************************/ +extern "C" +{ + JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM* jvm, void* reserved) + { + LOGI("JNI starting up.."); + + // keep a global reference to the jvm + // so we can get a JNIEnv* from anywhere (can't cache JNIEnv*) + javavm = jvm; + + // define jni interface version + return JNI_VERSION_1_6; + } + + JNIEXPORT void JNICALL JNI_OnUnload(JavaVM* jvm, void* reserved) + { + // cleanup if necessary + } + + ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// + // Engine initialization + ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// + + JNIEXPORT jboolean JNICALL Java_com_neuromore_engine_Wrapper_SetPowerLineFrequencyType(JNIEnv* env, jobject thiz, jint powerLineFrequencyType) + { + return neuromoreEngine::SetPowerLineFrequencyType((neuromoreEngine::EPowerLineFrequencyType)powerLineFrequencyType); + } + + JNIEXPORT jdouble JNICALL Java_com_neuromore_engine_Wrapper_GetPowerLineFrequency(JNIEnv* env, jobject thiz) + { + return neuromoreEngine::GetPowerLineFrequency(); + } + + JNIEXPORT jboolean JNICALL Java_com_neuromore_engine_Wrapper_SetBufferLength(JNIEnv* env, jobject thiz, jdouble seconds) + { + return neuromoreEngine::SetBufferLength(seconds); + } + + JNIEXPORT void JNICALL Java_com_neuromore_engine_Wrapper_Init(JNIEnv* env, jobject thiz, jobject jcallback) + { + // no need to init twice + if (neuromoreEngine::IsInitialized()) + return; + + neuromoreEngine::Init(); + + // init didn't work :( + if (!neuromoreEngine::IsInitialized()) + return; + + // create a callback handler and set it + callback = new JNICallback(env, jcallback); + neuromoreEngine::SetCallback(callback); + + // log + callback->OnLog("Initialization successful"); + } + + JNIEXPORT jboolean JNICALL Java_com_neuromore_engine_Wrapper_IsInitialized(JNIEnv* env, jobject thiz) + { + return neuromoreEngine::IsInitialized(); + } + + JNIEXPORT void JNICALL Java_com_neuromore_engine_Wrapper_Shutdown(JNIEnv* env, jobject thiz) + { + if (!neuromoreEngine::IsInitialized()) + return; + + // this is going to be destroyed by shutdown, + // so make sure we forget it + callback = NULL; + + neuromoreEngine::Shutdown(); + } + + ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// + // Engine basics: Start, Stop, Cleanup, Update etc + ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// + + JNIEXPORT jboolean JNICALL Java_com_neuromore_engine_Wrapper_IsReady(JNIEnv* env, jobject thiz) + { + return neuromoreEngine::IsReady(); + } + + JNIEXPORT void JNICALL Java_com_neuromore_engine_Wrapper_SetSessionLength(JNIEnv* env, jobject thiz, jdouble seconds) + { + neuromoreEngine::SetSessionLength(seconds); + } + + JNIEXPORT jboolean JNICALL Java_com_neuromore_engine_Wrapper_Start(JNIEnv* env, jobject thiz) + { + return neuromoreEngine::Start(); + } + + JNIEXPORT jboolean JNICALL Java_com_neuromore_engine_Wrapper_StartThreaded(JNIEnv* env, jobject thiz) + { + return neuromoreEngine::StartThreaded(); + } + + JNIEXPORT jboolean JNICALL Java_com_neuromore_engine_Wrapper_Update(JNIEnv* env, jobject thiz) + { + return neuromoreEngine::Update(); + } + + JNIEXPORT jboolean JNICALL Java_com_neuromore_engine_Wrapper_IsRunning(JNIEnv* env, jobject thiz) + { + return neuromoreEngine::IsRunning(); + } + + JNIEXPORT jboolean JNICALL Java_com_neuromore_engine_Wrapper_Stop(JNIEnv* env, jobject thiz) + { + return neuromoreEngine::Stop(); + } + + JNIEXPORT jboolean JNICALL Java_com_neuromore_engine_Wrapper_StopThreaded(JNIEnv* env, jobject thiz) + { + return neuromoreEngine::StopThreaded(); + } + + JNIEXPORT void JNICALL Java_com_neuromore_engine_Wrapper_Reset(JNIEnv* env, jobject thiz) + { + neuromoreEngine::Reset(); + } + + ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// + // Helpers + ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// + + JNIEXPORT void JNICALL Java_com_neuromore_engine_Wrapper_EnableDebugLogging(JNIEnv* env, jobject thiz) + { + neuromoreEngine::EnableDebugLogging(); + } + + JNIEXPORT void JNICALL Java_com_neuromore_engine_Wrapper_SetAllowAssetStreaming(JNIEnv* env, jobject thiz, jboolean allow) + { + neuromoreEngine::SetAllowAssetStreaming(allow); + } + + ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// + // Devices + ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// + + JNIEXPORT jint JNICALL Java_com_neuromore_engine_Wrapper_AddDevice(JNIEnv* env, jobject thiz, jint deviceType) + { + return neuromoreEngine::AddDevice((neuromoreEngine::EDevice)deviceType); + } + + JNIEXPORT jint JNICALL Java_com_neuromore_engine_Wrapper_GetNumDevices(JNIEnv* env, jobject thiz) + { + return neuromoreEngine::GetNumDevices(); + } + + JNIEXPORT jboolean JNICALL Java_com_neuromore_engine_Wrapper_RemoveDevice(JNIEnv* env, jobject thiz, jint deviceIndex) + { + return neuromoreEngine::RemoveDevice(deviceIndex); + } + + JNIEXPORT jint JNICALL Java_com_neuromore_engine_Wrapper_GetDevice(JNIEnv* env, jobject thiz, jint deviceIndex) + { + return neuromoreEngine::GetDevice(deviceIndex); + } + + JNIEXPORT jboolean JNICALL Java_com_neuromore_engine_Wrapper_HasDevice(JNIEnv* env, jobject thiz, jint deviceType) + { + return neuromoreEngine::HasDevice((neuromoreEngine::EDevice)deviceType); + } + + JNIEXPORT jboolean JNICALL Java_com_neuromore_engine_Wrapper_ConnectDevice(JNIEnv* env, jobject thiz, jint deviceIndex) + { + return neuromoreEngine::ConnectDevice(deviceIndex); + } + + JNIEXPORT jboolean JNICALL Java_com_neuromore_engine_Wrapper_DisconnectDevice(JNIEnv* env, jobject thiz, jint deviceIndex) + { + return neuromoreEngine::DisonnectDevice(deviceIndex); + } + + JNIEXPORT jint JNICALL Java_com_neuromore_engine_Wrapper_GetNumInputs(JNIEnv* env, jobject thiz, jint deviceIndex) + { + return neuromoreEngine::GetNumInputs(deviceIndex); + } + + JNIEXPORT jboolean JNICALL Java_com_neuromore_engine_Wrapper_AddInputSample(JNIEnv* env, jobject thiz, jint deviceIndex, jint inputIndex, jdouble value) + { + return neuromoreEngine::AddInputSample(deviceIndex, inputIndex, value); + } + + JNIEXPORT jboolean JNICALL Java_com_neuromore_engine_Wrapper_SetBatteryChargeLevel(JNIEnv* env, jobject thiz, jint deviceIndex, jdouble normalizedCharge) + { + return neuromoreEngine::SetBatteryChargeLevel(deviceIndex, normalizedCharge); + } + + ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// + // Classifier + ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// + + JNIEXPORT jboolean JNICALL Java_com_neuromore_engine_Wrapper_LoadClassifier(JNIEnv* env, jobject thiz, jstring jsonContent, jstring uuid, jint revision) + { + const char* cstr_jsonContent = env->GetStringUTFChars(jsonContent, NULL); + const char* cstr_uuid = env->GetStringUTFChars(uuid, NULL); + + bool ok = neuromoreEngine::LoadClassifier(cstr_jsonContent, cstr_uuid, revision); + + env->ReleaseStringUTFChars(jsonContent, cstr_jsonContent); + env->ReleaseStringUTFChars(uuid, cstr_uuid); + + return ok; + } + + JNIEXPORT jboolean JNICALL Java_com_neuromore_engine_Wrapper_HasClassifier(JNIEnv* env, jobject thiz) + { + return neuromoreEngine::HasClassifier(); + } + + JNIEXPORT jboolean JNICALL Java_com_neuromore_engine_Wrapper_IsDeviceRequiredByClassifier(JNIEnv* env, jobject thiz, jint deviceType) + { + return neuromoreEngine::IsDeviceRequiredByClassifier((neuromoreEngine::EDevice)deviceType); + } + + JNIEXPORT jint JNICALL Java_com_neuromore_engine_Wrapper_GetNumFeedbacks(JNIEnv* env, jobject thiz) + { + return neuromoreEngine::GetNumFeedbacks(); + } + + JNIEXPORT jstring JNICALL Java_com_neuromore_engine_Wrapper_GetFeedbackName(JNIEnv* env, jobject thiz, jint index) + { + return env->NewStringUTF(neuromoreEngine::GetFeedbackName(index)); + } + + JNIEXPORT jdouble JNICALL Java_com_neuromore_engine_Wrapper_GetCurrentFeedbackValue(JNIEnv* env, jobject thiz, jint index) + { + return neuromoreEngine::GetCurrentFeedbackValue(index); + } + + /*JNIEXPORT void JNICALL Java_com_neuromore_engine_Wrapper_GetFeedbackRange(JNIEnv* env, jobject thiz, jint index, jdoubleArray values) + { + env->doublearray + //neuromoreEngine::GetFeedbackRange(index, values, value); + }*/ + + ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// + // Cloud Data Serialization + ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// + + JNIEXPORT jstring JNICALL Java_com_neuromore_engine_Wrapper_GetCreateDataChunkJson(JNIEnv* env, jobject thiz, jstring userId, jstring experienceUuid, jint experienceRevision) + { + const char* cstr_userId = env->GetStringUTFChars(userId, NULL); + const char* cstr_experienceUuid = env->GetStringUTFChars(experienceUuid, NULL); + + const char* cstr_req = neuromoreEngine::GetCreateDataChunkJson(cstr_userId, cstr_experienceUuid, experienceRevision); + + env->ReleaseStringUTFChars(userId, cstr_userId); + env->ReleaseStringUTFChars(experienceUuid, cstr_experienceUuid); + + return env->NewStringUTF(cstr_req); + } + + JNIEXPORT jint JNICALL Java_com_neuromore_engine_Wrapper_GetNumDataChunkChannels(JNIEnv* env, jobject thiz) + { + return neuromoreEngine::GetNumDataChunkChannels(); + } + + JNIEXPORT jstring JNICALL Java_com_neuromore_engine_Wrapper_GetDataChunkChannelJson(JNIEnv* env, jobject thiz, jstring userId, jstring dataChunkUuid, jint channelIndex) + { + const char* cstr_userId = env->GetStringUTFChars(userId, NULL); + const char* cstr_dataChunkUuid = env->GetStringUTFChars(dataChunkUuid, NULL); + + const char* cstr_req = neuromoreEngine::GetDataChunkChannelJson(cstr_userId, cstr_dataChunkUuid, channelIndex); + + env->ReleaseStringUTFChars(userId, cstr_userId); + env->ReleaseStringUTFChars(dataChunkUuid, cstr_dataChunkUuid); + + return env->NewStringUTF(cstr_req); + } + + JNIEXPORT jbyteArray JNICALL Java_com_neuromore_engine_Wrapper_GetDataChunkChannelData(JNIEnv* env, jobject thiz, jint channelIndex) + { + // try generate datachunk for this channel + if (!neuromoreEngine::GenerateDataChunkChannelData(channelIndex)) + return env->NewByteArray(0); + + // try get size and native data + const int size = neuromoreEngine::GetDataChunkChannelDataSize(channelIndex); + const char* data = neuromoreEngine::GetDataChunkChannelData(channelIndex); + + // invalid size or data + if (size <= 0 || !data) + return env->NewByteArray(0); + + // allocate java byte array + jbyteArray jdata = env->NewByteArray(size); + + // this will copy data from native ptr to java byte array + env->SetByteArrayRegion(jdata, 0, size, (jbyte*)data); + + // clear native data + neuromoreEngine::ClearDataChunkChannelData(); + + return jdata; + } + + ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// + // Classifier Cloud Parameters + ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// + + JNIEXPORT jstring JNICALL Java_com_neuromore_engine_Wrapper_CreateJSONRequestFindParameters(JNIEnv* env, jobject thiz, jstring userId) + { + const char* cstr_userId = env->GetStringUTFChars(userId, NULL); + const char* cstr_req = neuromoreEngine::CreateJSONRequestFindParameters(cstr_userId); + env->ReleaseStringUTFChars(userId, cstr_userId); + + return env->NewStringUTF(cstr_req); + } + + JNIEXPORT jboolean JNICALL Java_com_neuromore_engine_Wrapper_HandleJSONReplyFindParameters(JNIEnv* env, jobject thiz, jstring jsonString, jstring userId) + { + const char* cstr_jsonString = env->GetStringUTFChars(jsonString, NULL); + const char* cstr_userId = env->GetStringUTFChars(userId, NULL); + + bool ok = neuromoreEngine::HandleJSONReplyFindParameters(cstr_jsonString, cstr_userId); + + env->ReleaseStringUTFChars(jsonString, cstr_jsonString); + env->ReleaseStringUTFChars(userId, cstr_userId); + + return ok; + } + + JNIEXPORT jstring JNICALL Java_com_neuromore_engine_Wrapper_CreateJSONRequestSetParameters(JNIEnv* env, jobject thiz) + { + return env->NewStringUTF(neuromoreEngine::CreateJSONRequestSetParameters()); + } + + ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// + // State Machine + ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// + + JNIEXPORT jboolean JNICALL Java_com_neuromore_engine_Wrapper_LoadStateMachine(JNIEnv* env, jobject thiz, jstring jsonContent, jstring uuid, jint revision) + { + const char* cstr_jsonContent = env->GetStringUTFChars(jsonContent, NULL); + const char* cstr_uuid = env->GetStringUTFChars(uuid, NULL); + + bool ok = neuromoreEngine::LoadStateMachine(cstr_jsonContent, cstr_uuid, revision); + + env->ReleaseStringUTFChars(jsonContent, cstr_jsonContent); + env->ReleaseStringUTFChars(uuid, cstr_uuid); + + return ok; + } + + JNIEXPORT jboolean JNICALL Java_com_neuromore_engine_Wrapper_HasStateMachine(JNIEnv* env, jobject thiz) + { + return neuromoreEngine::HasStateMachine(); + } + + ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// + // Multimedia Assets + ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// + + JNIEXPORT jint JNICALL Java_com_neuromore_engine_Wrapper_GetNumAssetsOfType(JNIEnv* env, jobject thiz, jint type) + { + return neuromoreEngine::GetNumAssetsOfType((neuromoreEngine::AssetType)type); + } + + JNIEXPORT jstring JNICALL Java_com_neuromore_engine_Wrapper_GetAssetLocationOfType(JNIEnv* env, jobject thiz, jint type, jint index) + { + return env->NewStringUTF(neuromoreEngine::GetAssetLocationOfType((neuromoreEngine::AssetType)type, index)); + } + + JNIEXPORT jboolean JNICALL Java_com_neuromore_engine_Wrapper_GetAssetAllowStreamingOfType(JNIEnv* env, jobject thiz, jint type, jint index) + { + return neuromoreEngine::GetAssetAllowStreamingOfType((neuromoreEngine::AssetType)type, index); + } + + JNIEXPORT jint JNICALL Java_com_neuromore_engine_Wrapper_GetNumAssets(JNIEnv* env, jobject thiz) + { + return neuromoreEngine::GetNumAssets(); + } + + JNIEXPORT jstring JNICALL Java_com_neuromore_engine_Wrapper_GetAssetLocation(JNIEnv* env, jobject thiz, jint index) + { + return env->NewStringUTF(neuromoreEngine::GetAssetLocation(index)); + } + + JNIEXPORT jboolean JNICALL Java_com_neuromore_engine_Wrapper_GetAssetAllowStreaming(JNIEnv* env, jobject thiz, jint index) + { + return neuromoreEngine::GetAssetAllowStreaming(index); + } + + JNIEXPORT jboolean JNICALL Java_com_neuromore_engine_Wrapper_ButtonClicked(JNIEnv* env, jobject thiz, jint buttonId) + { + return neuromoreEngine::ButtonClicked(buttonId); + } + + JNIEXPORT jboolean JNICALL Java_com_neuromore_engine_Wrapper_AudioLooped(JNIEnv* env, jobject thiz, jstring url) + { + const char* cstr_url = env->GetStringUTFChars(url, NULL); + + bool ok = neuromoreEngine::AudioLooped(cstr_url); + + env->ReleaseStringUTFChars(url, cstr_url); + + return ok; + } + + JNIEXPORT jboolean JNICALL Java_com_neuromore_engine_Wrapper_VideoLooped(JNIEnv* env, jobject thiz, jstring url) + { + const char* cstr_url = env->GetStringUTFChars(url, NULL); + + bool ok = neuromoreEngine::VideoLooped(cstr_url); + + env->ReleaseStringUTFChars(url, cstr_url); + + return ok; + } +}