modify build script, fix actions

.github/workflows/build.yml

@@ -5,26 +5,27 @@ on:
     branches: [ "main" ]
   pull_request:
     branches: [ "main" ]
+  workflow_dispatch:
 
 jobs:
-  build-linux:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v4
-    - name: perms fix
-      run: chmod +x build_norun.sh
-    - name: make
-      run: ./build_norun.sh
-    - uses: actions/upload-artifact@v4.3.3
-      with:
-        name: vega-linux
-        path: bin
-    - name: Upload to Release Action
-      uses: Shopify/upload-to-release@v2.0.0
-      with:
-          name: vega-linux
-          path: bin
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
+  #build-linux:
+    #runs-on: ubuntu-latest
+    #steps:
+    #- uses: actions/checkout@v4
+    #- name: perms fix
+    #  run: chmod +x build_norun.sh
+    #- name: make
+    #  run: ./build_norun.sh
+    #- uses: actions/upload-artifact@v4.3.3
+    #  with:
+    #    name: vega-linux
+    #    path: bin
+    #- name: Upload to Release Action
+    #  uses: Shopify/upload-to-release@v2.0.0
+    #  with:
+    #      name: vega-linux
+    #      path: bin
+    #      repo-token: ${{ secrets.GITHUB_TOKEN }}
   build-windows:
     runs-on: windows-latest
     steps:
@@ -44,8 +45,12 @@ jobs:
     - name: Upload to Release Action
       uses: softprops/action-gh-release@v2
       with:
-          body: automatic release by github actions
-          prerelease: true
-          files: ${{ github.workspace }}/vega-windows.zip
-          name: autobuild
-          tag_name: autobuild
+        body: automatic release by github actions
+        prerelease: true
+        files: ${{ github.workspace }}/vega-windows.zip
+        name: autobuild
+        tag_name: autobuild
+    - name: notify discord
+      uses: tsickert/discord-webhook@v5.3.0
+      with:
+        webhook-url: ${{ DISCORD_WEBHOOK }}

Makefile

