Generate devilutionx.mpq

.circleci/config.yml

@@ -8,7 +8,7 @@ jobs:
       - checkout
       - run: echo deb http://deb.debian.org/debian stretch-backports-sloppy main >> /etc/apt/sources.list.d/debian-backports.list
       - run: apt update -y
-      - run: apt install -y g++ libsdl2-dev libsdl2-ttf-dev git rpm wget
+      - run: apt install -y g++ libsdl2-dev libsdl2-ttf-dev git rpm wget smpq
       - run: apt install -y -t 'stretch-backports*' cmake libsodium-dev libpng-dev
       - run: cmake -S. -Bbuild .. -DNIGHTLY_BUILD=ON -DCMAKE_INSTALL_PREFIX=/usr
       - run: cmake --build build -j 2 --target package
@@ -47,7 +47,7 @@ jobs:
     steps:
       - checkout
       - run: sudo apt update -y
-      - run: sudo apt install -y g++ cmake ninja-build
+      - run: sudo apt install -y g++ cmake ninja-build smpq
       - run: cd android-project && ./gradlew assembleDebug
       - store_artifacts: {path: ./android-project/app/build/outputs/apk/debug/app-debug.apk, destination: devilutionx-debug.apk}
   3ds:
@@ -57,7 +57,7 @@ jobs:
     steps:
       - checkout
       - run: apt-get update -y
-      - run: apt-get install -y ffmpeg gettext
+      - run: apt-get install -y ffmpeg gettext smpq
       - run: wget https://github.com/Steveice10/bannertool/releases/download/1.2.0/bannertool.zip
       - run: unzip -j "bannertool.zip" "linux-x86_64/bannertool" -d "/opt/devkitpro/tools/bin"
       - run: wget https://github.com/jakcron/Project_CTR/releases/download/v0.16/makerom_016_ctrtool.zip

.github/workflows/Linux_x86.yml

@@ -20,7 +20,7 @@ jobs:
       run: >
         sudo dpkg --add-architecture i386 &&
         sudo apt update -y &&
-        sudo apt install -y cmake file g++-multilib git libfmt-dev:i386 libsdl2-dev:i386 libsdl2-ttf-dev:i386 libsodium-dev:i386 libpng-dev:i386 rpm wget
+        sudo apt install -y cmake file g++-multilib git libfmt-dev:i386 libsdl2-dev:i386 libsdl2-ttf-dev:i386 libsodium-dev:i386 libpng-dev:i386 rpm wget smpq
 
     - name: Cache CMake build folder
       uses: actions/cache@v2

.github/workflows/Linux_x86_64_SDL1.yml

@@ -19,7 +19,7 @@ jobs:
     - name: Create Build Environment
       run: >
         sudo apt update &&
-        sudo apt install -y cmake file g++ git libfmt-dev libsdl-dev libsdl-ttf2.0-dev libsodium-dev libpng-dev rpm
+        sudo apt install -y cmake file g++ git libfmt-dev libsdl-dev libsdl-ttf2.0-dev libsodium-dev libpng-dev rpm smpq
 
     - name: Cache CMake build folder
       uses: actions/cache@v2

.github/workflows/Windows_x64.yml

@@ -19,7 +19,7 @@ jobs:
     - name: Create Build Environment
       run: >
         sudo apt update &&
-        sudo apt install -y cmake gcc-mingw-w64-x86-64 g++-mingw-w64-x86-64 pkg-config-mingw-w64-x86-64 wget git sudo &&
+        sudo apt install -y cmake gcc-mingw-w64-x86-64 g++-mingw-w64-x86-64 pkg-config-mingw-w64-x86-64 wget git sudo smpq &&
         sudo Packaging/windows/mingw-prep64.sh
 
     - name: Cache CMake build folder

.github/workflows/Windows_x86.yml

@@ -19,7 +19,7 @@ jobs:
     - name: Create Build Environment
       run: >
         sudo apt update &&
