Add Github Actions

benbaker76 · May 5, 2023 · 6ce179e · 6ce179e
1 parent 26635b7
commit 6ce179e
Show file tree

Hide file tree

Showing 6 changed files with 131 additions and 95 deletions.
diff --git a/.github/workflows/amd64_linux_gcc.yml b/.github/workflows/amd64_linux_gcc.yml
@@ -0,0 +1,40 @@
+name: amd64_linux_gcc
+
+on: [push]
+
+jobs:
+
+  amd64_linux_gcc:
+    runs-on: ubuntu-20.04
+    timeout-minutes: 5
+    steps:
+    - uses: actions/checkout@v3
+    - run: make
+    - name: Get version
+      id: version
+      run: |
+        output=$(build/gfx2next -version)
+        echo "::set-output name=result::$output"
+    - name: Copy README.md
+      run: cp README.md build
+    - name: Compress Files
+      uses: a7ul/[email protected]
+      with:
+        command: c
+        cwd: build
+        files: |
+          README.md
+          gfx2next
+        outPath: build/gfx2next_Linux_amd64.tar.gz
+    - name: Upload to Artifacts
+      uses: actions/upload-artifact@v3
+      with:
+        name: Artifacts
+        path: build/gfx2next_Linux_amd64.tar.gz
+    - name: Upload to Release
+      uses: svenstaro/upload-release-action@v2
+      with:
+        repo_token: ${{ secrets.GITHUB_TOKEN }}
+        file: build/gfx2next_Linux_amd64.tar.gz
+        tag: ${{ steps.version.outputs.result }}
+        overwrite: true
diff --git a/.github/workflows/amd64_macos_gcc.yml b/.github/workflows/amd64_macos_gcc.yml
@@ -0,0 +1,40 @@
+name: amd64_macos_gcc
+
+on: [push]
+
+jobs:
+
+  amd64_macos_gcc:
+    runs-on: macos-12
+    timeout-minutes: 5
+    steps:
+    - uses: actions/checkout@v3
+    - run: make
+    - name: Get version
+      id: version
+      run: |
+        output=$(build/gfx2next -version)
+        echo "::set-output name=result::$output"
+    - name: Copy README.md
+      run: cp README.md build
+    - name: Compress Files
+      uses: a7ul/[email protected]
+      with:
+        command: c
+        cwd: build
+        files: |
+          README.md
+          gfx2next
+        outPath: build/gfx2next_Darwin_amd64.tar.gz
+    - name: Upload to Artifacts
+      uses: actions/upload-artifact@v3
+      with:
+        name: Artifacts
+        path: build/gfx2next_Darwin_amd64.tar.gz
+    - name: Upload to Release
+      uses: svenstaro/upload-release-action@v2
+      with:
+        repo_token: ${{ secrets.GITHUB_TOKEN }}
+        file: build/gfx2next_Darwin_amd64.tar.gz
+        tag: ${{ steps.version.outputs.result }}
+        overwrite: true
diff --git a/.github/workflows/amd64_windows_gcc.yml b/.github/workflows/amd64_windows_gcc.yml
@@ -0,0 +1,40 @@
+name: amd64_windows_gcc
+
+on: [push]
+
+jobs:
+
+  amd64_windows_gcc:
+    runs-on: windows-2019
+    timeout-minutes: 5
+    defaults:
+      run:
+        shell: msys2 {0}
+    steps:
+    - uses: actions/checkout@v3
+    - uses: msys2/setup-msys2@v2
+      with:
+        install: gcc make
+    - run: make
+    - name: Get version
+      id: version
+      run: |
+        output=$(build/gfx2next -version)
+        echo "::set-output name=result::$output"
+    - name: Compress Files
+      uses: vimtor/action-zip@v1
+      with:
+        files: README.md build/gfx2next.exe
+        dest: build/gfx2next_Windows_amd64.zip
+    - name: Upload to Artifacts
+      uses: actions/upload-artifact@v3
+      with:
+        name: Artifacts
+        path: build/gfx2next_Windows_amd64.zip
+    - name: Upload to Release
+      uses: svenstaro/upload-release-action@v2
+      with:
+        repo_token: ${{ secrets.GITHUB_TOKEN }}
+        file: build/gfx2next_Windows_amd64.zip
+        tag: ${{ steps.version.outputs.result }}
+        overwrite: true
diff --git a/Makefile b/Makefile
@@ -16,13 +16,13 @@ CP := cp
 
 ZIP := zip -r -q
 
