Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'update_ignores'

Browse Source 
Ignore GCC version and architecture tagged library output folders.

See https://github.com/wxWidgets/wxWidgets/pull/1813
This commit is contained in:
Vadim Zeitlin
2020-04-21 16:29:14 +02:00
parent 84e90d93d8 c0e1ad6ac0
commit d76b0186e3
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
.gitignore vendored
View File

@@ -214,13 +214,13 @@
/lib/bcc_lib /lib/bcc_lib
/lib/cdef*.res /lib/cdef*.res
/lib/dmc_lib /lib/dmc_lib
/lib/evc_armv4_lib
/lib/evc_emulator_lib
/lib/expat*.lib /lib/expat*.lib
/lib/gcc_dll /lib/gcc*_dll
/lib/gcc*_x64_dll
/lib/gcc_dll32 /lib/gcc_dll32
/lib/gcc_dll64 /lib/gcc_dll64
/lib/gcc_lib /lib/gcc*_lib
/lib/gcc*_x64_lib
/lib/gcc_lib32 /lib/gcc_lib32
/lib/gcc_lib64 /lib/gcc_lib64
/lib/jpeg*.lib /lib/jpeg*.lib

1
.mailmap
View File

@@ -51,6 +51,7 @@ Richard Fath <richard.fath@t-online.de>
Richard Powell <rmpowell77@me.com> Richard Powell <rmpowell77@me.com>
Rick S <rivdsl@gmail.com> <rivdsl@hotmail.com> Rick S <rivdsl@gmail.com> <rivdsl@hotmail.com>
Roberto Boriotti <roberto.boriotti@canon-europe.com> Roberto Boriotti <roberto.boriotti@canon-europe.com>
Steffen Olszewski <steffen.olszewski@gero-mess.de> <sodev@trac.wxwidgets.org>
Steve Browne <swbrowne@gmail.com> <sbrowne@unknown> Steve Browne <swbrowne@gmail.com> <sbrowne@unknown>
<swbrowne@gmail.com> <amn3sia@gmail.com> <swbrowne@gmail.com> <amn3sia@gmail.com>
Tim Kosse <tim.kosse@gmx.de> <tim.kosse@filezilla-project.org> Tim Kosse <tim.kosse@gmx.de> <tim.kosse@filezilla-project.org>

2
build/bakefiles/config.bkl
View File

@@ -488,7 +488,7 @@ it if SHARED=1 unless you know what you are doing.
<set var="EXTRALIBS_GUI"/> <set var="EXTRALIBS_GUI"/>
<set var="EXTRALIBS_OPENGL"> <set var="EXTRALIBS_OPENGL">
<if cond="COMPILER=='wat' and TOOLKIT=='MSW'">opengl32.lib glu32.lib</if> <if cond="COMPILER=='wat' and TOOLKIT=='MSW'">opengl32.lib glu32.lib</if>
<if cond="COMPILER in ['vc','evc']">opengl32.lib glu32.lib</if> <if cond="COMPILER=='vc'">opengl32.lib glu32.lib</if>
<if cond="COMPILER=='gcc'">-lopengl32 -lglu32</if> <if cond="COMPILER=='gcc'">-lopengl32 -lglu32</if>
</set> </set>
<set var="EXTRALIBS_SDL"/> <set var="EXTRALIBS_SDL"/>