Skip to content

Commit daeec45

Browse files
guanlishengguanlisheng
committed
move the stc to the tail
1 parent 7ab4e3a commit daeec45

File tree

4 files changed

+13
-13
lines changed

4 files changed

+13
-13
lines changed

‎build/bakefiles/wxsqliteplus.bkl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
<wx-mac-app-bundle/>
3636
</if>
3737

38-
<wx-lib>stc</wx-lib>
3938
<wx-lib>richtext</wx-lib>
4039
<wx-lib>html</wx-lib>
4140
<wx-lib>aui</wx-lib>
@@ -44,6 +43,7 @@
4443
<wx-lib>xml</wx-lib>
4544
<wx-lib>core</wx-lib>
4645
<wx-lib>base</wx-lib>
46+
<wx-lib>stc</wx-lib>
4747
</exe>
4848

4949
</makefile>

‎build/msw/makefile.gcc‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -132,9 +132,6 @@ ifeq ($(WX_DEBUG),1)
132132
__WXDEBUG_DEFINE_p_2 = --define __WXDEBUG__
133133
endif
134134
ifeq ($(WX_MONOLITHIC),0)
135-
__WXLIB_STC_NAME_p = -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc
136-
endif
137-
ifeq ($(WX_MONOLITHIC),0)
138135
__WXLIB_RICHTEXT_NAME_p = -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_richtext
139136
endif
140137
ifeq ($(WX_MONOLITHIC),0)
@@ -161,6 +158,9 @@ endif
161158
ifeq ($(WX_MONOLITHIC),1)
162159
__WXLIB_BASE_NAME_p = -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)
163160
endif
161+
ifeq ($(WX_MONOLITHIC),0)
162+
__WXLIB_STC_NAME_p = -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc
163+
endif
164164
ifeq ($(WX_SHARED),0)
165165
____WX_SHARED =
166166
endif
@@ -236,7 +236,7 @@ libwxsqlite.a: $(WXSQLITE_OBJECTS)
236236
ranlib $@
237237

238238
wxsqliteplus.exe: $(WXSQLITEPLUS_OBJECTS) libwxsqlite.a wxsqliteplus_wxsqliteplus_rc.o
239-
$(CXX) -o $@ $(WXSQLITEPLUS_OBJECTS) -mthreads -L$(WX_DIR)$(WXLIBPATH) -Wl,--subsystem,windows -mwindows $(____wxsqlite_1) $(LDFLAGS) libwxsqlite.a $(__WXLIB_STC_NAME_p) -lwxscintilla$(WX3RDPARTYLIBPOSTFIX) $(__WXLIB_RICHTEXT_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_AUI_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) -lwxtiff$(WX3RDPARTYLIBPOSTFIX) -lwxjpeg$(WX3RDPARTYLIBPOSTFIX) -lwxpng$(WX3RDPARTYLIBPOSTFIX) -lwxzlib$(WX3RDPARTYLIBPOSTFIX) -lwxregex$(WXLIBPOSTFIX) -lwxexpat$(WX3RDPARTYLIBPOSTFIX) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32
239+
$(CXX) -o $@ $(WXSQLITEPLUS_OBJECTS) -mthreads -L$(WX_DIR)$(WXLIBPATH) -Wl,--subsystem,windows -mwindows $(____wxsqlite_1) $(LDFLAGS) libwxsqlite.a $(__WXLIB_RICHTEXT_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_AUI_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) $(__WXLIB_STC_NAME_p) -lwxscintilla$(WX3RDPARTYLIBPOSTFIX) -lwxtiff$(WX3RDPARTYLIBPOSTFIX) -lwxjpeg$(WX3RDPARTYLIBPOSTFIX) -lwxpng$(WX3RDPARTYLIBPOSTFIX) -lwxzlib$(WX3RDPARTYLIBPOSTFIX) -lwxregex$(WXLIBPOSTFIX) -lwxexpat$(WX3RDPARTYLIBPOSTFIX) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32
240240

241241
wxsqlite_wxsqlite3.o: ../../3rd/wxsqlite3/src/wxsqlite3.cpp
242242
$(CXX) -c -o $@ $(WXSQLITE_CXXFLAGS) $(CPPDEPS) $<

‎build/msw/makefile.vc‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -185,9 +185,6 @@ __WXLIBPATH_FILENAMES_3 = \lib\$(COMPILER_PREFIX)$(WXCPU)_lib
185185
__WXLIBPATH_FILENAMES_3 = \lib\$(COMPILER_PREFIX)$(WXCPU)_dll
186186
!endif
187187
!if "$(WX_MONOLITHIC)" == "0"
188-
__WXLIB_STC_NAME_p = wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib
189-
!endif
190-
!if "$(WX_MONOLITHIC)" == "0"
191188
__WXLIB_RICHTEXT_NAME_p = wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_richtext.lib
192189
!endif
193190
!if "$(WX_MONOLITHIC)" == "0"
@@ -214,6 +211,9 @@ __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib
214211
!if "$(WX_MONOLITHIC)" == "1"
215212
__WXLIB_BASE_NAME_p = wxmsw$(WX_VERSION)$(WXLIBPOSTFIX).lib
216213
!endif
214+
!if "$(WX_MONOLITHIC)" == "0"
215+
__WXLIB_STC_NAME_p = wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib
216+
!endif
217217
!if "$(WX_DEBUG)" == "0"
218218
____wxsqliteplus__DEBUGINFO_17 =
219219
!endif
@@ -324,7 +324,7 @@ wxsqlite.lib: $(WXSQLITE_OBJECTS)
324324

