Koncord
|
f271a65d93
|
[General] Update Travis CI
|
6 years ago |
David Cernat
|
65de028e0d
|
Merge pull request #462 from OpenMW/master
Add OpenMW commits up to 23 Jul 2018
|
7 years ago |
Bret Curtis
|
84b80ae405
|
no spaces in assignment
|
7 years ago |
|
Bret Curtis
|
b910106713
|
Catch an unbound variable before it happens.
|
7 years ago |
|
David Cernat
|
6cb5ac6e63
|
Merge pull request #457 from OpenMW/master while resolving conflicts
Conflicts:
CMakeLists.txt
apps/openmw/engine.cpp
apps/openmw/main.cpp
apps/openmw/mwgui/windowmanagerimp.cpp
apps/openmw/mwmechanics/character.cpp
components/CMakeLists.txt
|
7 years ago |
|
Bret Curtis
|
739c49d59b
|
Merge branch 'master' into 'win10_ci'
# Conflicts:
# CI/before_script.msvc.sh
|
7 years ago |
|
David Cernat
|
a236ffc4be
|
Merge pull request #456 from OpenMW/master while resolving conflicts
# Conflicts:
# .travis.yml
# README.md
# apps/openmw/mwgui/quickkeysmenu.cpp
# apps/openmw/mwmechanics/actors.cpp
# apps/openmw/mwmechanics/combat.cpp
|
7 years ago |
|
Bret Curtis
|
57e2573593
|
Update before_script.msvc.sh
check if temp directory exists, error out and warn user about it.
|
7 years ago |
|
Bret Curtis
|
70e9d5c0a0
|
; it?
|
7 years ago |
|
Bret Curtis
|
11030e56c4
|
detect existing dir
|
7 years ago |
|
Bret Curtis
|
4f07ca28a6
|
Try passing the _real_ windows dir to innoinstaller, then using the linux-like directory for mv.
|
7 years ago |
|
Bret Curtis
|
d4c9586bd0
|
try just converting the \ to a /
|
7 years ago |
|
Bret Curtis
|
af75c1e909
|
Update before_script.msvc.sh
reverting back to what works
|
7 years ago |
|
Bret Curtis
|
4d60fe5a76
|
reverting back
|
7 years ago |
|
Bret Curtis
|
b8b07b52f0
|
try this...
|
7 years ago |
|
Bret Curtis
|
4177fd04eb
|
Update before_script.msvc.sh
Does it blend?
|
7 years ago |
|
Bret Curtis
|
209359bbc3
|
Try this on for size...
|
7 years ago |
|
Bret Curtis
|
78a3f95ee4
|
Update before_script.msvc.sh
|
7 years ago |
|
Bret Curtis
|
2bf0d598cf
|
Update before_script.msvc.sh
Wrap in quites
|
7 years ago |
|
Bret Curtis
|
c474709127
|
Update before_script.msvc.sh
|
7 years ago |
|
Bret Curtis
|
ca0f6fff4a
|
Update before_script.msvc.sh
|
7 years ago |
|
Bret Curtis
|
dc48a46e50
|
Update before_script.msvc.sh
|
7 years ago |
|
Bret Curtis
|
a6d6dd5995
|
updating for the nits
|
7 years ago |
|
Bret Curtis
|
8811c7141a
|
Update before_script.msvc.sh
taking nits into account :)
|
7 years ago |
|
Bret Curtis
|
c2ff30c4d7
|
correcting from GH/AV feedback, testing on GL.
|
7 years ago |
|
Bret Curtis
|
a532aef935
|
Update before_script.msvc.sh
updating version check and correct indentation, wrap BOOST_SDK in "" to support dirs with spaces.
|
7 years ago |
|
Bret Curtis
|
4c0e475092
|
Update before_script.msvc.sh
Use powershell trick with boost_temp so there is little chance of collision.
|
7 years ago |
|
Bret Curtis
|
bccd83c656
|
Use 1.67
|
7 years ago |
|
Bret Curtis
|
bc830a9c45
|
use boost_temp
|
7 years ago |
|
Bret Curtis
|
63bbc77ee7
|
try using the powershell trick from AnyOldName3
|
7 years ago |
|
Bret Curtis
|
3379eafd33
|
Update before_script.msvc.sh
|
7 years ago |
|
Bret Curtis
|
3ceb9116de
|
Give pwd -W a try
|
7 years ago |
|
Bret Curtis
|
c4a4111b2e
|
Update before_script.msvc.sh
|
7 years ago |
|
Bret Curtis
|
fb6ad9faec
|
try %TMP% ?
|
7 years ago |
|
Bret Curtis
|
4ad3d66629
|
try using just ${TMP}
|
7 years ago |
|
Bret Curtis
|
8be52d228e
|
Update before_script.msvc.sh
small fixes
|
7 years ago |
|
Bret Curtis
|
60ec340fa3
|
remove toolset_real, use just toolset, do proper comparison
|
7 years ago |
|
Bret Curtis
|
71314f0c3a
|
Use boost 1.67 instead of 1.61
|
7 years ago |
|
Bret Curtis
|
46575d8de7
|
Update before_script.msvc.sh
1.61 -> 1.67
|
7 years ago |
|
Bret Curtis
|
660193ae1b
|
Update before_script.msvc.sh
This has working GL Win10 MSVC updates, should be cross-compatible with appveyor.
|
7 years ago |
|
Bret Curtis
|
1c4363eaa6
|
Using SYSTEMDRIVE because TEMP apparently means something different in bash then to windows cmd.
|
7 years ago |
|
Bret Curtis
|
7bf502dd02
|
Bash it out!
|
7 years ago |
|
Bret Curtis
|
1061270ac0
|
Try using @TEMP@ instead of hard coding it.
|
7 years ago |
|
Bret Curtis
|
45d77372a0
|
with 260 char path fixed, this should work.
|
7 years ago |
|
Bret Curtis
|
f17426cbcd
|
give boost 1.67 a spin with msvc 14.1
|
7 years ago |
|
Bret Curtis
|
bd602847b5
|
fix broken QT 5.7.0 link
|
7 years ago |
|
Bret Curtis
|
59a4251a6a
|
try to extract boost higher up in dir, then move.
|
7 years ago |
|
Bret Curtis
|
b6fc204dd3
|
be more aggressive about suppressing message boxes
|
7 years ago |
|
Bret Curtis
|
f7e1083ba4
|
get more output from boost
|
7 years ago |
|
Bret Curtis
|
e068ee3533
|
tell unzip to overwrite all files
|
7 years ago |