Permalink
Browse files

Merge branch 'master' of github.com:Unvanquished/Unvanquished into co…

…nnectionless_packet
  • Loading branch information...
mbasaglia committed Jan 5, 2016
2 parents 9914cb0 + 79bab18 commit bcdefa3b2ac62ce696c622fc4d1c357479f7fcc2
Showing with 2,254 additions and 8,809 deletions.
  1. +6 −0 .gitignore
  2. +3 −0 .gitmodules
  3. +14 −11 .travis.yml
  4. +5 −0 CMakeLists.txt
  5. +6 −17 README.md
  6. +16 −0 appveyor.yml
  7. +85 −0 appveyor/install.ps1
  8. +88 −0 appveyor/run_with_env.cmd
  9. +1 −1 daemon/.travis.yml
  10. +51 −19 daemon/CMakeLists.txt
  11. +1 −1 daemon/README.md
  12. +79 −0 daemon/cmake/DaemonCBSE.cmake
  13. +5 −1 daemon/cmake/DaemonFlags.cmake
  14. +1 −1 daemon/cmake/DaemonGame.cmake
  15. +1 −1 daemon/cmake/DaemonNacl.cmake
  16. +1 −1 daemon/cmake/DaemonPlatform.cmake
  17. +170 −0 daemon/cmake/FindLua.cmake
  18. +11 −3 daemon/cmake/toolchain-pnacl.cmake
  19. +1 −0 daemon/libs/breakpad
  20. +3 −0 daemon/src.cmake
  21. +3 −3 daemon/src/common/Color.cpp
  22. +1 −1 daemon/src/common/Color.h
  23. +1 −1 daemon/src/common/Command.cpp
  24. +2 −2 daemon/src/common/Command.h
  25. +1 −1 daemon/src/common/Common.h
  26. +1 −1 daemon/src/common/Compiler.h
  27. +1 −1 daemon/src/common/Cvar.cpp
  28. +2 −2 daemon/src/common/Cvar.h
  29. +1 −1 daemon/src/common/DisjointSets.h
  30. +2 −2 daemon/src/common/Endian.h
  31. +2 −2 daemon/src/common/FileSystem.cpp
  32. +4 −1 daemon/src/common/FileSystem.h
  33. +1 −1 daemon/src/common/IPC/Channel.h
  34. +1 −1 daemon/src/common/IPC/CommandBuffer.cpp
  35. +1 −1 daemon/src/common/IPC/CommandBuffer.h
  36. +1 −1 daemon/src/common/IPC/Common.h
  37. +1 −1 daemon/src/common/IPC/CommonSyscalls.h
  38. +1 −1 daemon/src/common/IPC/Primitives.cpp
  39. +1 −1 daemon/src/common/IPC/Primitives.h
  40. +1 −1 daemon/src/common/LineEditData.cpp
  41. +1 −1 daemon/src/common/LineEditData.h
  42. +1 −1 daemon/src/common/Log.cpp
  43. +1 −1 daemon/src/common/Log.h
  44. +1 −1 daemon/src/common/Math.h
  45. +1 −1 daemon/src/common/Optional.h
  46. +2 −2 daemon/src/common/Platform.h
  47. +1 −1 daemon/src/common/Serialize.h
  48. +1 −1 daemon/src/common/String.cpp
  49. +1 −1 daemon/src/common/String.h
  50. +9 −6 daemon/src/common/System.cpp
  51. +1 −1 daemon/src/common/System.h
  52. +1 −1 daemon/src/common/Util.h
  53. +1 −1 daemon/src/engine/audio/ALObjects.cpp
  54. +1 −1 daemon/src/engine/audio/ALObjects.h
  55. +1 −1 daemon/src/engine/audio/Audio.cpp
  56. +1 −1 daemon/src/engine/audio/Audio.h
  57. +1 −1 daemon/src/engine/audio/AudioData.h
  58. +1 −1 daemon/src/engine/audio/AudioPrivate.h
  59. +1 −1 daemon/src/engine/audio/Emitter.cpp
  60. +1 −1 daemon/src/engine/audio/Emitter.h
  61. +1 −1 daemon/src/engine/audio/OggCodec.cpp
  62. +1 −1 daemon/src/engine/audio/OpusCodec.cpp
  63. +1 −1 daemon/src/engine/audio/Sample.cpp
  64. +1 −1 daemon/src/engine/audio/Sample.h
  65. +1 −1 daemon/src/engine/audio/Sound.cpp
  66. +1 −1 daemon/src/engine/audio/Sound.h
  67. +1 −1 daemon/src/engine/audio/SoundCodec.cpp
  68. +1 −1 daemon/src/engine/audio/SoundCodec.h
  69. +1 −1 daemon/src/engine/audio/WavCodec.cpp
  70. +5 −5 daemon/src/engine/client/ClientApplication.cpp
  71. +2 −1 daemon/src/engine/client/cg_api.h
  72. +6 −1 daemon/src/engine/client/cg_msgdef.h
  73. +18 −118 daemon/src/engine/client/cl_cgame.cpp
  74. +1 −1 daemon/src/engine/client/cl_console.cpp
  75. +0 −91 daemon/src/engine/client/cl_input.cpp
  76. +4 −4 daemon/src/engine/client/cl_keys.cpp
  77. +0 −517 daemon/src/engine/client/cl_main.cpp
  78. +76 −418 daemon/src/engine/client/cl_parse.cpp
  79. +0 −138 daemon/src/engine/client/cl_scrn.cpp
  80. +2 −75 daemon/src/engine/client/client.h
  81. +74 −0 daemon/src/engine/crash_server/crash_server_linux.cpp
  82. +95 −0 daemon/src/engine/crash_server/crash_server_windows.cpp
  83. +1 −1 daemon/src/engine/framework/Application.cpp
  84. +1 −1 daemon/src/engine/framework/Application.h
  85. +2 −2 daemon/src/engine/framework/BaseCommands.cpp
  86. +1 −1 daemon/src/engine/framework/BaseCommands.h
  87. +1 −1 daemon/src/engine/framework/CommandBufferHost.cpp
  88. +1 −1 daemon/src/engine/framework/CommandBufferHost.h
  89. +4 −4 daemon/src/engine/framework/CommandSystem.cpp
  90. +2 −2 daemon/src/engine/framework/CommandSystem.h
  91. +1 −1 daemon/src/engine/framework/CommonVMServices.cpp
  92. +1 −1 daemon/src/engine/framework/CommonVMServices.h
  93. +1 −1 daemon/src/engine/framework/ConsoleField.cpp
  94. +1 −1 daemon/src/engine/framework/ConsoleField.h
  95. +1 −1 daemon/src/engine/framework/ConsoleHistory.cpp
  96. +1 −1 daemon/src/engine/framework/ConsoleHistory.h
  97. +207 −0 daemon/src/engine/framework/CrashDump.cpp
  98. +47 −0 daemon/src/engine/framework/CrashDump.h
  99. +18 −25 daemon/src/engine/framework/CvarSystem.cpp
  100. +4 −4 daemon/src/engine/framework/CvarSystem.h
  101. +1 −1 daemon/src/engine/framework/LogSystem.cpp
  102. +1 −1 daemon/src/engine/framework/LogSystem.h
  103. +1 −1 daemon/src/engine/framework/Resource.cpp
  104. +1 −1 daemon/src/engine/framework/Resource.h
  105. +12 −4 daemon/src/engine/framework/System.cpp
  106. +4 −1 daemon/src/engine/framework/System.h
  107. +1 −1 daemon/src/engine/framework/VirtualMachine.cpp
  108. +1 −1 daemon/src/engine/framework/VirtualMachine.h
  109. +1 −1 daemon/src/engine/null/NullApplication.cpp
  110. +1 −1 daemon/src/engine/null/NullAudio.cpp
  111. +0 −36 daemon/src/engine/qcommon/common.cpp
  112. +0 −10 daemon/src/engine/qcommon/huffman.cpp
  113. +1 −14 daemon/src/engine/qcommon/msg.cpp
  114. +1 −1 daemon/src/engine/qcommon/print_translated.h
  115. +1 −2 daemon/src/engine/qcommon/q_math.cpp
  116. +5 −5 daemon/src/engine/qcommon/q_shared.cpp
  117. +5 −37 daemon/src/engine/qcommon/q_shared.h
  118. +3 −14 daemon/src/engine/qcommon/qcommon.h
  119. +2 −2 daemon/src/engine/renderer/tr_image.cpp
  120. +27 −20 daemon/src/engine/renderer/tr_model.cpp
  121. +1 −1 daemon/src/engine/renderer/tr_shader.cpp
  122. +3 −3 daemon/src/engine/server/ServerApplication.cpp
  123. +0 −36 daemon/src/engine/server/server.h
  124. +1 −1 daemon/src/engine/server/sg_api.h
  125. +5 −0 daemon/src/engine/server/sg_msgdef.h
  126. +0 −225 daemon/src/engine/server/sv_client.cpp
  127. +7 −7 daemon/src/engine/server/sv_init.cpp
  128. +0 −13 daemon/src/engine/server/sv_main.cpp
  129. +7 −0 daemon/src/engine/server/sv_sgame.cpp
  130. +2 −57 daemon/src/engine/server/sv_snapshot.cpp
  131. +47 −0 daemon/src/engine/sys/sdl_compat.cpp
  132. +1 −1 daemon/src/shared/CommandBufferClient.cpp
  133. +1 −1 daemon/src/shared/CommandBufferClient.h
  134. +6 −6 daemon/src/shared/CommonProxies.cpp
  135. +1 −1 daemon/src/shared/CommonProxies.h
  136. +2 −2 daemon/src/shared/VMMain.cpp
  137. +1 −1 daemon/src/shared/VMMain.h
  138. +52 −0 daemon/srclibs.cmake
  139. +3 −11 download-pk3.sh
  140. +1 −1 macosx/Info.plist
  141. +5 −19 main/configs/buildables/medistat.model.cfg
  142. +2 −0 main/configs/classes/human_light.attr.cfg
  143. +2 −0 main/configs/classes/human_medium.attr.cfg
  144. +2 −0 main/configs/classes/human_naked.attr.cfg
  145. +3 −1 main/configs/weapon/level3upg.attr.cfg
  146. +0 −2 main/default.cfg
  147. +2 −2 main/models/weapons/flamer/weapon.cfg
  148. +1 −57 main/scripts/flamer.particle
  149. +4 −25 main/scripts/flamer.shader
  150. +99 −44 main/scripts/medistat.shader
  151. +5 −0 main/ui/hud_overlay.rml
  152. +1 −1 main/ui/human_buy.rml
  153. +1 −1 main/ui/menu_ingame.rml
  154. +1 −1 main/ui/menu_main.rml
  155. +1 −2 src.cmake
  156. +7 −2 src/cgame/cg_api.cpp
  157. +11 −2 src/cgame/cg_buildable.cpp
  158. +7 −2 src/cgame/cg_consolecmds.cpp
  159. +4 −6 src/cgame/cg_local.h
  160. +1 −1 src/cgame/cg_main.cpp
  161. +1 −1 src/cgame/cg_rocket_dataformatter.cpp
  162. +0 −55 src/cgame/cg_rocket_datasource.cpp
  163. +118 −23 src/cgame/cg_rocket_draw.cpp
  164. +1 −1 src/cgame/cg_servercmds.cpp
  165. +1 −1 src/cgame/cg_view.cpp
  166. +11 −101 src/sgame/Clustering.cpp
  167. +0 −3,504 src/sgame/backend/CBSEBackend.cpp
  168. +0 −1,686 src/sgame/backend/CBSEBackend.h
  169. +0 −40 src/sgame/backend/CBSEComponents.h
  170. +0 −1,006 src/sgame/backend/CBSEEntities.h
  171. +1 −1 src/sgame/components/AcidTubeComponent.cpp
  172. +86 −36 src/sgame/components/IgnitableComponent.cpp
  173. +25 −9 src/sgame/components/IgnitableComponent.h
  174. +1 −1 src/sgame/components/ResourceStorageComponent.cpp
  175. +31 −0 src/sgame/components/SpectatorComponent.cpp
  176. +33 −0 src/sgame/components/SpectatorComponent.h
  177. +13 −0 src/sgame/entities.yaml
  178. +26 −60 src/sgame/sg_active.cpp
  179. +12 −12 src/sgame/sg_admin.cpp
  180. +30 −17 src/sgame/sg_api.cpp
  181. +11 −7 src/sgame/sg_client.cpp
  182. +2 −2 src/sgame/sg_cmds.cpp
  183. +25 −0 src/sgame/sg_main.cpp
  184. +1 −0 src/sgame/sg_struct.h
  185. +1 −1 src/sgame/sg_svcmds.cpp
  186. +6 −3 src/sgame/sg_team.cpp
  187. +1 −0 src/sgame/sg_trapcalls.h
  188. +2 −2 src/sgame/sg_utils.cpp
  189. +8 −0 src/shared/bg_gameplay.h
  190. +23 −0 src/shared/bg_misc.cpp
  191. +12 −0 src/shared/bg_parse.cpp
  192. +203 −15 src/shared/bg_pmove.cpp
  193. +7 −2 src/shared/bg_public.h
