AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Modify build system files to use PlatWXcocoa.mm

Browse Source 
A recent commit added the file src/stc/PlatWXcocoa.mm needed for wxSTC
with the cocoa port. This commit modifies the build system files to
use this new file when it is needed.
This commit is contained in:
New Pagodi 2019-03-20 00:12:41 -05:00
parent 66d340ae15
commit f2e1aa46fe
6 changed files with 42 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
build/bakefiles/files.bkl
View File

@ -3459,16 +3459,23 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
<!-- wxSTC -->
<!-- ====================================================================== -->
<set var="STC_SRC" hints="files">
<set var="STC_CMN_SRC" hints="files">
src/stc/stc.cpp
src/stc/PlatWX.cpp
src/stc/ScintillaWX.cpp
</set>
<set var="STC_HDR" hints="files">
<set var="STC_CMN_HDR" hints="files">
wx/stc/stc.h
</set>
<set var="STC_OSX_COCOA_SRC" hints="files">
src/stc/PlatWXcocoa.mm
</set>
<set var="STC_OSX_COCOA_HDR" hints="files">
</set>
<!-- ====================================================================== -->
<!-- Define sources for specific libraries: -->
<!-- ====================================================================== -->
@ -3650,6 +3657,16 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
<set var="MEDIA_SRC">$(MEDIA_CMN_SRC) $(MEDIA_PLATFORM_SRC)</set>
<set var="MEDIA_HDR">$(MEDIA_CMN_HDR) $(MEDIA_PLATFORM_HDR)</set>
<!-- wxSTC files: -->
<set var="STC_PLATFORM_SRC" hints="files">
<if cond="TOOLKIT=='OSX_COCOA'">$(STC_OSX_COCOA_SRC)</if>
</set>
<set var="STC_PLATFORM_HDR" hints="files">
<if cond="TOOLKIT=='OSX_COCOA'">$(STC_OSX_COCOA_HDR)</if>
</set>
<set var="STC_SRC">$(STC_CMN_SRC) $(STC_PLATFORM_SRC)</set>
<set var="STC_HDR">$(STC_CMN_HDR) $(STC_PLATFORM_HDR)</set>
<set var="GUI_CORE_HEADERS" hints="files">
<if cond="USE_GUI=='1' and WXUNIV=='0'">$(GUI_HDR)</if>

11
build/cmake/files.cmake
View File

@ -3196,13 +3196,20 @@ set(RICHTEXT_HDR
wx/xrc/xh_richtext.h
)
set(STC_SRC
set(STC_CMN_SRC
src/stc/stc.cpp
src/stc/PlatWX.cpp
src/stc/ScintillaWX.cpp
)
set(STC_HDR
set(STC_CMN_HDR
wx/stc/stc.h
)
set(STC_OSX_COCOA_SRC
src/stc/PlatWXcocoa.mm
)
set(STC_OSX_COCOA_HDR
)

6
build/cmake/lib/stc/CMakeLists.txt
View File

@ -9,7 +9,11 @@
include(../../source_groups.cmake)
wx_append_sources(STC_FILES STC)
wx_append_sources(STC_FILES STC_CMN)
if(WXOSX_COCOA)
wx_append_sources(STC_FILES STC_OSX_COCOA)
endif()
wx_add_builtin_library(wxscintilla
src/stc/scintilla/lexers/LexA68k.cxx

9
build/files
View File

@ -3129,10 +3129,15 @@ RICHTEXT_HDR =
# wxSTC
STC_SRC =
STC_CMN_SRC =
src/stc/stc.cpp
src/stc/PlatWX.cpp
src/stc/ScintillaWX.cpp
STC_HDR =
STC_CMN_HDR =
wx/stc/stc.h
STC_OSX_COCOA_SRC =
src/stc/PlatWXcocoa.mm
STC_OSX_COCOA_HDR =

2
build/upmake
View File

@ -1441,7 +1441,7 @@ if (!$only_bkl) {
qa => [qw(QA)],
ribbon => [qw(RIBBON)],
richtext => [qw(RICHTEXT)],
stc => [qw(STC)],
stc => [qw(STC_CMN)],
webview => [qw(WEBVIEW_CMN WEBVIEW_MSW)],
xml => [qw(XML)],
xrc => [qw(XRC)],

2
build/upmake_script.pl
View File

@ -82,7 +82,7 @@ if (!$only_bkl) {
qa => [qw(QA)],
ribbon => [qw(RIBBON)],
richtext => [qw(RICHTEXT)],
stc => [qw(STC)],
stc => [qw(STC_CMN)],
webview => [qw(WEBVIEW_CMN WEBVIEW_MSW)],
xml => [qw(XML)],
xrc => [qw(XRC)],