-BIN_DIR := bin
+BUILD_DIR := build
 
 TMP_DIR := tmp
 
 EXE_BASE_NAME := gfx2next
 
-EXE_FULL_NAME := $(BIN_DIR)/$(EXE_BASE_NAME)
+EXE_FULL_NAME := $(BUILD_DIR)/$(EXE_BASE_NAME)
 
 # common GNU variables related to install location
 prefix ?= /usr/local
@@ -37,14 +37,14 @@ install: $(EXE_FULL_NAME)
 distro: clean
 	$(MAKE) all
 	$(MKDIR) $(TMP_DIR)/gfx2next
-	$(CP) $(BIN_DIR)/* $(TMP_DIR)/gfx2next
+	$(CP) $(BUILD_DIR)/* $(TMP_DIR)/gfx2next
 	$(CP) src/* $(TMP_DIR)/gfx2next
 	$(CP) README.md $(TMP_DIR)/gfx2next
 	$(RM) build/gfx2next.zip
 	cd $(TMP_DIR); $(ZIP) ../build/gfx2next.zip gfx2next
 
 clean:
-	$(RM) $(BIN_DIR) $(TMP_DIR)
+	$(RM) $(BUILD_DIR) $(TMP_DIR)
 
 $(EXE_FULL_NAME): src/lodepng.c src/zx0.c src/gfx2next.c
 	$(MKDIR) $(@D)

diff --git a/bin/gfx2next.exe b/bin/gfx2next.exe
diff --git a/src/gfx2next.c b/src/gfx2next.c
@@ -39,7 +39,7 @@ int _CRT_glob = 0;
 #include "zx0.h"
 #include "lodepng.h"
 
-#define VERSION						"1.1.7"
+#define VERSION						"1.1.8"
 
 #define DIR_SEPERATOR_CHAR			'\\'
 
@@ -112,59 +112,8 @@ int _CRT_glob = 0;
 #define EXT_TMX						".tmx"
 #define EXT_TSX						".tsx"
 
-static void write_easter_egg();
 static uint8_t attributes_to_tiled_flags(uint8_t attributes);
 
-unsigned char m_gf[] =
-{
-	0x84, 0xff, 0x42, 0x7c, 0xf8, 0x00, 0x07, 0xe0, 0x2a, 0xc0, 0x24, 0x00,
-	0x3f, 0x38, 0xc5, 0xe4, 0xf8, 0x01, 0xe2, 0xba, 0xfc, 0xc6, 0xe4, 0x80,
-	0xbe, 0xbf, 0xf0, 0xd8, 0x92, 0x7c, 0xfa, 0xe3, 0x38, 0xc1, 0x12, 0x86,
-	0x87, 0xe0, 0x7f, 0xe0, 0xbe, 0x1f, 0xf4, 0x87, 0xfe, 0x8f, 0xec, 0x6a,
-	0xe8, 0x43, 0x8f, 0x1e, 0xac, 0x6c, 0xc7, 0xda, 0x96, 0xf8, 0x4a, 0xf1,
-	0x02, 0x97, 0xf1, 0xc3, 0x22, 0xa7, 0x93, 0xfe, 0xc2, 0x8e, 0xf2, 0x3f,
-	0xf0, 0x96, 0xcf, 0x95, 0x9f, 0xbd, 0xdf, 0xb0, 0x7d, 0xe0, 0x2f, 0xe7,
-	0x50, 0x7d, 0xe0, 0x29, 0xff, 0x69, 0xf3, 0x29, 0xfc, 0x02, 0x92, 0xfb,
-	0x90, 0xfd, 0x2f, 0xf9, 0xf2, 0x0f, 0xce, 0x7f, 0xb3, 0xe0, 0x15, 0x29,
-	0xf3, 0x5a, 0xf7, 0x50, 0x4b, 0xf3, 0x1c, 0xc7, 0x92, 0xe0, 0xa6, 0x83,
-	0xf0, 0x00, 0x3f, 0x07, 0xe7, 0xe6, 0xe0, 0x00, 0x0f, 0x96, 0xe0, 0x09,
-	0x1f, 0xf0, 0x0f, 0x83, 0x1e, 0x7b, 0xc8, 0xc1, 0x20, 0x6a, 0xf1, 0x8a,
-	0xdf, 0xf8, 0x43, 0xc7, 0xe1, 0x38, 0xfc, 0xb9, 0xe0, 0xe9, 0xc8, 0xc6,
-	0xc0, 0x0f, 0xbf, 0x9f, 0x92, 0xc0, 0x68, 0xfb, 0x00, 0x5f, 0x9a, 0x80,
-	0x07, 0xbe, 0x1e, 0x8b, 0xe2, 0x30, 0xe1, 0x3c, 0x03, 0x62, 0x7f, 0x9f,
-	0x4a, 0x60, 0x29, 0x1c, 0x98, 0xfe, 0xf1, 0xdf, 0x66, 0xfb, 0xe1, 0x9f,
-	0x76, 0x61, 0x65, 0xfd, 0xe0, 0xcf, 0xa7, 0xbf, 0xa2, 0xe0, 0xde, 0x6f,
-	0x46, 0x65, 0xfb, 0xbf, 0xa7, 0x22, 0x3f, 0xf7, 0x47, 0xf1, 0x41, 0xe0,
-	0x99, 0xfe, 0x5f, 0x77, 0x69, 0x3f, 0x22, 0x7f, 0x67, 0x5a, 0x7f, 0x4a,
-	0xbf, 0x52, 0x65, 0xfc, 0xdf, 0x6f, 0x22, 0xfe, 0x4f, 0x4a, 0xfe, 0x4a,
-	0xfe, 0xa5, 0xdf, 0xa5, 0xff, 0xa1, 0x9f, 0xa0, 0xf3, 0x3c, 0x10, 0x8f,
-	0xf7, 0xfc, 0xbb, 0xe6, 0xe0, 0xfd, 0xdf, 0x3f, 0x02, 0x92, 0xfc, 0x80,
-	0x7f, 0xfe, 0x5c, 0xf7, 0xe6, 0x3a, 0xe0, 0x9a, 0xf3, 0x3f, 0x62, 0xf3,
-	0xe6, 0x4a, 0xfb, 0x23, 0x9e, 0xbf, 0xeb, 0xb0, 0xcc, 0xd8, 0x00, 0xfa,
-	0x9e, 0xdf, 0xe0, 0xf9, 0x06, 0x26, 0x7f, 0xef, 0x25, 0xe7, 0xf1, 0xb0,
-	0xfd, 0xbe, 0x86, 0xe0, 0x97, 0xe3, 0xc8, 0xb0, 0xf2, 0xef, 0x8f, 0xe0,
-	0x96, 0xf3, 0x94, 0x1f, 0x89, 0xe8, 0x3f, 0x69, 0xe7, 0x22, 0xc0, 0x7f,
-	0x48, 0x92, 0xf9, 0xef, 0x85, 0xcc, 0xa6, 0xfe, 0x96, 0xde, 0x26, 0xfd,
-	0xcf, 0x9a, 0x7f, 0x3f, 0x5c, 0xee, 0xc6, 0x3f, 0x41, 0x96, 0x9e, 0xfa,
-	0xfc, 0xe0, 0xbf, 0x22, 0xbe, 0x0f, 0x4d, 0xce, 0x92, 0xdb, 0xf6, 0x07,
-	0xe0, 0x66, 0x80, 0x00, 0x7f, 0x25, 0x3f, 0x03, 0xbe, 0x7e, 0xe5, 0x8a,
-	0xda, 0x15, 0x01, 0x0e, 0x48, 0x6f, 0xed, 0xf2, 0xb9, 0x00, 0xe0, 0xa6,
-	0xff, 0x9a, 0xfd, 0xff, 0xa5, 0x3f, 0xa4, 0xf1, 0xbc, 0x80, 0x3e, 0xf3,
-	0xd2, 0xa4, 0xe1, 0x07, 0xa0, 0xbf, 0x29, 0x03, 0x5a, 0x00, 0x4a, 0xdf,
-	0x06, 0x92, 0x3f, 0x80, 0xfd, 0xa1, 0x01, 0x99, 0xef, 0xf0, 0x3f, 0x7f,
-	0xbf, 0xe0, 0xa1, 0xcf, 0x3e, 0x1d, 0x33, 0x9f, 0xf6, 0xe0, 0x69, 0x01,
-	0xa1, 0xc0, 0x3e, 0x9e, 0x39, 0xfe, 0x00, 0xe0, 0x6a, 0x0f, 0x91, 0xf8,
-	0xaa, 0x03, 0xe0, 0xa5, 0x03, 0xa6, 0x00, 0xa9, 0x00, 0x00, 0x4a, 0xfc,
-	0x29, 0x01, 0x0a, 0xe0, 0x29, 0x00, 0x28, 0xfe, 0x69, 0x80, 0xa1, 0x7f,
-	0x69, 0x00, 0xa5, 0x1f, 0x68, 0x07, 0x68, 0xfc, 0x19, 0x94, 0x00, 0xf8,
-	0x03, 0xfc, 0x3d, 0xe0, 0x3f, 0xe3, 0xe0, 0xa0, 0xf8, 0x62, 0x02, 0x7f,
-	0x56, 0x94, 0x3f, 0x89, 0x04, 0x9f, 0x48, 0x82, 0x06, 0xef, 0x84, 0xe8,
-	0xa0, 0xf7, 0xa1, 0xe0, 0x2f, 0xf9, 0x80, 0x4a, 0xfc, 0x52, 0x66, 0x04,
-	0xfe, 0x7f, 0x84, 0xf0, 0xbe, 0xff, 0xe0, 0x81, 0x90, 0xaa, 0x04, 0xff,
-	0x69, 0xa0, 0x5a, 0x60, 0x06, 0x86, 0x06, 0x94, 0x40, 0x89, 0xfe, 0x80,
-	0x06, 0xd9, 0x0e, 0xa2, 0x30, 0x00, 0x08
-};
-
 uint32_t m_screenColors[] =
 {
 	COLOR_BLACK,
@@ -871,6 +820,7 @@ static void print_usage(void)
 	printf("  gfx2next [options] <srcfile> [<dstfile>]\n");
 	printf("\n");
 	printf("Options:\n");
+	printf("  -version                Output version\n");
 	printf("  -debug                  Output additional debug information\n");
 	printf("  -font                   Sets output to Next font format (.spr)\n");
 	printf("  -screen                 Sets output to Spectrum screen format (.scr)\n");
@@ -1315,17 +1265,16 @@ static bool parse_args(int argc, char *argv[], arguments_t *args)
 			{
 				m_args.preview = true;
 			}
-			else if (!strcmp(argv[i], "-easter-egg"))
-			{
-				write_easter_egg();
-				exit(0);
-				return false;
-			}
 			else if (!strcmp(argv[i], "-help"))
 			{
 				print_usage();
 				return false;
 			}
+			else if (!strcmp(argv[i], "-version"))
+			{
+				printf("v%s\n", VERSION);
+				exit(EXIT_SUCCESS);
+			}
 			else
 			{
 				fprintf(stderr, "Invalid option: %s\n", argv[i]);
@@ -1945,39 +1894,6 @@ static void read_next_image()
 	}
 }
 
-static void write_1bit_png(const char *filename, uint8_t *data)
-{
-	m_args.bitmap = true;
-	m_args.colors_4bit = true;
-
-	uint8_t buffer_decompress[0x800];
-	uint8_t buffer_out[0x2000];
-	memset(m_next_palette, 0, sizeof(m_next_palette));
-	memset(buffer_out, 0, sizeof(buffer_out));
-
-	m_next_palette[1] = 0x01ff;
-
-	zx0_decompress(data, buffer_decompress);
-
-	uint8_t *p_data = buffer_decompress;
-	uint8_t *p_buffer = buffer_out;
-
-	for (int i = 0; i < 0x800; i++)
-	{
-		for (int j = 0; j < 8; j++)
-		{
-			p_buffer[(i * 8 + j) >> 1] |= p_data[i] & (1 << (7 - j)) ? (j % 2) == 0 ? 0x10 : 1 : 0;
-		}
-	}
-
-	write_png(filename, buffer_out, 128, 128);
-}
-
-static void write_easter_egg()
-{
-	write_1bit_png("gf.png", m_gf);
-}
-
 static void write_asm_header()
 {
 	if (m_args.asm_mode == ASMMODE_SJASM)