325325
wxsqliteplus.exe: $(WXSQLITEPLUS_OBJECTS) wxsqlite.lib wxsqliteplus_wxsqliteplus.res
326326
link /NOLOGO /OUT:$@ /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES_3) $(WXMACHINE_FLAG) /SUBSYSTEM:WINDOWS $(____wxsqliteplus__DEBUGINFO_17) /pdb:"wxsqliteplus.pdb" $(____wxsqliteplus__DEBUGINFO_21) $(LDFLAGS) @<<
327-
$(WXSQLITEPLUS_OBJECTS) $(WXSQLITEPLUS_RESOURCES) wxsqlite.lib $(__WXLIB_STC_NAME_p) wxscintilla$(WX3RDPARTYLIBPOSTFIX).lib $(__WXLIB_RICHTEXT_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_AUI_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib
327+
$(WXSQLITEPLUS_OBJECTS) $(WXSQLITEPLUS_RESOURCES) wxsqlite.lib $(__WXLIB_RICHTEXT_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_AUI_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) $(__WXLIB_STC_NAME_p) wxscintilla$(WX3RDPARTYLIBPOSTFIX).lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib
328328
<<
329329

330330
wxsqlite_wxsqlite3.obj: ..\..\3rd\wxsqlite3\src\wxsqlite3.cpp

‎build/msw/wxsqliteplus_wxsqliteplus.vcproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@
8080
<Tool
8181
Name="VCLinkerTool"
8282
AdditionalOptions=""
83-
AdditionalDependencies="$(PlatformName)\$(ConfigurationName)\wxsqlite.lib wxmsw30u_stc.lib wxscintilla.lib wxmsw30u_richtext.lib wxmsw30u_html.lib wxmsw30u_aui.lib wxmsw30u_adv.lib wxbase30u_net.lib wxbase30u_xml.lib wxmsw30u_core.lib wxbase30u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
83+
AdditionalDependencies="$(PlatformName)\$(ConfigurationName)\wxsqlite.lib wxmsw30u_richtext.lib wxmsw30u_html.lib wxmsw30u_aui.lib wxmsw30u_adv.lib wxbase30u_net.lib wxbase30u_xml.lib wxmsw30u_core.lib wxbase30u.lib wxmsw30u_stc.lib wxscintilla.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
8484
OutputFile="$(PlatformName)\$(ConfigurationName)\wxsqliteplus.exe"
8585
LinkIncremental="1"
8686
SuppressStartupBanner="true"
@@ -172,7 +172,7 @@
172172
<Tool
173173
Name="VCLinkerTool"
174174
AdditionalOptions=""
175-
AdditionalDependencies="$(PlatformName)\$(ConfigurationName)\wxsqlite.lib wxmsw30ud_stc.lib wxscintillad.lib wxmsw30ud_richtext.lib wxmsw30ud_html.lib wxmsw30ud_aui.lib wxmsw30ud_adv.lib wxbase30ud_net.lib wxbase30ud_xml.lib wxmsw30ud_core.lib wxbase30ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
175+
AdditionalDependencies="$(PlatformName)\$(ConfigurationName)\wxsqlite.lib wxmsw30ud_richtext.lib wxmsw30ud_html.lib wxmsw30ud_aui.lib wxmsw30ud_adv.lib wxbase30ud_net.lib wxbase30ud_xml.lib wxmsw30ud_core.lib wxbase30ud.lib wxmsw30ud_stc.lib wxscintillad.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
176176
OutputFile="$(PlatformName)\$(ConfigurationName)\wxsqliteplus.exe"
177177
LinkIncremental="2"
178178
SuppressStartupBanner="true"
@@ -263,7 +263,7 @@
263263
<Tool
264264
Name="VCLinkerTool"
265265
AdditionalOptions=""
266-
AdditionalDependencies="$(PlatformName)\$(ConfigurationName)\wxsqlite.lib wxmsw30u_stc.lib wxscintilla.lib wxmsw30u_richtext.lib wxmsw30u_html.lib wxmsw30u_aui.lib wxmsw30u_adv.lib wxbase30u_net.lib wxbase30u_xml.lib wxmsw30u_core.lib wxbase30u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
266+
AdditionalDependencies="$(PlatformName)\$(ConfigurationName)\wxsqlite.lib wxmsw30u_richtext.lib wxmsw30u_html.lib wxmsw30u_aui.lib wxmsw30u_adv.lib wxbase30u_net.lib wxbase30u_xml.lib wxmsw30u_core.lib wxbase30u.lib wxmsw30u_stc.lib wxscintilla.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
267267
OutputFile="$(PlatformName)\$(ConfigurationName)\wxsqliteplus.exe"
268268
LinkIncremental="1"
269269
SuppressStartupBanner="true"
@@ -355,7 +355,7 @@
355355
<Tool
356356
Name="VCLinkerTool"
357357
AdditionalOptions=""
358-
AdditionalDependencies="$(PlatformName)\$(ConfigurationName)\wxsqlite.lib wxmsw30ud_stc.lib wxscintillad.lib wxmsw30ud_richtext.lib wxmsw30ud_html.lib wxmsw30ud_aui.lib wxmsw30ud_adv.lib wxbase30ud_net.lib wxbase30ud_xml.lib wxmsw30ud_core.lib wxbase30ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
358+
AdditionalDependencies="$(PlatformName)\$(ConfigurationName)\wxsqlite.lib wxmsw30ud_richtext.lib wxmsw30ud_html.lib wxmsw30ud_aui.lib wxmsw30ud_adv.lib wxbase30ud_net.lib wxbase30ud_xml.lib wxmsw30ud_core.lib wxbase30ud.lib wxmsw30ud_stc.lib wxscintillad.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
359359
OutputFile="$(PlatformName)\$(ConfigurationName)\wxsqliteplus.exe"
360360
LinkIncremental="2"
361361
SuppressStartupBanner="true"

0 commit comments

Comments
 (0)