@@ -1,29 +1,8 @@
-cc = g++
-binaryDir := ./bin
-objectDir := ./bin/obj
-sourceDir := ./src
-includeDirs := ./include ./include/imgui
-libDirs := ./lib
-executable := $(binaryDir)/main.exe
-vendors := $(patsubst $(sourceDir)/vendor/%,%,$(wildcard $(sourceDir)/vendor/*))
-sources := $(wildcard $(sourceDir)/*.cpp) $(foreach vendor,$(vendors),$(wildcard $(sourceDir)/vendor/$(vendor)/*.cpp))
-objects := $(patsubst $(sourceDir)/%.cpp,$(objectDir)/%.o,$(sources)) $(foreach vendor,$(vendors),$(wildcard $(objectDir)/vendor/$(vendor)/*.o))
-flags = -lopengl32 -lglfw3 -lgdi32 -static -static-libgcc -static-libstdc++
-warnings := all
-
-default: $(executable) run
-
-$(executable): $(objects) | $(binaryDir)
-	$(cc) $(foreach warn,$(warnings),-W$(warn)) $^ -o $@ $(foreach dir,$(includeDirs),-I$(dir)) $(foreach dir,$(libDirs),-L$(dir)) $(flags)
-
-$(objectDir)/%.o: $(sourceDir)/%.cpp | $(objectDir)
-	$(cc) $(foreach warn,$(warnings),-W$(warn)) $< -c -o $@ $(foreach dir,$(includeDirs),-I$(dir))
-
-$(objectDir):
-	mkdir bin && cd bin && mkdir obj && cd obj && mkdir vendor && cd vendor && $(foreach dir,$(vendors),mkdir $(dir) &&) cd ../../..
-
-clean:
-	rmdir /s /q bin
-
-run: $(executable)
-	$<
+win_buildonly:
+  make -f buildonly.win
+win_buildrun:
+  make -f buildrun.win
+lnx_buildonly:
+  make -f buildonly.lnx
+lnx_buildrun:
+  make -f buildrun.lnx

build_and_run.cmd

@@ -0,0 +1 @@
+make win_buildrun

build_and_run.sh

@@ -0,0 +1,2 @@
+#!/bin/bash
+make lnx_buildrun

build_only.cmd

@@ -0,0 +1 @@
+make win_buildonly

build_only.sh

@@ -0,0 +1,2 @@
+#!/bin/bash
+make lnx_buildonly

buildonly.win

@@ -0,0 +1,26 @@
+cc = g++
+binaryDir := ./bin
+objectDir := ./bin/obj
+sourceDir := ./src
+includeDirs := ./include ./include/imgui
+libDirs := ./lib
+executable := $(binaryDir)/main.exe
+vendors := $(patsubst $(sourceDir)/vendor/%,%,$(wildcard $(sourceDir)/vendor/*))
+sources := $(wildcard $(sourceDir)/*.cpp) $(foreach vendor,$(vendors),$(wildcard $(sourceDir)/vendor/$(vendor)/*.cpp))
+objects := $(patsubst $(sourceDir)/%.cpp,$(objectDir)/%.o,$(sources)) $(foreach vendor,$(vendors),$(wildcard $(objectDir)/vendor/$(vendor)/*.o))
+flags = -lopengl32 -lglfw3 -lgdi32 -static -static-libgcc -static-libstdc++
+warnings := all
+
+default: $(executable)
+
+$(executable): $(objects) | $(binaryDir)
+	$(cc) $(foreach warn,$(warnings),-W$(warn)) $^ -o $@ $(foreach dir,$(includeDirs),-I$(dir)) $(foreach dir,$(libDirs),-L$(dir)) $(flags)
+
+$(objectDir)/%.o: $(sourceDir)/%.cpp | $(objectDir)
+	$(cc) $(foreach warn,$(warnings),-W$(warn)) $< -c -o $@ $(foreach dir,$(includeDirs),-I$(dir))
+
+$(objectDir):
+	mkdir bin && cd bin && mkdir obj && cd obj && mkdir vendor && cd vendor && $(foreach dir,$(vendors),mkdir $(dir) &&) cd ../../..
+
+clean:
+	rmdir /s /q bin

buildrun.lnx

@@ -0,0 +1,29 @@
+cc = g++
+binaryDir := ./bin
+objectDir := ./bin/obj
+sourceDir := ./src
+includeDirs := ./include ./include/imgui
+libDirs := ./lib
+executable := $(binaryDir)/main.exe
+vendors := $(patsubst $(sourceDir)/vendor/%,%,$(wildcard $(sourceDir)/vendor/*))
+sources := $(wildcard $(sourceDir)/*.cpp) $(foreach vendor,$(vendors),$(wildcard $(sourceDir)/vendor/$(vendor)/*.cpp))
+objects := $(patsubst $(sourceDir)/%.cpp,$(objectDir)/%.o,$(sources)) $(foreach vendor,$(vendors),$(wildcard $(objectDir)/vendor/$(vendor)/*.o))
+flags = -lopengl32 -lglfw3 -lgdi32 -static -static-libgcc -static-libstdc++
+warnings := all
+
+default: $(executable) run
+
+$(executable): $(objects) | $(binaryDir)
+	$(cc) $(foreach warn,$(warnings),-W$(warn)) $^ -o $@ $(foreach dir,$(includeDirs),-I$(dir)) $(foreach dir,$(libDirs),-L$(dir)) $(flags)
+
+$(objectDir)/%.o: $(sourceDir)/%.cpp | $(objectDir)
+	$(cc) $(foreach warn,$(warnings),-W$(warn)) $< -c -o $@ $(foreach dir,$(includeDirs),-I$(dir))
+
+$(objectDir):
+	mkdir bin && cd bin && mkdir obj && cd obj && mkdir vendor && cd vendor && $(foreach dir,$(vendors),mkdir $(dir) &&) cd ../../..
+
+clean:
+	rmdir /s /q bin
+
+run: $(executable)
+	$<

buildrun.win

@@ -0,0 +1,29 @@
+cc = g++
+binaryDir := ./bin
+objectDir := ./bin/obj
+sourceDir := ./src
+includeDirs := ./include ./include/imgui
+libDirs := ./lib
+executable := $(binaryDir)/main.exe
+vendors := $(patsubst $(sourceDir)/vendor/%,%,$(wildcard $(sourceDir)/vendor/*))
+sources := $(wildcard $(sourceDir)/*.cpp) $(foreach vendor,$(vendors),$(wildcard $(sourceDir)/vendor/$(vendor)/*.cpp))
+objects := $(patsubst $(sourceDir)/%.cpp,$(objectDir)/%.o,$(sources)) $(foreach vendor,$(vendors),$(wildcard $(objectDir)/vendor/$(vendor)/*.o))
+flags = -lopengl32 -lglfw3 -lgdi32 -static -static-libgcc -static-libstdc++
+warnings := all
+
+default: $(executable) run
+
+$(executable): $(objects) | $(binaryDir)
+	$(cc) $(foreach warn,$(warnings),-W$(warn)) $^ -o $@ $(foreach dir,$(includeDirs),-I$(dir)) $(foreach dir,$(libDirs),-L$(dir)) $(flags)
+
+$(objectDir)/%.o: $(sourceDir)/%.cpp | $(objectDir)
+	$(cc) $(foreach warn,$(warnings),-W$(warn)) $< -c -o $@ $(foreach dir,$(includeDirs),-I$(dir))
+
+$(objectDir):
+	mkdir bin && cd bin && mkdir obj && cd obj && mkdir vendor && cd vendor && $(foreach dir,$(vendors),mkdir $(dir) &&) cd ../../..
+
+clean:
+	rmdir /s /q bin
+
+run: $(executable)
+	$<