Skip to content

Commit 13b9372

Browse files
committed
Nothing special
- fixed CppProperties.json format - adjusted settings.json for better appearance in VS2019 - build.sh will not copy SDL.dll for non-rendering projects
1 parent c4fdc5e commit 13b9372

File tree

4 files changed

+11
-7
lines changed

4 files changed

+11
-7
lines changed

.vs/CppProperties.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
"intelliSenseMode": "windows-msvc-x86",
3636
"environments": [
3737
{
38-
"BuildOptions": "--debug",
38+
"BuildOptions": "--debug"
3939
}
4040
]
4141
},
@@ -74,7 +74,7 @@
7474
"intelliSenseMode": "windows-msvc-x64",
7575
"environments": [
7676
{
77-
"BuildOptions": "--64 --debug",
77+
"BuildOptions": "--64 --debug"
7878
}
7979
]
8080
}

.vscode/settings.json

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
{
22
"files.exclude": {
33
"umodel*" : true,
4-
"*.{exe,dll,bat}": true,
4+
"*.{exe,dll}": true,
5+
"*.bat": true,
56
"package*.sh": true,
67
"src-arc.sh": true,
78
"**/.vs": true,
@@ -10,7 +11,10 @@
1011
"**/Docs": true,
1112
"**/makefile-*": true,
1213
"**/obj": true,
13-
"**/Tools/{M,P,T,Umd,UT,unpack}*": true,
14+
"**/Tools/Max*": true,
15+
"**/Tools/Package*": true,
16+
"**/Tools/TypeInfo": true,
17+
"**/Tools/{UmdExtract,UT2down,unpack_obb.pl}": true,
1418
"**/UI/stl-stub": true,
1519
"**/UmodelExport": true,
1620
"**/UmodelSaved": true,

Unreal/UnCoreSerialize.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -516,7 +516,7 @@ FFileArchive::~FFileArchive()
516516
int FFileArchive::GetFileSize() const
517517
{
518518
int64 size = GetFileSize64();
519-
if (size >= (1LL << 31)) appError("GetFileSize returns 0x%llX", size);
519+
if (size >= (1LL << 31)) appError("GetFileSize returns 0x%llX", size); // 2Gb size restriction
520520
return (int)size;
521521
}
522522

build.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,11 +168,11 @@ fi
168168
case "$PLATFORM" in
169169
"vc-win32")
170170
Make $makefile $target || exit 1
171-
cp $root/libs/SDL2/x86/SDL2.dll .
171+
[ $render -eq 1 ] && cp $root/libs/SDL2/x86/SDL2.dll .
172172
;;
173173
"vc-win64")
174174
Make $makefile $target || exit 1
175-
cp $root/libs/SDL2/x64/SDL2.dll .
175+
[ $render -eq 1 ] && cp $root/libs/SDL2/x64/SDL2.dll .
176176
;;
177177
"mingw32"|"cygwin")
178178
PATH=/bin:/usr/bin:$PATH # configure paths for Cygwin

0 commit comments

Comments
 (0)