Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
XDG Integration
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Silent mode is enabled
All outbound communications are blocked.
Learn more
.
Show more breadcrumbs
JennaHuntsman
XDG Integration
Commits
fe490d52
Commit
fe490d52
authored
5 years ago
by
AndreyL ProductEngine
Browse files
Options
Downloads
Plain Diff
Merged in lindenlab/viewer-xcode11
parents
3feba8be
52c9f578
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
indra/cmake/Variables.cmake
+7
-2
7 additions, 2 deletions
indra/cmake/Variables.cmake
indra/llwindow/llopenglview-objc.mm
+2
-2
2 additions, 2 deletions
indra/llwindow/llopenglview-objc.mm
indra/newview/CMakeLists.txt
+6
-2
6 additions, 2 deletions
indra/newview/CMakeLists.txt
with
15 additions
and
6 deletions
indra/cmake/Variables.cmake
+
7
−
2
View file @
fe490d52
...
@@ -186,12 +186,17 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
...
@@ -186,12 +186,17 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
list
(
GET LL_BUILD_LIST
"
${
sysroot_idx
}
"
CMAKE_OSX_SYSROOT
)
list
(
GET LL_BUILD_LIST
"
${
sysroot_idx
}
"
CMAKE_OSX_SYSROOT
)
message
(
STATUS
"CMAKE_OSX_SYSROOT = '
${
CMAKE_OSX_SYSROOT
}
'"
)
message
(
STATUS
"CMAKE_OSX_SYSROOT = '
${
CMAKE_OSX_SYSROOT
}
'"
)
set
(
XCODE_VERSION 7.0
)
set
(
CMAKE_XCODE_ATTRIBUTE_GCC_VERSION
"com.apple.compilers.llvm.clang.1_0"
)
set
(
CMAKE_XCODE_ATTRIBUTE_GCC_VERSION
"com.apple.compilers.llvm.clang.1_0"
)
set
(
CMAKE_XCODE_ATTRIBUTE_GCC_STRICT_ALIASING NO
)
set
(
CMAKE_XCODE_ATTRIBUTE_GCC_STRICT_ALIASING NO
)
set
(
CMAKE_XCODE_ATTRIBUTE_GCC_FAST_MATH NO
)
set
(
CMAKE_XCODE_ATTRIBUTE_GCC_FAST_MATH NO
)
set
(
CMAKE_XCODE_ATTRIBUTE_CLANG_X86_VECTOR_INSTRUCTIONS ssse3
)
set
(
CMAKE_XCODE_ATTRIBUTE_CLANG_X86_VECTOR_INSTRUCTIONS ssse3
)
# we must hard code this to off for now. xcode's built in signing does not
# handle embedded app bundles such as CEF and others. Any signing for local
# development must be done after the build as we do in viewer_manifest.py for
# released builds
# https://stackoverflow.com/a/54296008
# "-" represents "Sign to Run Locally" and empty string represents "Do Not Sign"
set
(
CMAKE_XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY
""
)
set
(
CMAKE_OSX_ARCHITECTURES
"
${
ARCH
}
"
)
set
(
CMAKE_OSX_ARCHITECTURES
"
${
ARCH
}
"
)
string
(
REPLACE
"i686"
"i386"
CMAKE_OSX_ARCHITECTURES
"
${
CMAKE_OSX_ARCHITECTURES
}
"
)
string
(
REPLACE
"i686"
"i386"
CMAKE_OSX_ARCHITECTURES
"
${
CMAKE_OSX_ARCHITECTURES
}
"
)
...
...
This diff is collapsed.
Click to expand it.
indra/llwindow/llopenglview-objc.mm
+
2
−
2
View file @
fe490d52
...
@@ -816,7 +816,7 @@ attributedStringInfo getSegments(NSAttributedString *str)
...
@@ -816,7 +816,7 @@ attributedStringInfo getSegments(NSAttributedString *str)
[
super
setMarkedText
:
aString
selectedRange
:
selectedRange
replacementRange
:
replacementRange
];
[
super
setMarkedText
:
aString
selectedRange
:
selectedRange
replacementRange
:
replacementRange
];
if
([
aString
length
]
==
0
)
// this means Input Widow becomes empty
if
([
aString
length
]
==
0
)
// this means Input Widow becomes empty
{
{
[
_
window
orderOut
:
_
window
];
// Close this to avoid empty Input Window
[
self
.
window
orderOut
:
self
.
window
];
// Close this to avoid empty Input Window
}
}
}
}
...
@@ -840,7 +840,7 @@ attributedStringInfo getSegments(NSAttributedString *str)
...
@@ -840,7 +840,7 @@ attributedStringInfo getSegments(NSAttributedString *str)
(
mKeyPressed
>=
0xF700
&&
mKeyPressed
<=
0xF8FF
))
(
mKeyPressed
>=
0xF700
&&
mKeyPressed
<=
0xF8FF
))
{
{
// this is case a) of above comment
// this is case a) of above comment
[
_
window
orderOut
:
_
window
];
// to avoid empty Input Window
[
self
.
window
orderOut
:
self
.
window
];
// to avoid empty Input Window
}
}
}
}
...
...
This diff is collapsed.
Click to expand it.
indra/newview/CMakeLists.txt
+
6
−
2
View file @
fe490d52
...
@@ -1377,8 +1377,12 @@ if (DARWIN)
...
@@ -1377,8 +1377,12 @@ if (DARWIN)
PROPERTIES
PROPERTIES
COMPILE_DEFINITIONS
"
${
VIEWER_CHANNEL_VERSION_DEFINES
}
"
COMPILE_DEFINITIONS
"
${
VIEWER_CHANNEL_VERSION_DEFINES
}
"
# BugsplatMac is a module, imported with @import. That language feature
# BugsplatMac is a module, imported with @import. That language feature
# demands these switches.
# demands these -f switches.
COMPILE_FLAGS
"-fmodules -fcxx-modules"
# Xcode 10.2 requires that Objective-C++ headers declare nullability of
# pointer variables. As of 2019-06-26, the BugsplatMac version we're using
# does not yet do so in its own header files. This -W flag prevents fatal
# warnings.
COMPILE_FLAGS
"-fmodules -fcxx-modules -Wno-nullability-completeness"
)
)
find_library
(
AGL_LIBRARY AGL
)
find_library
(
AGL_LIBRARY AGL
)
...
...
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