diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ae597fdf..7bebc1bd 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -18,24 +18,88 @@ jobs: build: # The type of runner that the job will run on runs-on: ubuntu-latest - # Steps represent a sequence of tasks that will be executed as part of the job + #defaults: + # run: + # shell: bash.exe {0} steps: + #- uses: msys2/setup-msys2@v2 + # with: + # msystem: MINGW32 + # path-type: inherit # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - uses: actions/checkout@v3 - + with: + submodules: true + # Update references + #- name: Git Sumbodule Update + # run: | + # git submodule update --remote --recursive + #- name: Cache choco packages + # uses: actions/cache@v3 + # with: + # key: key + # path: C:\Users\runneradmin\AppData\Local\Temp\chocolatey\winlibs\ # Runs a single command using the runners shell - - name: Run a one-line script - run: uname + #- name: Run a one-line script + # run: | + # uname + # pacman -S mingw-w64-i686-toolchain + # pacman -Q | grep mingw + # echo $PATH + # echo %PATH% + # ls + # ls /mingw64/bin + # #ls -al /usr/local/bin + # ls -l /usr/bin + # ls -l /bin + # ls -l /mingw32/ + # ls -l /mingw32/bin + # ls -l /c/Msys2 - name: Set up MinGW uses: egor-tensin/setup-mingw@v2 - - name: Install wine + with: + platform: x86 + - name: test windows run: | - sudo dpkg --add-architecture i386 - wget -qO - https://dl.winehq.org/wine-builds/winehq.key | sudo apt-key add - - sudo add-apt-repository ppa:cybermax-dexter/sdl2-backport - sudo apt-add-repository "deb https://dl.winehq.org/wine-builds/ubuntu $(lsb_release -cs) main" - sudo apt install --install-recommends winehq-stable + echo $PATH + #choco install winlibs --x86 + #choco install rsync make + #echo "/c/ProgramData/chocolatey/lib/winlibs/tools/mingw32/bin" >> $GITHUB_PATH + #echo "/c/ProgramData/chocolatey/lib/winlibs/tools/mingw32/i686-w64-mingw32/bin" >> $GITHUB_PATH + #dir "C:\msys64" + #dir "C:\msys64\mingw32" + #dir "C:\msys64\mingw32\bin" + #dir C:\ProgramData\Chocolatey\bin + #dir C:\ProgramData\chocolatey\lib\mingw\ + #dir C:\ProgramData\chocolatey\lib\mingw\tools\install\mingw64\bin + #choco install tree + #tree C:\ProgramData\chocolatey\lib\ + #- name: test windowaaaaaa + # run: | + # echo $PATH + # echo %PATH% + # ls -l /c/ProgramData/chocolatey/lib/winlibs/tools/mingw32/bin + # which i686-w64-mingw32-g++ + # dir C:\ProgramData\Chocolatey\bin + # dir C:\ + # dir "C:\Program Files" + # dir "C:\Program Files (x86)" + + # Setup build functions + #- name: Set up MinGW + # uses: egor-tensin/setup-mingw@v2 + #- name: Install Tools + # uses: crazy-max/ghaction-chocolatey@v2 + # with: + # args: install rsync make mingw # Runs a set of commands using the runners shell - name: Run a multi-line script - run: make release + run: | + which i686-w64-mingw32-g++ + make release -i + # post debug + #- name: Post Debug + # run: | + # dir + # cat .depend_master diff --git a/Makefile b/Makefile index b0e7ee9f..c962efc7 100644 --- a/Makefile +++ b/Makefile @@ -1,3 +1,5 @@ +SHELL := /bin/bash +PATH := $(PATH) VERSION = 3.1 SUFFIX = .004 NAME = cccaster @@ -53,6 +55,7 @@ MAIN_OBJECTS = $(MAIN_CPP_SRCS:.cpp=.o) $(CONTRIB_CC_SRCS:.cc=.o) $(CONTRIB_CPP_ DLL_OBJECTS = $(DLL_CPP_SRCS:.cpp=.o) $(HOOK_CC_SRCS:.cc=.o) $(HOOK_C_SRCS:.c=.o) $(CONTRIB_C_SRCS:.c=.o) $(CONTRIB_CPP_SRCS:.cpp=.o) # Tool chain +PREFIX = /c/ProgramData/chocolatey/lib/winlibs/tools/mingw32/bin/i686-w64-mingw32- PREFIX = i686-w64-mingw32- GCC = $(PREFIX)gcc CXX = $(PREFIX)g++ diff --git a/scripts/make_depend b/scripts/make_depend index 5591972b..a01b6bce 100755 --- a/scripts/make_depend +++ b/scripts/make_depend @@ -29,12 +29,12 @@ if [ $? -ne 0 ]; then cp /dev/null .depend_$branch for type in build_debug_$branch build_release_$branch build_logging_$branch; do - sed -r "s/^([A-Za-z.]+\.o\: )/$type\/sequences\/\1/" tmp_depend0 >> .depend_$branch - sed -r "s/^([A-Za-z.]+\.o\: )/$type\/netplay\/\1/" tmp_depend1 >> .depend_$branch - sed -r "s/^([A-Za-z.]+\.o\: )/$type\/tools\/\1/" tmp_depend2 >> .depend_$branch - sed -r "s/^([A-Za-z.]+\.o\: )/$type\/targets\/\1/" tmp_depend3 >> .depend_$branch - sed -r "s/^([A-Za-z.]+\.o\: )/$type\/lib\/\1/" tmp_depend4 >> .depend_$branch - sed -r "s/^([A-Za-z.]+\.o\: )/$type\/tests\/\1/" tmp_depend5 >> .depend_$branch + sed -r "s/^([A-Za-z.]+\.o\: )/$type\/sequences\/\1/;s/\\\:/:/g" tmp_depend0 >> .depend_$branch + sed -r "s/^([A-Za-z.]+\.o\: )/$type\/netplay\/\1/;s/\\\:/:/g" tmp_depend1 >> .depend_$branch + sed -r "s/^([A-Za-z.]+\.o\: )/$type\/tools\/\1/;s/\\\:/:/g" tmp_depend2 >> .depend_$branch + sed -r "s/^([A-Za-z.]+\.o\: )/$type\/targets\/\1/;s/\\\:/:/g" tmp_depend3 >> .depend_$branch + sed -r "s/^([A-Za-z.]+\.o\: )/$type\/lib\/\1/;s/\\\:/:/g" tmp_depend4 >> .depend_$branch + sed -r "s/^([A-Za-z.]+\.o\: )/$type\/tests\/\1/;s/\\\:/:/g" tmp_depend5 >> .depend_$branch done rm -f tmp_depend*