adding patch file, but probably will have to recreate it:
git diff v3.2.0 >to-rho-fork.patch
This commit is contained in:
Cheng
parent
2648eb4da1
commit
c2980fa75c
@ -8,9 +8,9 @@
|
||||
#############################################################################
|
||||
|
||||
# Global build options
|
||||
wx_option(wxBUILD_SHARED "Build wx libraries as shared libs" OFF})
|
||||
wx_option(wxBUILD_SHARED "Build wx libraries as shared libs" ${BUILD_SHARED_LIBS})
|
||||
wx_option(wxBUILD_MONOLITHIC "build wxWidgets as single library" OFF)
|
||||
wx_option(wxBUILD_SAMPLES "Build only important samples (SOME) or ALL" SOME
|
||||
wx_option(wxBUILD_SAMPLES "Build only important samples (SOME) or ALL" OFF
|
||||
STRINGS SOME ALL OFF)
|
||||
wx_option(wxBUILD_TESTS "Build console tests (CONSOLE_ONLY) or ALL" OFF
|
||||
STRINGS CONSOLE_ONLY ALL OFF)
|
||||
@ -20,7 +20,7 @@ wx_option(wxBUILD_PRECOMP "Use precompiled headers" ON STRINGS ON OFF COTIRE)
|
||||
mark_as_advanced(wxBUILD_PRECOMP)
|
||||
wx_option(wxBUILD_INSTALL "Create install/uninstall target for wxWidgets")
|
||||
wx_option(wxBUILD_COMPATIBILITY
|
||||
"enable compatibilty with earlier wxWidgets versions" 3.1 STRINGS 2.8 3.0 3.1)
|
||||
"enable compatibilty with earlier wxWidgets versions" 3.0 STRINGS 2.8 3.0 3.1)
|
||||
mark_as_advanced(wxBUILD_COMPATIBILITY)
|
||||
# Allow user specified setup.h folder
|
||||
set(wxBUILD_CUSTOM_SETUP_HEADER_PATH "" CACHE PATH "Include path containing custom wx/setup.h")
|
||||
@ -34,12 +34,12 @@ wx_option(wxBUILD_DEBUG_LEVEL "Debug Level" Default STRINGS Default 0 1 2)
|
||||
mark_as_advanced(wxBUILD_DEBUG_LEVEL)
|
||||
|
||||
if(NOT APPLE)
|
||||
wx_option(wxBUILD_USE_STATIC_RUNTIME "Link using the static runtime library" ON)
|
||||
wx_option(wxBUILD_USE_STATIC_RUNTIME "Link using the static runtime library" OFF)
|
||||
mark_as_advanced(wxBUILD_USE_STATIC_RUNTIME)
|
||||
endif()
|
||||
|
||||
if(MSVC)
|
||||
wx_option(wxBUILD_MSVC_MULTIPROC "Enable multi-processor compilation for MSVC" ON)
|
||||
wx_option(wxBUILD_MSVC_MULTIPROC "Enable multi-processor compilation for MSVC")
|
||||
mark_as_advanced(wxBUILD_MSVC_MULTIPROC)
|
||||
endif()
|
||||
|
||||
@ -53,7 +53,7 @@ if(NOT MSVC OR MSVC_VERSION GREATER 1800)
|
||||
set(wxCXX_STANDARD_DEFAULT COMPILER_DEFAULT)
|
||||
endif()
|
||||
wx_option(wxBUILD_CXX_STANDARD "C++ standard used to build wxWidgets targets"
|
||||
${wxCXX_STANDARD_DEFAULT} 3.1 STRINGS COMPILER_DEFAULT 98 11 14 17 20)
|
||||
${wxCXX_STANDARD_DEFAULT} STRINGS COMPILER_DEFAULT 98 11 14 17 20)
|
||||
endif()
|
||||
|
||||
if(WIN32)
|
||||
|
||||
250
to-rho-fork.patch
Normal file
250
to-rho-fork.patch
Normal file
@ -0,0 +1,250 @@
|
||||
diff --git a/.gitattributes b/.gitattributes
|
||||
index bf16a71493..3906385f47 100644
|
||||
--- a/.gitattributes
|
||||
+++ b/.gitattributes
|
||||
@@ -24,7 +24,6 @@
|
||||
|
||||
*.h.in eol=lf
|
||||
*.m4 eol=lf
|
||||
-*.sh eol=lf
|
||||
configure.in eol=lf
|
||||
Makefile.am eol=lf
|
||||
Makefile.in eol=lf
|
||||
@@ -44,3 +43,19 @@ build/upmake -diff
|
||||
.gitignore export-ignore
|
||||
.gitmodules export-ignore
|
||||
appveyor.yml export-ignore
|
||||
+
|
||||
+* text=auto eol=lf encoding=utf-8 whitespace=trailing-space,space-before-tab,tabwidth=4
|
||||
+.gitignore text eol=lf encoding=utf-8 whitespace=trailing-space,space-before-tab,tabwidth=4
|
||||
+.gitattributes text eol=lf encoding=utf-8 whitespace=trailing-space,space-before-tab,tabwidth=4
|
||||
+.gitmodules text eol=lf encoding=utf-8 whitespace=trailing-space,space-before-tab,tabwidth=4
|
||||
+*.sh text eol=lf encoding=utf-8 whitespace=trailing-space,space-before-tab,tabwidth=4
|
||||
+*.c text eol=lf encoding=utf-8 whitespace=trailing-space,space-before-tab,tabwidth=4
|
||||
+*.cpp text eol=lf encoding=utf-8 whitespace=trailing-space,space-before-tab,tabwidth=4
|
||||
+*.h text eol=lf encoding=utf-8 whitespace=trailing-space,space-before-tab,tabwidth=4
|
||||
+*.txt text eol=lf encoding=utf-8 whitespace=trailing-space,space-before-tab,tabwidth=4
|
||||
+*.html text eol=lf encoding=utf-8 whitespace=trailing-space,space-before-tab,tabwidth=4
|
||||
+*.htm text eol=lf encoding=utf-8 whitespace=trailing-space,space-before-tab,tabwidth=4
|
||||
+*.md text eol=lf encoding=utf-8 whitespace=trailing-space,space-before-tab,tabwidth=4
|
||||
+*.pandoc text eol=lf encoding=utf-8 whitespace=trailing-space,space-before-tab,tabwidth=4
|
||||
+*.css text eol=lf encoding=utf-8 whitespace=trailing-space,space-before-tab,tabwidth=4
|
||||
+*.manifest text eol=lf encoding=utf-8 whitespace=trailing-space,space-before-tab,tabwidth=4
|
||||
\ No newline at end of file
|
||||
diff --git a/.gitmodules b/.gitmodules
|
||||
index eccca68800..77720f19e5 100644
|
||||
--- a/.gitmodules
|
||||
+++ b/.gitmodules
|
||||
@@ -1,32 +1,32 @@
|
||||
[submodule "3rdparty/catch"]
|
||||
path = 3rdparty/catch
|
||||
- url = https://github.com/wxWidgets/Catch.git
|
||||
- branch = wx
|
||||
+ url = git@rho.la:~/Catch.git
|
||||
+ branch = rho-fork
|
||||
[submodule "src/zlib"]
|
||||
path = src/zlib
|
||||
- url = https://github.com/wxWidgets/zlib.git
|
||||
- branch = wx
|
||||
+ url = git@rho.la:~/zlib.git
|
||||
+ branch = rho-fork
|
||||
[submodule "src/png"]
|
||||
path = src/png
|
||||
- url = https://github.com/wxWidgets/libpng.git
|
||||
- branch = wx
|
||||
+ url = git@rho.la:~/libpng.git
|
||||
+ branch = rho-fork
|
||||
[submodule "src/expat"]
|
||||
path = src/expat
|
||||
- url = https://github.com/wxWidgets/libexpat.git
|
||||
- branch = wx
|
||||
+ url = git@rho.la:~/libexpat.git
|
||||
+ branch = rho-fork
|
||||
[submodule "src/tiff"]
|
||||
path = src/tiff
|
||||
- url = https://github.com/wxWidgets/libtiff.git
|
||||
- branch = wx
|
||||
+ url = git@rho.la:~/libtiff.git
|
||||
+ branch = rho-fork
|
||||
[submodule "src/jpeg"]
|
||||
path = src/jpeg
|
||||
- url = https://github.com/wxWidgets/libjpeg-turbo.git
|
||||
- branch = wx
|
||||
+ url = git@rho.la:~/libjpeg-turbo.git
|
||||
+ branch = rho-fork
|
||||
[submodule "3rdparty/pcre"]
|
||||
path = 3rdparty/pcre
|
||||
- url = https://github.com/wxWidgets/pcre
|
||||
- branch = wx
|
||||
+ url = git@rho.la:~/pcre
|
||||
+ branch = rho-fork
|
||||
[submodule "3rdparty/nanosvg"]
|
||||
path = 3rdparty/nanosvg
|
||||
- url = https://github.com/wxWidgets/nanosvg
|
||||
- branch = wx
|
||||
+ url = git@rho.la:~/nanosvg
|
||||
+ branch = rho-fork
|
||||
diff --git a/include/wx/msw/setup.h b/include/wx/msw/setup.h
|
||||
index 6a875dc179..4e189a8fab 100644
|
||||
--- a/include/wx/msw/setup.h
|
||||
+++ b/include/wx/msw/setup.h
|
||||
@@ -44,7 +44,7 @@
|
||||
// in the version after it completely.
|
||||
//
|
||||
// Recommended setting: 0 (please update your code)
|
||||
-#define WXWIN_COMPATIBILITY_3_0 1
|
||||
+#define WXWIN_COMPATIBILITY_3_0 0
|
||||
|
||||
// MSW-only: Set to 0 for accurate dialog units, else 1 for old behaviour when
|
||||
// default system font is used for wxWindow::GetCharWidth/Height() instead of
|
||||
@@ -302,7 +302,7 @@
|
||||
//
|
||||
// Recommended setting: 2 if you want to have maximal performance and don't
|
||||
// care about the scenario described above.
|
||||
-#define wxUSE_COMPILER_TLS 1
|
||||
+#define wxUSE_COMPILER_TLS 2
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// Interoperability with the standard library.
|
||||
@@ -347,7 +347,7 @@
|
||||
//
|
||||
// Recommended setting: 1 unless compatibility with the official wxWidgets
|
||||
// build and/or the existing code is a concern.
|
||||
-#define wxUSE_STD_CONTAINERS 0
|
||||
+#define wxUSE_STD_CONTAINERS 1
|
||||
|
||||
// Use standard C++ streams if 1 instead of wx streams in some places. If
|
||||
// disabled, wx streams are used everywhere and wxWidgets doesn't depend on the
|
||||
@@ -387,7 +387,7 @@
|
||||
//
|
||||
// Recommended setting: 0 to remain compatible with the official builds of
|
||||
// wxWidgets.
|
||||
-#define wxUSE_STD_STRING_CONV_IN_WXSTRING wxUSE_STL
|
||||
+#define wxUSE_STD_STRING_CONV_IN_WXSTRING 1
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// non GUI features selection
|
||||
@@ -550,7 +550,7 @@
|
||||
// Default is 1.
|
||||
//
|
||||
// Recommended setting: 1
|
||||
-#define wxUSE_DIALUP_MANAGER 1
|
||||
+#define wxUSE_DIALUP_MANAGER 0
|
||||
|
||||
// Compile in classes for run-time DLL loading and function calling.
|
||||
// Required by wxUSE_DIALUP_MANAGER.
|
||||
diff --git a/to-rho-fork.patch b/to-rho-fork.patch
|
||||
new file mode 100644
|
||||
index 0000000000..f5c4039361
|
||||
--- /dev/null
|
||||
+++ b/to-rho-fork.patch
|
||||
@@ -0,0 +1,108 @@
|
||||
+diff --git a/.gitattributes b/.gitattributes
|
||||
+index bf16a71493..3906385f47 100644
|
||||
+--- a/.gitattributes
|
||||
++++ b/.gitattributes
|
||||
+@@ -24,7 +24,6 @@
|
||||
+
|
||||
+ *.h.in eol=lf
|
||||
+ *.m4 eol=lf
|
||||
+-*.sh eol=lf
|
||||
+ configure.in eol=lf
|
||||
+ Makefile.am eol=lf
|
||||
+ Makefile.in eol=lf
|
||||
+@@ -44,3 +43,19 @@ build/upmake -diff
|
||||
+ .gitignore export-ignore
|
||||
+ .gitmodules export-ignore
|
||||
+ appveyor.yml export-ignore
|
||||
++
|
||||
++* text=auto eol=lf encoding=utf-8 whitespace=trailing-space,space-before-tab,tabwidth=4
|
||||
++.gitignore text eol=lf encoding=utf-8 whitespace=trailing-space,space-before-tab,tabwidth=4
|
||||
++.gitattributes text eol=lf encoding=utf-8 whitespace=trailing-space,space-before-tab,tabwidth=4
|
||||
++.gitmodules text eol=lf encoding=utf-8 whitespace=trailing-space,space-before-tab,tabwidth=4
|
||||
++*.sh text eol=lf encoding=utf-8 whitespace=trailing-space,space-before-tab,tabwidth=4
|
||||
++*.c text eol=lf encoding=utf-8 whitespace=trailing-space,space-before-tab,tabwidth=4
|
||||
++*.cpp text eol=lf encoding=utf-8 whitespace=trailing-space,space-before-tab,tabwidth=4
|
||||
++*.h text eol=lf encoding=utf-8 whitespace=trailing-space,space-before-tab,tabwidth=4
|
||||
++*.txt text eol=lf encoding=utf-8 whitespace=trailing-space,space-before-tab,tabwidth=4
|
||||
++*.html text eol=lf encoding=utf-8 whitespace=trailing-space,space-before-tab,tabwidth=4
|
||||
++*.htm text eol=lf encoding=utf-8 whitespace=trailing-space,space-before-tab,tabwidth=4
|
||||
++*.md text eol=lf encoding=utf-8 whitespace=trailing-space,space-before-tab,tabwidth=4
|
||||
++*.pandoc text eol=lf encoding=utf-8 whitespace=trailing-space,space-before-tab,tabwidth=4
|
||||
++*.css text eol=lf encoding=utf-8 whitespace=trailing-space,space-before-tab,tabwidth=4
|
||||
++*.manifest text eol=lf encoding=utf-8 whitespace=trailing-space,space-before-tab,tabwidth=4
|
||||
+\ No newline at end of file
|
||||
+diff --git a/.gitmodules b/.gitmodules
|
||||
+index eccca68800..77720f19e5 100644
|
||||
+--- a/.gitmodules
|
||||
++++ b/.gitmodules
|
||||
+@@ -1,32 +1,32 @@
|
||||
+ [submodule "3rdparty/catch"]
|
||||
+ path = 3rdparty/catch
|
||||
+- url = https://github.com/wxWidgets/Catch.git
|
||||
+- branch = wx
|
||||
++ url = git@rho.la:~/Catch.git
|
||||
++ branch = rho-fork
|
||||
+ [submodule "src/zlib"]
|
||||
+ path = src/zlib
|
||||
+- url = https://github.com/wxWidgets/zlib.git
|
||||
+- branch = wx
|
||||
++ url = git@rho.la:~/zlib.git
|
||||
++ branch = rho-fork
|
||||
+ [submodule "src/png"]
|
||||
+ path = src/png
|
||||
+- url = https://github.com/wxWidgets/libpng.git
|
||||
+- branch = wx
|
||||
++ url = git@rho.la:~/libpng.git
|
||||
++ branch = rho-fork
|
||||
+ [submodule "src/expat"]
|
||||
+ path = src/expat
|
||||
+- url = https://github.com/wxWidgets/libexpat.git
|
||||
+- branch = wx
|
||||
++ url = git@rho.la:~/libexpat.git
|
||||
++ branch = rho-fork
|
||||
+ [submodule "src/tiff"]
|
||||
+ path = src/tiff
|
||||
+- url = https://github.com/wxWidgets/libtiff.git
|
||||
+- branch = wx
|
||||
++ url = git@rho.la:~/libtiff.git
|
||||
++ branch = rho-fork
|
||||
+ [submodule "src/jpeg"]
|
||||
+ path = src/jpeg
|
||||
+- url = https://github.com/wxWidgets/libjpeg-turbo.git
|
||||
+- branch = wx
|
||||
++ url = git@rho.la:~/libjpeg-turbo.git
|
||||
++ branch = rho-fork
|
||||
+ [submodule "3rdparty/pcre"]
|
||||
+ path = 3rdparty/pcre
|
||||
+- url = https://github.com/wxWidgets/pcre
|
||||
+- branch = wx
|
||||
++ url = git@rho.la:~/pcre
|
||||
++ branch = rho-fork
|
||||
+ [submodule "3rdparty/nanosvg"]
|
||||
+ path = 3rdparty/nanosvg
|
||||
+- url = https://github.com/wxWidgets/nanosvg
|
||||
+- branch = wx
|
||||
++ url = git@rho.la:~/nanosvg
|
||||
++ branch = rho-fork
|
||||
+diff --git a/include/wx/msw/setup.h b/include/wx/msw/setup.h
|
||||
+index 6a875dc179..4e189a8fab 100644
|
||||
+--- a/include/wx/msw/setup.h
|
||||
++++ b/include/wx/msw/setup.h
|
||||
+@@ -44,7 +44,7 @@
|
||||
+ // in the version after it completely.
|
||||
+ //
|
||||
+ // Recommended setting: 0 (please update your code)
|
||||
+-#define WXWIN_COMPATIBILITY_3_0 1
|
||||
++#define WXWIN_COMPATIBILITY_3_0 0
|
||||
+
|
||||
+ // MSW-only: Set to 0 for accurate dialog units, else 1 for old behaviour when
|
||||
+ // default system font is used for wxWindow::GetCharWidth/Height() instead of
|
||||
+@@ -302,7 +302,7 @@
|
||||
+ //
|
||||
+ // Recommended setting: 2 if you want to have maximal performance and don't
|
||||
+ // care about the scenario described above.
|
||||
+-#define wxUSE_COMPILER_TLS 1
|
||||
++#define wxUSE_COMPILER_TLS 2
|
||||
+
|
||||
+ // ----------------------------------------------------------------------------
|
||||
+ // Interoperability with the standard libr
|
||||
\ No newline at end of file
|
||||
Loading…
Reference in New Issue
Block a user