View
@@ -32,6 +32,12 @@ build
nacl_helper_bootstrap*
nacl_loader*
# pk3s
*.pk3
# CBSE
src/sgame/backend
#ignore editor temporary files
.*.swp
.#*
View
@@ -1,3 +1,6 @@
[submodule "src/utils/cbse"]
path = src/utils/cbse
url = https://github.com/DaemonDevelopers/CBSE-Toolchain.git
[submodule "daemon/libs/breakpad"]
path = daemon/libs/breakpad
url = https://github.com/Unvanquished/breakpad.git
View
@@ -2,9 +2,12 @@ sudo: required
services:
- docker
os:
- linux
- osx
language:
- cpp
# - objective-c
env:
- MODE=0
@@ -17,14 +20,15 @@ compiler:
matrix:
exclude:
- env: MODE=2
- env: MODE=2 # Don't build NaCl gamelogic with gcc
compiler: gcc
install:
- sudo apt-get install software-properties-common
- sudo add-apt-repository ppa:george-edison55/cmake-3.x -y
- sudo apt-get -qq update
- sudo apt-get -qq install
- if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo rm -rf /opt/python; fi # Delete conflicting python
- if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get install software-properties-common; fi
- if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo add-apt-repository ppa:george-edison55/cmake-3.x -y; fi
- if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get -qq update; fi
- if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get -qq install
cmake ninja-build
liblua5.2-dev
libgeoip-dev
@@ -33,11 +37,10 @@ install:
libwebp-dev libjpeg8-dev libpng-dev
libcurl4-gnutls-dev zlib1g-dev
libopenal-dev libogg-dev libvorbis-dev libtheora-dev libxvidcore-dev libopusfile-dev libspeexdsp-dev
nettle-dev libgmp-dev
#install:
# - brew update
# - brew install ninja
nettle-dev libgmp-dev python-yaml python-jinja2; fi
- if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew update; fi
- if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew install ninja; fi
- sudo pip install -r src/utils/cbse/requirements.txt
script:
- mkdir -p build
View
@@ -84,13 +84,18 @@ try_flag(WARNINGS "-W${WARNMODE}unused-parameter")
try_flag(WARNINGS "-Wno-error=unused-private-field")
if (BUILD_SGAME)
include(DaemonCBSE)
CBSE("sgame"
"${GAMELOGIC_DIR}/sgame/entities.yaml"
"${GAMELOGIC_DIR}/sgame/")
GAMEMODULE(NAME sgame
DEFINITIONS
BUILD_SGAME
FLAGS
${WARNINGS}
FILES
${SGAMELIST}
${sgame_GENERATED_CBSE}
)
endif()
View
@@ -8,7 +8,7 @@
| Windows | OSX | Linux |
|---------|-----|-------|
| [![AppVeyor branch](https://img.shields.io/appveyor/ci/DolceTriade/unvanquished/master.svg)](https://ci.appveyor.com/project/DolceTriade/unvanquished/history) | [![Travis branch](https://img.shields.io/travis/Unvanquished/Unvanquished/osx-ci.svg)](https://travis-ci.org/Unvanquished/Unvanquished/branches) | [![Travis branch](https://img.shields.io/travis/Unvanquished/Unvanquished/master.svg)](https://travis-ci.org/Unvanquished/Unvanquished/branches) |
| [![AppVeyor branch](https://img.shields.io/appveyor/ci/DolceTriade/unvanquished/master.svg)](https://ci.appveyor.com/project/DolceTriade/unvanquished/history) | [![Travis branch](https://img.shields.io/travis/Unvanquished/Unvanquished/master.svg)](https://travis-ci.org/Unvanquished/Unvanquished/branches) | [![Travis branch](https://img.shields.io/travis/Unvanquished/Unvanquished/master.svg)](https://travis-ci.org/Unvanquished/Unvanquished/branches) |
This repository contains the gamelogic of the game Unvanquished.
You need to download the game's assets in addition to that to make it run.
@@ -29,14 +29,16 @@ See below for build and launch instructions.
`OpenAL`,
`libogg`,
`libvorbis`,
`libspeex`,
`libtheora`,
`libopus`,
`libopusfile`
###Buildtime
`cmake`
`cmake`,
`python` ≥ 2,
`python-yaml`,
`python-jinja`
###Optional
@@ -55,19 +57,6 @@ See below for build and launch instructions.
Instead of `make`, you can use `make -jN` where `N` is your number of CPU cores to speed up compilation.
###CBSE Toolchain
If you want to mess around with the gamelogic code and modify entities, you'll need the cbse toolchain.
Get it using:
cd src/utils/cbse
git submodule init
git submodule update
Then you can modify the entities.yml file in src/sgame/. After modifying the entites.yml file,
you can run the generate_entities.sh script o regenerate the auto generated component code.
###Visual Studio
1. Run CMake.
@@ -157,5 +146,5 @@ Run `daemon.exe -pakpath PATH`, where `PATH` is the path to the `pkg` directory
####If you don't have the assets
1. Copy the `pkg` directory from the release zip ([torrent](https://cdn.unvanquished.net/latest.php) | [web](http://sourceforge.net/projects/unvanquished/files/Universal_Zip/)) into your build directory.
1. Copy the `pkg` directory from the release zip ([torrent](https://cdn.unvanquished.net/latest.php) | [web](https://github.com/Unvanquished/Unvanquished/releases)) into your build directory.
2. Run `daemon.exe`.
View
@@ -3,6 +3,15 @@ branches:
- debian
environment:
global:
# SDK v7.0 MSVC Express 2008's SetEnv.cmd script will fail if the
# /E:ON and /V:ON options are not enabled in the batch script intepreter
# See: http://stackoverflow.com/a/13751649/163740
CMD_IN_ENV: "cmd /E:ON /V:ON /C .\\appveyor\\run_with_env.cmd"
PYTHON: "C:\\Python27.10-x64"
PYTHON_VERSION: "2.7.10"
PYTHON_ARCH: "64"
matrix:
# - COMPILER: mingw64
# COMPILER_VERSION: "5.1.0"
@@ -30,11 +39,18 @@ matrix:
configuration: Debug
install:
- "powershell appveyor\\install.ps1"
build:
parallel: true
before_build:
- git submodule update --init --recursive
- ps: if (-not(Test-Path($env:PYTHON))) { & appveyor\install.ps1 }
- SET PATH=%PYTHON%;%PYTHON%\Scripts;%PATH%
- python --version
- pip install -r src/utils/cbse/requirements.txt --upgrade
- ps: |
if ($env:COMPILER -eq "mingw64" -AND -Not (Test-Path "C:/mingw64")) {
$url = "http://sourceforge.net/projects/mingw-w64/files/"
View
@@ -0,0 +1,85 @@
# Sample script to install Python and pip under Windows
# Authors: Olivier Grisel and Kyle Kastner
# License: CC0 1.0 Universal: http://creativecommons.org/publicdomain/zero/1.0/
$BASE_URL = "https://www.python.org/ftp/python/"
$GET_PIP_URL = "https://bootstrap.pypa.io/get-pip.py"
$GET_PIP_PATH = "C:\get-pip.py"
function DownloadPython ($python_version, $platform_suffix) {
$webclient = New-Object System.Net.WebClient
$filename = "python-" + $python_version + $platform_suffix + ".msi"
$url = $BASE_URL + $python_version + "/" + $filename
$basedir = $pwd.Path + "\"
$filepath = $basedir + $filename
if (Test-Path $filename) {
Write-Host "Reusing" $filepath
return $filepath
}
# Download and retry up to 5 times in case of network transient errors.
Write-Host "Downloading" $filename "from" $url
$retry_attempts = 3
for($i=0; $i -lt $retry_attempts; $i++){
try {
$webclient.DownloadFile($url, $filepath)
break
}
Catch [Exception]{
Start-Sleep 1
}
}
Write-Host "File saved at" $filepath
return $filepath
}
function InstallPython ($python_version, $architecture, $python_home) {
Write-Host "Installing Python" $python_version "for" $architecture "bit architecture to" $python_home
if (Test-Path $python_home) {
Write-Host $python_home "already exists, skipping."
return $false
}
if ($architecture -eq "32") {
$platform_suffix = ""
} else {
$platform_suffix = ".amd64"
}
$filepath = DownloadPython $python_version $platform_suffix
Write-Host "Installing" $filepath "to" $python_home
$args = "/qn /i $filepath TARGETDIR=$python_home"
Write-Host "msiexec.exe" $args
Start-Process -FilePath "msiexec.exe" -ArgumentList $args -Wait -Passthru
Write-Host "Python $python_version ($architecture) installation complete"
return $true
}
function InstallPip ($python_home) {
$pip_path = $python_home + "/Scripts/pip.exe"
$python_path = $python_home + "/python.exe"
if (-not(Test-Path $pip_path)) {
Write-Host "Installing pip..."
$webclient = New-Object System.Net.WebClient
$webclient.DownloadFile($GET_PIP_URL, $GET_PIP_PATH)
Write-Host "Executing:" $python_path $GET_PIP_PATH
Start-Process -FilePath "$python_path" -ArgumentList "$GET_PIP_PATH" -Wait -Passthru
} else {
Write-Host "pip already installed."
}
}
function InstallPackage ($python_home, $pkg) {
$pip_path = $python_home + "/Scripts/pip.exe"
& $pip_path install $pkg
}
function main () {
InstallPython $env:PYTHON_VERSION $env:PYTHON_ARCH $env:PYTHON
InstallPip $env:PYTHON
InstallPackage $env:PYTHON wheel
}
main
View
@@ -0,0 +1,88 @@
:: To build extensions for 64 bit Python 3, we need to configure environment
:: variables to use the MSVC 2010 C++ compilers from GRMSDKX_EN_DVD.iso of:
:: MS Windows SDK for Windows 7 and .NET Framework 4 (SDK v7.1)
::
:: To build extensions for 64 bit Python 2, we need to configure environment
:: variables to use the MSVC 2008 C++ compilers from GRMSDKX_EN_DVD.iso of:
:: MS Windows SDK for Windows 7 and .NET Framework 3.5 (SDK v7.0)
::
:: 32 bit builds, and 64-bit builds for 3.5 and beyond, do not require specific
:: environment configurations.
::
:: Note: this script needs to be run with the /E:ON and /V:ON flags for the
:: cmd interpreter, at least for (SDK v7.0)
::
:: More details at:
:: https://github.com/cython/cython/wiki/64BitCythonExtensionsOnWindows
:: http://stackoverflow.com/a/13751649/163740
::
:: Author: Olivier Grisel
:: License: CC0 1.0 Universal: http://creativecommons.org/publicdomain/zero/1.0/
::
:: Notes about batch files for Python people:
::
:: Quotes in values are literally part of the values:
:: SET FOO="bar"
:: FOO is now five characters long: " b a r "
:: If you don't want quotes, don't include them on the right-hand side.
::
:: The CALL lines at the end of this file look redundant, but if you move them
:: outside of the IF clauses, they do not run properly in the SET_SDK_64==Y
:: case, I don't know why.
@ECHO OFF
SET COMMAND_TO_RUN=%*
SET WIN_SDK_ROOT=C:\Program Files\Microsoft SDKs\Windows
SET WIN_WDK=c:\Program Files (x86)\Windows Kits\10\Include\wdf
:: Extract the major and minor versions, and allow for the minor version to be
:: more than 9. This requires the version number to have two dots in it.
SET MAJOR_PYTHON_VERSION=%PYTHON_VERSION:~0,1%
IF "%PYTHON_VERSION:~3,1%" == "." (
SET MINOR_PYTHON_VERSION=%PYTHON_VERSION:~2,1%
) ELSE (
SET MINOR_PYTHON_VERSION=%PYTHON_VERSION:~2,2%
)
:: Based on the Python version, determine what SDK version to use, and whether
:: to set the SDK for 64-bit.
IF %MAJOR_PYTHON_VERSION% == 2 (
SET WINDOWS_SDK_VERSION="v7.0"
SET SET_SDK_64=Y
) ELSE (
IF %MAJOR_PYTHON_VERSION% == 3 (
SET WINDOWS_SDK_VERSION="v7.1"
IF %MINOR_PYTHON_VERSION% LEQ 4 (
SET SET_SDK_64=Y
) ELSE (
SET SET_SDK_64=N
IF EXIST "%WIN_WDK%" (
:: See: https://connect.microsoft.com/VisualStudio/feedback/details/1610302/
REN "%WIN_WDK%" 0wdf
)
)
) ELSE (
ECHO Unsupported Python version: "%MAJOR_PYTHON_VERSION%"
EXIT 1
)
)
IF %PYTHON_ARCH% == 64 (
IF %SET_SDK_64% == Y (
ECHO Configuring Windows SDK %WINDOWS_SDK_VERSION% for Python %MAJOR_PYTHON_VERSION% on a 64 bit architecture
SET DISTUTILS_USE_SDK=1
SET MSSdk=1
"%WIN_SDK_ROOT%\%WINDOWS_SDK_VERSION%\Setup\WindowsSdkVer.exe" -q -version:%WINDOWS_SDK_VERSION%
"%WIN_SDK_ROOT%\%WINDOWS_SDK_VERSION%\Bin\SetEnv.cmd" /x64 /release
ECHO Executing: %COMMAND_TO_RUN%
call %COMMAND_TO_RUN% || EXIT 1
) ELSE (
ECHO Using default MSVC build environment for 64 bit architecture
ECHO Executing: %COMMAND_TO_RUN%
call %COMMAND_TO_RUN% || EXIT 1
)
) ELSE (
ECHO Using default MSVC build environment for 32 bit architecture
ECHO Executing: %COMMAND_TO_RUN%
call %COMMAND_TO_RUN% || EXIT 1
)
View
@@ -14,7 +14,7 @@ install:
- sudo add-apt-repository ppa:zoogie/sdl2-snapshots -y
- sudo add-apt-repository ppa:kalakris/cmake -y
- sudo apt-get -qq update
- sudo apt-get -qq install libwebp-dev libglew-dev libgmp-dev libjpeg8-dev libcurl4-gnutls-dev libfreetype6-dev libgeoip-dev libncursesw5-dev libogg-dev libopenal-dev libpng-dev libsdl2-dev libspeexdsp-dev libtheora-dev libvorbis-dev libopusfile-dev libxvidcore-dev nettle-dev zlib1g-dev cmake ninja-build
- sudo apt-get -qq install libwebp-dev libglew-dev libgmp-dev libjpeg8-dev libcurl4-gnutls-dev libfreetype6-dev libgeoip-dev libncursesw5-dev libogg-dev libopenal-dev libpng-dev libsdl2-dev libtheora-dev libvorbis-dev libopusfile-dev libxvidcore-dev nettle-dev zlib1g-dev cmake ninja-build
before_script:
- wget http://clang.llvm.org/libstdc++4.6-clang11.patch;
Oops, something went wrong.

0 comments on commit bcdefa3

Please sign in to comment.