Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: VDrift/vdrift
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: VDrift/vdrift
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: actions
Choose a head ref
Can’t automatically merge. Don’t worry, you can still create the pull request.
  • 10 commits
  • 3 files changed
  • 1 contributor

Commits on Jul 24, 2020

  1. Copy the full SHA
    76619eb View commit details
  2. Copy the full SHA
    e690e1a View commit details
  3. Copy the full SHA
    0789332 View commit details
  4. Verified

    This commit was created on github.com and signed with GitHub’s verified signature.
    Copy the full SHA
    f11f4b1 View commit details
  5. Verified

    This commit was created on github.com and signed with GitHub’s verified signature.
    Copy the full SHA
    3027af6 View commit details
  6. Verified

    This commit was created on github.com and signed with GitHub’s verified signature.
    Copy the full SHA
    04bbb3b View commit details
  7. Verified

    This commit was created on github.com and signed with GitHub’s verified signature.
    Copy the full SHA
    5e5fbdb View commit details
  8. Copy the full SHA
    043620d View commit details
  9. Copy the full SHA
    36ce538 View commit details
  10. Copy the full SHA
    1150826 View commit details
Showing with 38 additions and 7 deletions.
  1. +30 −1 .github/workflows/build.yml
  2. +7 −5 SConstruct
  3. +1 −1 src/SConscript
31 changes: 30 additions & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -14,4 +14,33 @@ jobs:
sudo apt-get update -y -qq
sudo apt-get install scons libsdl2-dev libsdl2-image-dev libbullet-dev libvorbis-dev libcurl4-gnutls-dev
- name: Build
run: scons
run: scons

test_Windows:

runs-on: windows-latest

defaults:
run:
shell: msys2 {0}
steps:
- uses: actions/checkout@v2
- uses: msys2/setup-msys2@v2
with:
msystem: MINGW64
update: true
install: scons pkg-config mingw-w64-x86_64-python mingw-w64-x86_64-gcc mingw-w64-x86_64-SDL2 mingw-w64-x86_64-SDL2_image mingw-w64-x86_64-bullet mingw-w64-x86_64-curl mingw-w64-x86_64-libvorbis
- name: Build
run: scons

test_MacOS:

runs-on: macOS-latest

steps:
- uses: actions/checkout@v1
- name: install_dependencies
run: |
brew install pkg-config scons sdl2 sdl2_image bullet libvorbis curl
- name: Build
run: scons
12 changes: 7 additions & 5 deletions SConstruct
Original file line number Diff line number Diff line change
@@ -33,6 +33,8 @@ default_datadir = "share/games/vdrift/data"
default_localedir = "share/locale"
default_bindir = "bin"

print('Platform', sys.platform)

#---------------#
# FreeBSD build #
#---------------#
@@ -91,9 +93,9 @@ elif sys.platform == 'darwin':

for a in env['universal']:
if not sdk_path:
print 'Building a universal binary require access to an ' + \
print('Building a universal binary require access to an ' + \
'SDK that has universal \nbinary support.If you know ' + \
'the location of such an SDK, specify it using the \n"SDK" option'
'the location of such an SDK, specify it using the \n"SDK" option')
Exit(1)
env.Append( CCFLAGS = ['-arch', a], LINKFLAGS = ['-arch', a] )

@@ -231,7 +233,7 @@ def distcopy (target, source, env):
def tarballer (target, source, env):
cmd = 'tar -jcf "%s" -C "%s" .' % ( str(target[0]), str(source[0]) )
#cmd = 'tar -jcf ' + str (target[0]) + ' ' + str(source[0]) + " --exclude '*~' "
print 'running ', cmd, ' ... '
print('running ', cmd, ' ... ')
p = os.popen (cmd)
return p.close ()

@@ -361,11 +363,11 @@ env.ParseConfig(env['pkg_config'] + ' bullet --libs --cflags')
conf = Configure(env)
for header in check_headers:
if not conf.CheckCXXHeader(header):
print 'You do not have the %s headers installed. Exiting.' % header
print('You do not have the %s headers installed. Exiting.' % header)
Exit(1)
for lib in check_libs:
if not conf.CheckLibWithHeader(lib[0], lib[1], 'C', lib[2]):
print lib[3]
print(lib[3])
Exit(1)

env = conf.Finish()
2 changes: 1 addition & 1 deletion src/SConscript
Original file line number Diff line number Diff line change
@@ -141,7 +141,7 @@ src = Split("""
utils.cpp
window.cpp""")

src.sort(lambda x, y: cmp(x.lower(),y.lower()))
src.sort(key = lambda x: x.lower())

#------------------------#
# Copy Build Environment #