Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
69,856 Commits 1 Branch 330 Tags
e7ff76d7624595486b32e3c9c7aca33c74f00f28
Commit Graph

66 Commits

Author SHA1 Message Date
Jan Niklas Hasse
6238f577db Fix cross-compiling with CMake due to wrong ws2_32 case 
Use "ws2_32" in lower-case to ensure the library is found when
cross-compiling and using a case-sensitive filesystem.

Closes https://github.com/wxWidgets/wxWidgets/pull/772
 2018-04-04 16:53:15 +02:00
Vadim Zeitlin
70cb9739f6 Merge branch 'cmake-fixes' of https://github.com/MaartenBent/wxWidgets 
CMake fixes including support for building wxGTK3 on Windows.

See https://github.com/wxWidgets/wxWidgets/pull/768
 2018-03-31 01:42:49 +02:00
Maarten Bent
e4c0beac25 CMake: Remove duplicate wxUSE_IMAGE option 2018-03-23 21:59:38 +01:00
Maarten Bent
e2ddc3e863 CMake: Fix GTK3 Win32 build 
Add 'BEFORE' to target_include_directories so we include the headers
of the buildin third-party libraries before headers of third-party
libraries included in wxTOOLKIT_INCLUDE_DIRS.
 2018-03-23 21:58:39 +01:00
Kolya Kosenko
d6a284783a Fix wxGTK/Win32 CMake build 2018-02-27 23:47:27 +02:00
Maarten Bent
04b79788fc CMake: declare third-party libraries in options 
So the wxUSE_[lib] variables can be used in init.cmake.
 2018-01-29 00:45:28 +01:00
Maarten Bent
5017c6c8c2 CMake: expat code in separate file 
Consistent with other external libraries.
 2018-01-27 21:47:01 +01:00
Maarten Bent
dc0d93cccc CMake: Fix library order in wxMSW build 
uuid should be linked before oleacc, otherwise it causes multiple definition of `IID_IAccessible' (with MinGW64 gcc).
To simplify even more, specify all required libraries in wxTOOLKIT_LIBRARIES, in the same order as in the makefiles.
Add uxtheme library, it is required since wxUxThemeEngine wrapper has been removed.
 2018-01-24 01:04:41 +01:00
Maarten Bent
76617ddb1e CMake: Add missing OpenGL files in GTK build 2018-01-24 00:47:58 +01:00
Maarten Bent
f166d3b9c0 CMake: Don't use external project for wxexpat 
This simplifies things a lot. And it is also not used for png, tiff and zlib.
 2018-01-11 22:09:51 +01:00
Alexey Rassikhin
82da79d038 Workaround for expat builtin debug postfix 
expat lib has debug postfix on windows only.
 2017-12-15 13:59:57 +03:00
Alexey Rassikhin
6b15f19107 Fix expat config for "NMake Makefiles" target. 2017-12-15 11:53:50 +03:00
Vadim Zeitlin
6f23cea6df Fix the path of Expat library after move to submodules 
It's in src/expat/expat now instead of being directly under src/expat.
 2017-12-10 17:53:21 +01:00
Vadim Zeitlin
8cb84cd0f7 Add LexEDIFACT.cxx to wxscintilla library CMake sources 
This file has been added after CMake branch split from master.
 2017-12-09 23:56:12 +01:00
Vadim Zeitlin
c66c9c5ae6 Merge branch 'build_cmake' of https://github.com/TcT2k/wxWidgets 
Add CMake-based build system.

Merge the original branch without any changes except for resolving the
conflict due to moving the contents of .travis.yml to a separate file by
propagating the changes done in this file since then to the new script
and rerunning ./build/update-setup-h and ./build/cmake/update_files.py
to update the file lists changed in the meanwhile.

Closes https://github.com/wxWidgets/wxWidgets/pull/330
 2017-12-09 15:09:47 +01:00
Tobias Taschner
da2b8ea812 Add CMake build system 
Add CMake build system for libraries, tests and samples
update_files.py converts build/files into CMake format.
build/update-setup-h has been modified to update build/cmake/setup.h.in.
 2017-01-03 20:53:10 +01:00