From 88d9c64befc65a554469028c6496f2fae6192d39 Mon Sep 17 00:00:00 2001
From: Jammyjamjamman <jdsherratt3@gmail.com>
Date: Sat, 30 Mar 2019 01:19:49 +0000
Subject: [PATCH] Stuff to make flatpak build work...

---
 mk/flatpak/glest.ini       | 93 ++++++++++++++++++++++++++++++++++++++
 source/game/CMakeLists.txt |  6 ++-
 2 files changed, 98 insertions(+), 1 deletion(-)
 create mode 100644 mk/flatpak/glest.ini

diff --git a/mk/flatpak/glest.ini b/mk/flatpak/glest.ini
new file mode 100644
index 000000000..6545c152c
--- /dev/null
+++ b/mk/flatpak/glest.ini
@@ -0,0 +1,93 @@
+; === propertyMap File ===
+; This file defines default properties and values. Do not edit this file,
+; instead, to modify, copy any properties to glestuser.ini, then change these as
+; needed. Values contained in glestuser.ini will overwrite values found here.
+;
+AiLog=0
+AiRedir=false
+AllowDownloadDataSynch=false
+AllowGameDataSynchCheck=false
+AllowRotateUnits=true
+AutoMaxFullScreen=false
+AutoTest=false
+CheckGlCaps=true
+ColorBits=32
+ConsoleMaxLines=6
+ConsoleMaxLinesStored=25
+ConsoleTimeout=20
+DataPath=/app/share/glest
+LogPath=$HOME/.glest/
+DayTime=1000
+DebugLogFile=debug.log
+DebugMode=false
+DebugPerformance=false
+DebugNetwork=false
+DebugWorldSynch=false
+DefaultActionAttack=1
+DepthBits=16
+FactoryGraphics=OpenGL
+FactorySound=OpenAL
+FastSpeedLoops=8
+FileArchiveExtension=.7z
+FileArchiveExtractCommand=7z
+FileArchiveExtractCommandParameters=x -o{outputpath} {archivename}
+FileArchiveExtractCommandSuccessResult=0
+FileArchiveCompressCommand=7z
+FileArchiveCompressCommandParameters=a -r -xr!?svn\* {archivename} {archivefiles}
+FileArchiveCompressCommandSuccessResult=0
+Filter=Bilinear
+FilterMaxAnisotropy=1
+FirstTime=false
+FocusArrows=true
+FogOfWarSmoothing=true
+FogOfWarSmoothingFrameSkip=3
+FontConsoleBaseSize=14
+FontConsolePostfix=-*-*-*-*-*-*-*
+FontConsolePrefix=-*-arial-*-r-*-*-
+FontDisplayBaseSize=12
+FontDisplayPostfix=-*-*-*-*-*-*-*
+FontDisplayPrefix=-*-arial-*-r-*-*-
+FontDisplaySmallBaseSize=12
+FontMenuBigBaseSize=20
+FontMenuBigPostfix=-*-*-*-*-*-*-*
+FontMenuBigPrefix=-*-arial-*-r-*-*-
+FontMenuNormalBaseSize=14
+FontMenuNormalPostfix=-*-*-*-*-*-*-*
+FontMenuNormalPrefix=-*-arial-*-r-*-*-
+FontMenuVeryBigBaseSize=25
+FontSizeAdjustment=0
+FONT_HEIGHT_TEXT=yW
+IRCServer=irc.freenode.net
+IRCChannel=#glest-lobby
+Lang=english
+MaxLights=8
+Masterserver=http://master.megaglest.org/
+Modserver=https://glest.io/
+NetPlayerName=newbie
+NetworkConsistencyChecks=true
+NetworkInterfaces=lo,eth,wlan,vlan,vboxnet,br-lan,br-gest,enp0s,enp1s,enp2s,enp3s,enp4s,enp5s,enp6s,enp7s,enp8s,enp9s
+PhotoMode=false
+PortList=61357,61367,61377,61387,61397
+PortServer=61357
+ScreenHeight=768
+ScreenWidth=1024
+ServerIp=192.168.0.107
+ShadowFrameSkip=2
+ShadowTextureSize=512
+Shadows=Projected
+SoundStaticBuffers=16
+SoundStreamingBuffers=4
+SoundVolumeAmbient=70
+SoundVolumeFx=70
+SoundVolumeMusic=70
+StencilBits=0
+Textures3D=true
+UnitParticles=true
+UpdateCheckURL=https://glest.io/version.txt
+UpdateDownloadURL=https://github.com/glest/glest-source#download-for-windows
+UpdateNotifier=true
+UserData_Root=$HOME/.glest/
+Website=https://glest.io
+JoinUs=https://discord.gg/es3EyBB
+BugReportUrl=https://github.com/Glest/glest-source/issues
+Windowed=false
diff --git a/source/game/CMakeLists.txt b/source/game/CMakeLists.txt
index 6ee634a78..d177ac16b 100644
--- a/source/game/CMakeLists.txt
+++ b/source/game/CMakeLists.txt
@@ -285,10 +285,14 @@ IF(BUILD_GLEST)
 		INSTALL(FILES
 			"${PROJECT_SOURCE_DIR}/mk/windows/glest.ini"
 			DESTINATION ${INSTALL_DIR_INI})
-	ELSEIF(UNIX AND NOT APPLE)
+	ELSEIF(UNIX AND NOT APPLE AND NOT FLATPAK_INSTALL)
 		INSTALL(FILES
 			"${PROJECT_SOURCE_DIR}/mk/shared/glest.ini"
 			DESTINATION ${INSTALL_DIR_INI})
+    ELSEIF(UNIX AND NOT APPLE AND FLATPAK_INSTALL)
+		INSTALL(FILES
+			"${PROJECT_SOURCE_DIR}/mk/flatpak/glest.ini"
+			DESTINATION ${INSTALL_DIR_INI})
 	ELSEIF(UNIX AND APPLE)
 		INSTALL(FILES
 			"${PROJECT_SOURCE_DIR}/mk/shared/glest.ini"