-        sudo apt install -y cmake gcc-mingw-w64-i686 g++-mingw-w64-i686 pkg-config-mingw-w64-i686 wget git sudo &&
+        sudo apt install -y cmake gcc-mingw-w64-i686 g++-mingw-w64-i686 pkg-config-mingw-w64-i686 wget git sudo smpq &&
         sudo Packaging/windows/mingw-prep.sh
 
     - name: Cache CMake build folder

CMakeLists.txt

@@ -600,10 +600,6 @@ else()
 endif()
 target_link_libraries(${BIN_TARGET} PRIVATE libdevilutionx)
 
-# Copy the font and devilutionx.mpq to the build directory to it works from the build directory
-file(COPY "Packaging/resources/CharisSILB.ttf" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}")
-file(COPY "Packaging/resources/devilutionx.mpq" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}")
-
 # Use file GENERATE instead of configure_file because configure_file
 # does not support generator expressions.
 get_property(is_multi_config GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
@@ -675,6 +671,102 @@ if (Gettext_FOUND)
   endif()
 endif()
 
+set(devilutionx_assets
+  data/boxleftend.pcx
+  data/boxmiddle.pcx
+  data/boxrightend.pcx
+  data/charbg.pcx
+  data/dirtybuc.pcx
+  data/dirtybucp.pcx
+  data/healthbox.pcx
+  data/health.pcx
+  data/panel8buc.pcx
+  data/panel8bucp.pcx
+  data/resistance.pcx
+  data/talkbutton.pcx
+  data/xpbar.pcx
+  fonts/12-00.bin
+  fonts/12-00.pcx
+  fonts/12-01.bin
+  fonts/12-01.pcx
+  fonts/12-02.bin
+  fonts/12-02.pcx
+  fonts/12-03.bin
+  fonts/12-03.pcx
+  fonts/12-04.bin
+  fonts/12-04.pcx
+  fonts/24-00.bin
+  fonts/24-00.pcx
+  fonts/24-01.bin
+  fonts/24-01.pcx
+  fonts/24-02.bin
+  fonts/24-02.pcx
+  fonts/24-03.bin
+  fonts/24-03.pcx
+  fonts/24-04.bin
+  fonts/24-04.pcx
+  fonts/30-00.bin
+  fonts/30-00.pcx
+  fonts/30-01.bin
+  fonts/30-01.pcx
+  fonts/30-02.bin
+  fonts/30-02.pcx
+  fonts/30-03.bin
+  fonts/30-03.pcx
+  fonts/30-04.bin
+  fonts/30-04.pcx
+  fonts/42-00.bin
+  fonts/42-00.pcx
+  fonts/42-01.bin
+  fonts/42-01.pcx
+  fonts/42-02.bin
+  fonts/42-02.pcx
+  fonts/42-03.bin
+  fonts/42-03.pcx
+  fonts/42-04.bin
+  fonts/42-04.pcx
+  fonts/46-00.bin
+  fonts/46-00.pcx
+  fonts/46-01.bin
+  fonts/46-01.pcx
+  fonts/46-02.bin
+  fonts/46-02.pcx
+  fonts/46-03.bin
+  fonts/46-03.pcx
+  fonts/46-04.bin
+  fonts/46-04.pcx
+  fonts/black.trn
+  fonts/blue.trn
+  fonts/buttonface.trn
+  fonts/buttonpushed.trn
+  fonts/golduis.trn
+  fonts/goldui.trn
+  fonts/grayuis.trn
+  fonts/grayui.trn
+  fonts/red.trn
+  fonts/whitegold.trn
+  fonts/white.trn
+  gendata/cutportlw.pcx
+  gendata/cutportrw.pcx
+  gendata/cutstartw.pcx
+  ui_art/creditsw.pcx
+  ui_art/hf_titlew.pcx
+  ui_art/mainmenuw.pcx
+  ui_art/supportw.pcx)
+
+find_program(SMPQ smpq)
+if(SMPQ)
+  file(REMOVE "Packaging/resources/devilutionx.mpq")
+  execute_process(
+    WORKING_DIRECTORY "${DevilutionX_SOURCE_DIR}/Packaging/resources/assets"
+    COMMAND ${SMPQ} -M 1 -C PKWARE -c "../devilutionx.mpq" ${devilutionx_assets})
+  # Copy devilutionx.mpq to the build directory so the game can run from the build directory
+  file(COPY "Packaging/resources/devilutionx.mpq" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}")
+endif()
+
+# Copy CharisSILB.ttf to the build directory so the game can run from the build directory
+file(COPY "Packaging/resources/CharisSILB.ttf" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}")
+
 target_include_directories(libdevilutionx PUBLIC
   Source
   ${CMAKE_CURRENT_BINARY_DIR})

Packaging/resources/assets/fonts/12-01.bin

@@ -0,0 +1,38 @@
+												
+			
+	
+	
+				
+	
+	
+	
+
+
+
+
+
+
+						
+
+
+
+
+
+
+			
+
+
+
+	
+		
+		
+	
+		
+	
+			
+			
+	
+		
+			
+	
+	

Packaging/resources/assets/fonts/12-04.bin

@@ -0,0 +1,38 @@
+		
+
+
+	

+	
+
+
+		
+	
		
+						
+
+			
+		
+	

+			


+	
+
+
+

+
+	
+
+

+	
+	
+	
+

+		
				
+	
+
+
+
+	
+		
+
+	
+	
+		

Packaging/resources/assets/fonts/24-01.bin

@@ -0,0 +1,12 @@
+



+		
+
+

+

+
+
+	
+



				







+

	
			

+	
+






Packaging/resources/assets/fonts/24-04.bin

@@ -0,0 +1,17 @@
+





		
+	
+

	

+
			
+	

+
+


+
+
+

+
+






+

	
+
+




+

+

Packaging/resources/assets/fonts/30-01.bin

@@ -0,0 +1,4 @@
+



		










	

	

+
+

+

Packaging/resources/assets/fonts/30-04.bin

@@ -0,0 +1 @@
+



	












!

















Packaging/resources/assets/fonts/42-01.bin

@@ -0,0 +1,7 @@
+

+

+
+	
+% )"
!
!#)'"!!
+
+)'"!

