From bb3a214f214fdaff665b4b4ef8f6e41a4d420934 Mon Sep 17 00:00:00 2001 From: EnderIce2 Date: Wed, 9 Jul 2025 20:49:04 +0300 Subject: [PATCH] refactor: move sources to src/ --- .github/workflows/build.yml | 10 ++++----- .github/workflows/docs.yml | 3 +-- Makefile | 28 ++++++------------------- mkdocs.yml => docs/mkdocs.yml | 0 src/Makefile | 26 +++++++++++++++++++++++ bridge.c => src/bridge.c | 0 bridge.ico => src/bridge.ico | Bin bridge.manifest => src/bridge.manifest | 0 bridge.rc => src/bridge.rc | 2 +- game.c => src/game.c | 0 gui.c => src/gui.c | 0 main.c => src/main.c | 0 resource.h => src/resource.h | 0 service.c => src/service.c | 0 14 files changed, 38 insertions(+), 31 deletions(-) rename mkdocs.yml => docs/mkdocs.yml (100%) create mode 100644 src/Makefile rename bridge.c => src/bridge.c (100%) rename bridge.ico => src/bridge.ico (100%) rename bridge.manifest => src/bridge.manifest (100%) rename bridge.rc => src/bridge.rc (97%) rename game.c => src/game.c (100%) rename gui.c => src/gui.c (100%) rename main.c => src/main.c (100%) rename resource.h => src/resource.h (100%) rename service.c => src/service.c (100%) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ddead99..55eed6b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -4,16 +4,14 @@ on: push: branches: [ "master" ] paths-ignore: - - 'ISSUE_TEMPLATE/**' - - 'workflows/**' - - '.vsocde/**' + - '.github/**' + - '.vscode/**' - 'docs/**' pull_request: branches: [ "master" ] paths-ignore: - - 'ISSUE_TEMPLATE/**' - - 'workflows/**' - - '.vsocde/**' + - '.github/**' + - '.vscode/**' - 'docs/**' permissions: diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 8db779b..d96e5cb 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -5,12 +5,10 @@ on: branches: [ master ] paths: - docs/** - - mkdocs.yml pull_request: branches: [ "master" ] paths: - docs/** - - mkdocs.yml permissions: contents: write @@ -37,3 +35,4 @@ jobs: - run: pip install mkdocs-material - run: pip install mkdocs-video - run: mkdocs gh-deploy --force + working-directory: ./docs diff --git a/Makefile b/Makefile index 9b5bb76..7bf1f51 100644 --- a/Makefile +++ b/Makefile @@ -1,26 +1,10 @@ -C_SOURCES = $(shell find ./ -type f -name '*.c') -C_OBJECTS = $(C_SOURCES:.c=.o) +.PHONY: all build clean -GIT_COMMIT = $(shell git rev-parse --short HEAD) -GIT_BRANCH = $(shell git rev-parse --abbrev-ref HEAD) +all: + $(MAKE) -C src all -CWARNFLAGS = -Wno-int-conversion -Wno-incompatible-pointer-types - -CFLAGS = -std=c17 -DGIT_COMMIT='"$(GIT_COMMIT)"' -DGIT_BRANCH='"$(GIT_BRANCH)"' -LFLAGS = -lgdi32 -lws2_32 - -# DBGFLAGS = -Wl,--export-all-symbols -g -O0 -ggdb3 -Wall - -all: build - -build: $(C_OBJECTS) - $(info Linking) - x86_64-w64-mingw32-windres bridge.rc -O coff -o bridge.res - x86_64-w64-mingw32-gcc $(C_OBJECTS) bridge.res $(LFLAGS) $(DBGFLAGS) -o build/bridge.exe - -%.o: %.c - $(info Compiling $<) - x86_64-w64-mingw32-gcc $(CFLAGS) $(CWARNFLAGS) $(DBGFLAGS) -c $< -o $@ +build: + $(MAKE) -C src build clean: - rm -f $(C_OBJECTS) build/bridge.exe bridge.res + $(MAKE) -C src clean diff --git a/mkdocs.yml b/docs/mkdocs.yml similarity index 100% rename from mkdocs.yml rename to docs/mkdocs.yml diff --git a/src/Makefile b/src/Makefile new file mode 100644 index 0000000..8b9935b --- /dev/null +++ b/src/Makefile @@ -0,0 +1,26 @@ +C_SOURCES = $(shell find ./ -type f -name '*.c') +C_OBJECTS = $(C_SOURCES:.c=.o) + +GIT_COMMIT = $(shell git rev-parse --short HEAD) +GIT_BRANCH = $(shell git rev-parse --abbrev-ref HEAD) + +CWARNFLAGS = -Wno-int-conversion -Wno-incompatible-pointer-types + +CFLAGS = -std=c17 -DGIT_COMMIT='"$(GIT_COMMIT)"' -DGIT_BRANCH='"$(GIT_BRANCH)"' +LFLAGS = -lgdi32 -lws2_32 + +# DBGFLAGS = -Wl,--export-all-symbols -g -O0 -ggdb3 -Wall + +all: build + +build: $(C_OBJECTS) + $(info Linking) + x86_64-w64-mingw32-windres bridge.rc -O coff -o bridge.res + x86_64-w64-mingw32-gcc $(C_OBJECTS) bridge.res $(LFLAGS) $(DBGFLAGS) -o ../build/bridge.exe + +%.o: %.c + $(info Compiling $<) + x86_64-w64-mingw32-gcc $(CFLAGS) $(CWARNFLAGS) $(DBGFLAGS) -c $< -o $@ + +clean: + rm -f $(C_OBJECTS) ../build/bridge.exe bridge.res diff --git a/bridge.c b/src/bridge.c similarity index 100% rename from bridge.c rename to src/bridge.c diff --git a/bridge.ico b/src/bridge.ico similarity index 100% rename from bridge.ico rename to src/bridge.ico diff --git a/bridge.manifest b/src/bridge.manifest similarity index 100% rename from bridge.manifest rename to src/bridge.manifest diff --git a/bridge.rc b/src/bridge.rc similarity index 97% rename from bridge.rc rename to src/bridge.rc index 6f95de5..2b7c2c9 100644 --- a/bridge.rc +++ b/src/bridge.rc @@ -46,7 +46,7 @@ BEGIN END END -IDR_LICENSE_TXT RCDATA "LICENSE" +IDR_LICENSE_TXT RCDATA "../LICENSE" IDI_ICON_128 ICON "bridge.ico" diff --git a/game.c b/src/game.c similarity index 100% rename from game.c rename to src/game.c diff --git a/gui.c b/src/gui.c similarity index 100% rename from gui.c rename to src/gui.c diff --git a/main.c b/src/main.c similarity index 100% rename from main.c rename to src/main.c diff --git a/resource.h b/src/resource.h similarity index 100% rename from resource.h rename to src/resource.h diff --git a/service.c b/src/service.c similarity index 100% rename from service.c rename to src/service.c