Merge branch 'master' into luasocket
This commit is contained in:
commit
87fe90d4d2
@ -29,8 +29,6 @@ BUILDING FROM THE REPOSITORY
|
|||||||
If you have pulled sources from the Premake source repository, you can
|
If you have pulled sources from the Premake source repository, you can
|
||||||
use `Bootstrap.mak` to generate your first premake executable:
|
use `Bootstrap.mak` to generate your first premake executable:
|
||||||
|
|
||||||
$ git submodule init
|
|
||||||
$ git submodule update
|
|
||||||
$ make -f Bootstrap.mak PLATFORM
|
$ make -f Bootstrap.mak PLATFORM
|
||||||
|
|
||||||
Where PLATFORM can be osx or linux.
|
Where PLATFORM can be osx or linux.
|
||||||
|
@ -5,8 +5,6 @@ platform:
|
|||||||
|
|
||||||
before_build:
|
before_build:
|
||||||
- cmd: git clean -ffxd
|
- cmd: git clean -ffxd
|
||||||
- cmd: git submodule sync
|
|
||||||
- cmd: git submodule update --init
|
|
||||||
|
|
||||||
build_script:
|
build_script:
|
||||||
- cmd: call "%VS140COMNTOOLS%\..\..\VC\vcvarsall.bat"
|
- cmd: call "%VS140COMNTOOLS%\..\..\VC\vcvarsall.bat"
|
||||||
|
Loading…
Reference in New Issue
Block a user