Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
SRB2
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
STJr
SRB2
Commits
e1300d51
Commit
e1300d51
authored
6 years ago
by
Marco Z
Browse files
Options
Downloads
Patches
Plain Diff
Rename ASSET_PATCH_DLL_GET to PACKAGE_PATCH_DLL_GET
parent
941e2978
No related branches found
Branches containing commit
No related tags found
Tags containing commit
4 merge requests
!488
Merge in next and don't billboard papersprites in GL
,
!443
Add Windows installer building to AppVeyor
,
!442
Add 64-bit job to Appveyor
,
!440
MinGW64:Target nocona for 64-bit builds [revision]
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
appveyor.yml
+1
-1
1 addition, 1 deletion
appveyor.yml
deployer/appveyor/deployer.bat
+2
-2
2 additions, 2 deletions
deployer/appveyor/deployer.bat
with
3 additions
and
3 deletions
appveyor.yml
+
1
−
1
View file @
e1300d51
...
...
@@ -41,7 +41,7 @@ environment:
# This is overridden to 1 for release tag builds
ASSET_FILES_OPTIONAL_GET
:
0
# For patches, also include the X86/X64 DLLs.
ASSET
_PATCH_DLL_GET
:
0
PACKAGE
_PATCH_DLL_GET
:
0
# Delete all asset downloads so they can be redownloaded
ASSET_CLEAN
:
0
...
...
This diff is collapsed.
Click to expand it.
deployer/appveyor/deployer.bat
+
2
−
2
View file @
e1300d51
...
...
@@ -146,7 +146,7 @@ if not [%X86_64%] == [1] ( goto X86_INSTALL )
: Extract DLL binaries
7z x -y "
%ASSET
_ARCHIVE_X64_PATH_LOCAL
%
" -o"assets\deployer\installer" >null
if [
%
ASSET
_PATCH_DLL_GET%
] == [1] (
if [
%
PACKAGE
_PATCH_DLL_GET%
] == [1] (
7z x -y "
!
ASSET_ARCHIVE_X64_PATH_LOCAL
!
" -o"assets\deployer\patch" >null
)
...
...
@@ -169,7 +169,7 @@ goto EOF
: Extract DLL binaries
7z x -y "
%ASSET
_ARCHIVE_X86_PATH_LOCAL
%
" -o"assets\deployer\installer" >null
if [
%
ASSET
_PATCH_DLL_GET%
] == [1] (
if [
%
PACKAGE
_PATCH_DLL_GET%
] == [1] (
7z x -y "
!
ASSET_ARCHIVE_X86_PATH_LOCAL
!
" -o"assets\deployer\patch" >null
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment