-
-
Notifications
You must be signed in to change notification settings - Fork 474
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Update build instructions and add a new patch for Linux...
Add patch for CMakeLists.txt.in for Ubuntu 12 compile errors. Update patches.
- Loading branch information
Showing
7 changed files
with
256 additions
and
91 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,41 @@ | ||
diff --git CMakeLists.txt.in CMakeLists.txt.in | ||
index 54d6c2d..7d9f923 100644 | ||
--- CMakeLists.txt.in | ||
+++ CMakeLists.txt.in | ||
@@ -204,7 +204,7 @@ if(OS_LINUX) | ||
# -fvisibility-inlines-hidden = Give hidden visibility to inlined class member functions | ||
# -std=gnu++11 = Use the C++11 language standard including GNU extensions | ||
# -Wsign-compare = Warn about mixed signed/unsigned type comparisons | ||
- set(CEF_CXX_COMPILER_FLAGS "-fno-exceptions -fno-rtti -fno-threadsafe-statics -fvisibility-inlines-hidden -std=gnu++11 -Wsign-compare") | ||
+ set(CEF_CXX_COMPILER_FLAGS "-fno-exceptions -fno-rtti -fno-threadsafe-statics -fvisibility-inlines-hidden -Wsign-compare") | ||
# -O0 = Disable optimizations | ||
# -g = Generate debug information | ||
set(CEF_COMPILER_FLAGS_DEBUG "-O0 -g") | ||
@@ -237,18 +237,6 @@ if(OS_LINUX) | ||
set(CEF_C_COMPILER_FLAGS "${CEF_C_COMPILER_FLAGS} -Wno-unused-local-typedefs") | ||
endif() | ||
|
||
- # -Wno-literal-suffix = Don't warn about invalid suffixes on literals | ||
- CHECK_CXX_COMPILER_FLAG(-Wno-literal-suffix COMPILER_SUPPORTS_NO_LITERAL_SUFFIX) | ||
- if(COMPILER_SUPPORTS_NO_LITERAL_SUFFIX) | ||
- set(CEF_CXX_COMPILER_FLAGS "${CEF_CXX_COMPILER_FLAGS} -Wno-literal-suffix") | ||
- endif() | ||
- | ||
- # -Wno-narrowing = Don't warn about type narrowing | ||
- CHECK_CXX_COMPILER_FLAG(-Wno-narrowing COMPILER_SUPPORTS_NO_NARROWING) | ||
- if(COMPILER_SUPPORTS_NO_NARROWING) | ||
- set(CEF_CXX_COMPILER_FLAGS "${CEF_CXX_COMPILER_FLAGS} -Wno-narrowing") | ||
- endif() | ||
- | ||
if(PROJECT_ARCH STREQUAL "x86_64") | ||
# 64-bit architecture. | ||
set(CEF_COMPILER_FLAGS "${CEF_COMPILER_FLAGS} -m64 -march=x86-64") | ||
@@ -333,7 +321,7 @@ if(OS_MACOSX) | ||
# -O3 = Optimize for maximum speed plus a few extras | ||
set(CEF_COMPILER_FLAGS_RELEASE "-O3") | ||
# -Wl,-search_paths_first = Search for static or shared library versions in the same pass | ||
- # -Wl,-ObjC = Support creation of creation of ObjC static libraries | ||
+ # -Wl,-ObjC = Support creation of creation of ObjC static libraries | ||
# -Wl,-pie = Generate position-independent code suitable for executables only | ||
set(CEF_LINKER_FLAGS "-Wl,-search_paths_first -Wl,-ObjC -Wl,-pie") | ||
# -Wl,-dead_strip = Strip dead code |
File renamed without changes.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.