From 50f2a91e525686c867cfb621e0e95848bf715e03 Mon Sep 17 00:00:00 2001 From: Nicolas Bouquet Date: Thu, 15 Dec 2016 11:32:16 +0100 Subject: [PATCH] [scripts] be less verbose, and don't use bitcode for simulator libs --- desktop/desktop.pro | 1 + fontcreator/fontcreator.pro | 1 + gdrbridge/gdrbridge.pro | 1 + gdrdeamon/gdrdeamon.pro | 2 ++ gdrexport/gdrexport.pro | 1 + libgid/libgid_qt5.pro | 1 + libgvfs/libgvfs.pro | 1 + libpystring/libpystring.pro | 1 + lua/lua.pro | 1 + player/player_qt5.pro | 1 + scripts/GidWinRT.mk | 8 ++++---- scripts/GidiOS.mk | 4 ++-- texturepacker/texturepacker.pro | 1 + ui/ui.pro | 1 + 14 files changed, 19 insertions(+), 6 deletions(-) diff --git a/desktop/desktop.pro b/desktop/desktop.pro index 7f25bfeb6..cdadd8541 100644 --- a/desktop/desktop.pro +++ b/desktop/desktop.pro @@ -1,4 +1,5 @@ QT += core gui opengl network multimedia +CONFIG += silent win32{ RC_FILE = other_files/desktop.rc diff --git a/fontcreator/fontcreator.pro b/fontcreator/fontcreator.pro index 12a27a4d6..651d9f6d5 100644 --- a/fontcreator/fontcreator.pro +++ b/fontcreator/fontcreator.pro @@ -5,6 +5,7 @@ #------------------------------------------------- QT += core gui +CONFIG += silent greaterThan(QT_MAJOR_VERSION, 4): QT += widgets diff --git a/gdrbridge/gdrbridge.pro b/gdrbridge/gdrbridge.pro index 7f56fb44c..679d5b463 100644 --- a/gdrbridge/gdrbridge.pro +++ b/gdrbridge/gdrbridge.pro @@ -11,6 +11,7 @@ QT -= gui TARGET = gdrbridge CONFIG += console CONFIG -= app_bundle +CONFIG += silent TEMPLATE = app diff --git a/gdrdeamon/gdrdeamon.pro b/gdrdeamon/gdrdeamon.pro index a323799e7..6cac4b144 100644 --- a/gdrdeamon/gdrdeamon.pro +++ b/gdrdeamon/gdrdeamon.pro @@ -11,6 +11,8 @@ QT -= gui TARGET = gdrdeamon #CONFIG += console CONFIG -= app_bundle +CONFIG += silent + TEMPLATE = app diff --git a/gdrexport/gdrexport.pro b/gdrexport/gdrexport.pro index 69f84401f..1545ac158 100644 --- a/gdrexport/gdrexport.pro +++ b/gdrexport/gdrexport.pro @@ -11,6 +11,7 @@ QT += core network xml TARGET = gdrexport CONFIG += console CONFIG -= app_bundle +CONFIG += silent TEMPLATE = app diff --git a/libgid/libgid_qt5.pro b/libgid/libgid_qt5.pro index 3dcd2990a..742576bd2 100644 --- a/libgid/libgid_qt5.pro +++ b/libgid/libgid_qt5.pro @@ -8,6 +8,7 @@ QT += opengl network TARGET = gid TEMPLATE = lib +CONFIG += silent DEFINES += GIDEROS_LIBRARY diff --git a/libgvfs/libgvfs.pro b/libgvfs/libgvfs.pro index c9d28ad92..f3e235019 100644 --- a/libgvfs/libgvfs.pro +++ b/libgvfs/libgvfs.pro @@ -2,6 +2,7 @@ QT += TARGET = gvfs TEMPLATE = lib +CONFIG += silent DEFINES += GIDEROS_LIBRARY diff --git a/libpystring/libpystring.pro b/libpystring/libpystring.pro index 529c29947..680f17a57 100644 --- a/libpystring/libpystring.pro +++ b/libpystring/libpystring.pro @@ -8,6 +8,7 @@ QT -= gui TARGET = pystring TEMPLATE = lib +CONFIG += silent DEFINES += PYSTRING_LIBRARY diff --git a/lua/lua.pro b/lua/lua.pro index 3df74d907..4a13c2fc6 100644 --- a/lua/lua.pro +++ b/lua/lua.pro @@ -8,6 +8,7 @@ QT -= core gui TARGET = lua TEMPLATE = lib +CONFIG += silent win32 { DEFINES += LUA_BUILD_AS_DLL diff --git a/player/player_qt5.pro b/player/player_qt5.pro index 226c6ff23..5fef5b9f0 100644 --- a/player/player_qt5.pro +++ b/player/player_qt5.pro @@ -1,4 +1,5 @@ QT += core gui opengl network multimedia +CONFIG += silent INCLUDEPATH += \ "../libgid/external/zlib-1.2.8"\ diff --git a/scripts/GidWinRT.mk b/scripts/GidWinRT.mk index d2c452baf..5b0008358 100644 --- a/scripts/GidWinRT.mk +++ b/scripts/GidWinRT.mk @@ -9,9 +9,9 @@ WINRT_PROJECT=$(1)/$(2)/$(2).$(3)/$(2).$(3).vcxproj #$(call WINRT_MANIFEST basepath name target) WINRT_MANIFEST=$(1)/$(2)/$(2).$(3)/$(2).$(3).Package.appxmanifest #$(call WINRT_BUILD_WIN basepath name) -WINRT_BUILD_WIN=$(MSBUILD) $(call WINRT_PROJECT,$(1),$(2),Windows) //p:Configuration=Release //p:Platform=Win32 +WINRT_BUILD_WIN=$(MSBUILD) $(call WINRT_PROJECT,$(1),$(2),Windows) //p:Configuration=Release //p:Platform=Win32 //v:m #$(call WINRT_BUILD_WP basepath name) -WINRT_BUILD_WP=$(MSBUILD) $(call WINRT_PROJECT,$(1),$(2),WindowsPhone) //p:Configuration=Release //p:Platform=ARM +WINRT_BUILD_WP=$(MSBUILD) $(call WINRT_PROJECT,$(1),$(2),WindowsPhone) //p:Configuration=Release //p:Platform=ARM //v:m WINRT_APPX_GIDVERSION_LIST:=$(subst ., ,$(GIDEROS_VERSION)) 0 0 0 0 @@ -84,12 +84,12 @@ winrt.player: winrt.template rm -rf /c/winrt_player cp winrt_example/giderosgame/giderosgame.WindowsPhone/Package.appxmanifest winrt_example/giderosgame/giderosgame.WindowsPhone/Package.appxmanifest.bak sed -e 's/Version="[^"]*"/Version="$(WINRT_APPX_GIDVERSION)"/' winrt_example/giderosgame/giderosgame.WindowsPhone/Package.appxmanifest.bak >winrt_example/giderosgame/giderosgame.WindowsPhone/Package.appxmanifest - $(MSBUILD) winrt_example/giderosgame/giderosgame.WindowsPhone/giderosgame.WindowsPhone.vcxproj //t:Publish //p:Configuration=Release //p:Platform=ARM //p:AppxBundle=Always + $(MSBUILD) winrt_example/giderosgame/giderosgame.WindowsPhone/giderosgame.WindowsPhone.vcxproj //t:Publish //p:Configuration=Release //p:Platform=ARM //p:AppxBundle=Always //v:m cp winrt_example/giderosgame/giderosgame.WindowsPhone/Package.appxmanifest.bak winrt_example/giderosgame/giderosgame.WindowsPhone/Package.appxmanifest rm winrt_example/giderosgame/giderosgame.WindowsPhone/Package.appxmanifest.bak cp winrt_example/giderosgame/giderosgame.Windows/Package.appxmanifest winrt_example/giderosgame/giderosgame.Windows/Package.appxmanifest.bak sed -e 's/Version="[^"]*"/Version="$(WINRT_APPX_GIDVERSION)"/' winrt_example/giderosgame/giderosgame.Windows/Package.appxmanifest.bak >winrt_example/giderosgame/giderosgame.Windows/Package.appxmanifest - $(MSBUILD) winrt_example/giderosgame/giderosgame.Windows/giderosgame.Windows.vcxproj //t:Publish //p:Configuration=Release //p:Platform=Win32 //p:AppxBundle=Always + $(MSBUILD) winrt_example/giderosgame/giderosgame.Windows/giderosgame.Windows.vcxproj //t:Publish //p:Configuration=Release //p:Platform=Win32 //p:AppxBundle=Always //V:m cp winrt_example/giderosgame/giderosgame.Windows/Package.appxmanifest.bak winrt_example/giderosgame/giderosgame.Windows/Package.appxmanifest rm winrt_example/giderosgame/giderosgame.Windows/Package.appxmanifest.bak mkdir -p $(RELEASE)/Players diff --git a/scripts/GidiOS.mk b/scripts/GidiOS.mk index 260eb3e67..d66714cf1 100644 --- a/scripts/GidiOS.mk +++ b/scripts/GidiOS.mk @@ -14,13 +14,13 @@ iosplayer.atv.libs: IOSLIBPATH=$(ROOT)/ios/iosplayer ##RULES %.ios.libs: #BUILDING $* - @cd $(IOSLIBPATH); $(XCODEBUILD) -alltargets -sdk iphonesimulator$$IOS_SDK -configuration Release -project $*.xcodeproj OTHER_CFLAGS="-fembed-bitcode" + @cd $(IOSLIBPATH); $(XCODEBUILD) -alltargets -sdk iphonesimulator$$IOS_SDK -configuration Release -project $*.xcodeproj @cd $(IOSLIBPATH); $(XCODEBUILD) -alltargets -sdk iphoneos$$IOS_SDK -configuration Release -project $*.xcodeproj OTHER_CFLAGS="-fembed-bitcode" @cd $(IOSLIBPATH); $(LIPO) build/Release-iphoneos/lib$*.a build/Release-iphonesimulator/lib$*.a -create -output lib$*.ios.a %.atv.libs: #BUILDING $* - @cd $(IOSLIBPATH); $(XCODEBUILD) -alltargets -sdk appletvsimulator$$TVOS_SDK -configuration Release -project $*.xcodeproj GCC_PREPROCESSOR_DEFINITIONS='$${inherited} TARGET_OS_TV=1' OTHER_CFLAGS="-fembed-bitcode" + @cd $(IOSLIBPATH); $(XCODEBUILD) -alltargets -sdk appletvsimulator$$TVOS_SDK -configuration Release -project $*.xcodeproj GCC_PREPROCESSOR_DEFINITIONS='$${inherited} TARGET_OS_TV=1' @cd $(IOSLIBPATH); $(XCODEBUILD) -alltargets -sdk appletvos$$TVOS_SDK -configuration Release -project $*.xcodeproj GCC_PREPROCESSOR_DEFINITIONS='$${inherited} TARGET_OS_TV=1' OTHER_CFLAGS="-fembed-bitcode" @cd $(IOSLIBPATH); $(LIPO) build/Release-appletvos/lib$*.a build/Release-appletvsimulator/lib$*.a -create -output lib$*.atv.a diff --git a/texturepacker/texturepacker.pro b/texturepacker/texturepacker.pro index ac11d866d..cd3121c4c 100644 --- a/texturepacker/texturepacker.pro +++ b/texturepacker/texturepacker.pro @@ -5,6 +5,7 @@ #------------------------------------------------- QT += core gui xml +CONFIG += silent greaterThan(QT_MAJOR_VERSION, 4): QT += widgets diff --git a/ui/ui.pro b/ui/ui.pro index 0fab72f38..e907de102 100644 --- a/ui/ui.pro +++ b/ui/ui.pro @@ -5,6 +5,7 @@ #------------------------------------------------- QT += core gui xml network +CONFIG += silent greaterThan(QT_MAJOR_VERSION, 4): QT += widgets