Skip to content

Commit

Permalink
Merge branch 'main' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
kernelwernel authored Mar 22, 2024
2 parents 5100b48 + 5f156e6 commit 77e57ef
Show file tree
Hide file tree
Showing 6 changed files with 962 additions and 891 deletions.
8 changes: 8 additions & 0 deletions .github/workflows/build_run_win_32.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
echo on
cd "%~dp0..\.."
mkdir build
cd build
cmake -G "Visual Studio 17 2022" -A Win32 -S ..
"C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\IDE\devenv.com" "VMAware.sln" /Build "Release|Win32" /Project "vmaware" /ProjectConfig "Release|Win32"
cd Release
vmaware.exe
8 changes: 8 additions & 0 deletions .github/workflows/build_run_win_64.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
echo on
cd "%~dp0..\.."
mkdir build
cd build
cmake -G "Visual Studio 17 2022" -A x64 -S ..
"C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\IDE\devenv.com" "VMAware.sln" /Build "Release|x64" /Project "vmaware" /ProjectConfig "Release|x64"
cd Release
vmaware.exe
20 changes: 20 additions & 0 deletions .github/workflows/windows.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
"on": "push"
"jobs":
"build_run_win_32":
"runs-on": "windows-latest"
"steps":
- "uses": "actions/checkout@main"
- "run": "cmd.exe /c .github\\workflows\\build_run_win_32.bat"
- "uses": "actions/upload-artifact@main"
"with":
"path": "build\\Release\\vmaware.exe"
"name": "vmaware32.exe"
"build_run_win_64":
"runs-on": "windows-latest"
"steps":
- "uses": "actions/checkout@main"
- "run": "cmd.exe /c .github\\workflows\\build_run_win_64.bat"
- "uses": "actions/upload-artifact@main"
"with":
"path": "build\\Release\\vmaware.exe"
"name": "vmaware64.exe"
1 change: 0 additions & 1 deletion src/cli.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ class win_ansi_enabler_t
}
private:
win_ansi_enabler_t(win_ansi_enabler_t const&);
win_ansi_enabler_t& operator=(win_ansi_enabler_t const&);
private:
BOOL m_set;
DWORD m_old;
Expand Down
Loading

0 comments on commit 77e57ef

Please sign in to comment.