Packaging/resources/assets/fonts/42-04.bin

@@ -0,0 +1,3 @@
+
+
	! #'"$"!.('!'%"%!!!
+!

Packaging/resources/assets/fonts/46-01.bin

@@ -0,0 +1,3 @@
+"##



+#!!!,& %%% $%% 1)##"!"!''!!%  ! +$!& 
+1/)('!#
 %% %% %###!!!
1/)'#!!

Packaging/resources/assets/fonts/46-04.bin

@@ -0,0 +1,3 @@
+#$"%!# %")!! "$& *" #
+
+/!%")"!+%"!)#("70!.'.!#$!!.)-%("# ""#%)"("% ")"	"#!!!&!!! ! "#

android-project/CMake/android_defs.cmake

@@ -18,5 +18,5 @@ file(
   COPY "${DevilutionX_SOURCE_DIR}/Packaging/resources/CharisSILB.ttf"
   DESTINATION "${DevilutionX_SOURCE_DIR}/android-project/app/src/main/assets")
 
-file(GLOB VirtualGamepadArt "${DevilutionX_SOURCE_DIR}/Packaging/resources/ui_art/*")
+file(GLOB VirtualGamepadArt "${DevilutionX_SOURCE_DIR}/Packaging/resources/assets/ui_art/*")
 file(COPY ${VirtualGamepadArt} DESTINATION "${DevilutionX_SOURCE_DIR}/android-project/app/src/main/assets/ui_art")