Skip to content

Commit

Permalink
Merge branch 'housekeeping' into jftekwar
Browse files Browse the repository at this point in the history
  • Loading branch information
jonof committed Jan 1, 2023
2 parents 069f18b + 0e78225 commit 2877fe1
Show file tree
Hide file tree
Showing 82 changed files with 2,271 additions and 3,823 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
USE_OPENGL=${{ matrix.use_opengl }} \
WITHOUT_GTK=${{ matrix.without_gtk || 1 }} \
USE_ASM=0 \
all utils
all
build-windows:
name: Windows polymost=${{ matrix.use_polymost }} gl=${{ matrix.use_opengl }}
Expand Down Expand Up @@ -63,4 +63,4 @@ jobs:
run: |
echo USE_POLYMOST=${{ matrix.use_polymost }} > Makefile.msvcuser
echo USE_OPENGL=${{ matrix.use_opengl }} >> Makefile.msvcuser
nmake /f Makefile.msvc all utils
nmake /f Makefile.msvc all
8 changes: 4 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
*.map
*~
*.pdb
/.vs
/src/version-auto.c
/src/*_[fv]s.c

Expand All @@ -15,17 +16,16 @@
/xcode/*.xcodeproj/project.xcworkspace
/xcode/*.xcodeproj/xcuserdata
/xcode/Signing.xcconfig

/xcode/build
/.vs

/Makefile.*user
/console.txt
/kenbuild-data/*
/kenbuild/data/*

/game
/build
/kextract
/kgroup
/klist
/transpal
/arttool
/wad2art
Expand Down
66 changes: 0 additions & 66 deletions .travis.yml

This file was deleted.

23 changes: 0 additions & 23 deletions MakeDistributions

This file was deleted.

Loading

0 comments on commit 2877fe1

Please sign in to comment.