piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-30 01:29:42 -06:00
Code Issues Packages Projects Releases Wiki Activity

Allow building with Externals/wxWidgets3 on Linux and import

Browse Source 
libpng so it can be maintained independently of wxWidgets.


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7172 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Soren Jorvang
2011-02-14 21:25:08 +00:00
parent ae4c8c81ac
commit f00a909103
27 changed files with 28331 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
Externals/wxWidgets3/SConscript vendored
View File

@ -11,11 +11,10 @@ env['HAVE_WX'] = 1
wxenv = env.Clone()
wxenv['CCFLAGS'] += ['-fexceptions']
wxenv['CCFLAGS'] += ['-Wno-deprecated-declarations']
wxenv['CCFLAGS'] += ['-Wno-shadow', '-Wno-sign-compare']
wxenv['CPPDEFINES'] += ['WXBUILDING']
if sys.platform == 'darwin':
wxenv['CCFLAGS'] += ['-Wno-deprecated-declarations']
wxenv['CPPDEFINES'] += ['__WXMAC__', '__WXOSX__'] # ['__WXOSX_COCOA__']
# gtk, msw, osx and shared files as of r66858
@ -167,7 +166,7 @@ common = [
'src/common/log.cpp',
'src/common/longlong.cpp',
'src/common/matrix.cpp',
'src/common/mediactrlcmn.cpp',
#'src/common/mediactrlcmn.cpp',
'src/common/memory.cpp',
'src/common/menucmn.cpp',
'src/common/mimecmn.cpp',
@ -622,9 +621,9 @@ msw = [
'src/msw/listctrl.cpp',
'src/msw/main.cpp',
'src/msw/mdi.cpp',
'src/msw/mediactrl_am.cpp',
'src/msw/mediactrl_qt.cpp',
'src/msw/mediactrl_wmp10.cpp',
#'src/msw/mediactrl_am.cpp',
#'src/msw/mediactrl_qt.cpp',
#'src/msw/mediactrl_wmp10.cpp',
'src/msw/menu.cpp',
'src/msw/menuitem.cpp',
'src/msw/metafile.cpp',
@ -1153,7 +1152,7 @@ unixgtk = [
'src/unix/fswatcher_inotify.cpp',
'src/unix/glx11.cpp',
'src/unix/joystick.cpp',
'src/unix/mediactrl.cpp',
#'src/unix/mediactrl.cpp',
'src/unix/mimetype.cpp',
'src/unix/sound.cpp',
'src/unix/sound_sdl.cpp',
@ -1268,8 +1267,8 @@ else:
#env['LIBS'] += wxenv.StaticObject(xrc)
#wxenv['CPPPATH'] += ['#Externals/wxWidgets3/src/regex']
#env['LIBS'] += wxenv.StaticObject(regex)
wxenv['CPPPATH'] += ['#Externals/wxWidgets3/src/png']
env['LIBS'] += wxenv.StaticObject(png)
#wxenv['CPPPATH'] += ['#Externals/wxWidgets3/src/png']
#env['LIBS'] += wxenv.StaticObject(png)
#wxenv['CPPPATH'] += ['#Externals/wxWidgets3/src/jpeg']
#env['LIBS'] += wxenv.StaticObject(jpeg)
#wxenv['CPPDEFINES'] += ['__WX__', 'SCI_LEXER', 'LINK_LEXERS']

2
Externals/wxWidgets3/wx/setup.h vendored
View File

@ -1,4 +1,6 @@
#ifdef __APPLE__
#define __WXMAC__
#define __WXOSX__
#include "wx/wxcocoa.h"
#elif defined _WIN32
#include "wx/wxmsw.h"

22
Externals/wxWidgets3/wx/wxgtk.h vendored
View File

@ -866,9 +866,6 @@
/* The type of 5th argument to getsockopt() - usually size_t or int */
#define SOCKOPTLEN_T socklen_t
/* The type of statvfs(2) argument */
#define WX_STATFS_T struct statfs
/* The signal handler prototype */
#define wxTYPE_SA_HANDLER int
@ -940,15 +937,6 @@
(defined in the unix98 standard) */
#define HAVE_UNIX98_PRINTF 1
/* define if you have statfs function */
#define HAVE_STATFS 1
/* define if you have statfs prototype */
#define HAVE_STATFS_DECL 1
/* define if you have statvfs function */
/* #undef HAVE_STATVFS */
/* Define if you have strtoull() and strtoll() */
#define HAVE_STRTOULL 1
@ -1131,7 +1119,11 @@
#define HAVE_ICONV 1
/* Define as "const" if the declaration of iconv() needs const. */
#if defined __FreeBSD__ || __NetBSD__
#define ICONV_CONST const
#else
#define ICONV_CONST
#endif
/* Define if you have the <langinfo.h> header file. */
#define HAVE_LANGINFO_H 1
@ -1205,12 +1197,6 @@
/* Define if locale_t is available */
/* #undef HAVE_LOCALE_T */
/* Define if you have inotify_xxx() functions. */
/* #undef wxHAS_INOTIFY */
/* Define if you have kqueu_xxx() functions. */
#define wxHAS_KQUEUE 1
/* -------------------------------------------------------------------------
Win32 adjustments section
------------------------------------------------------------------------- */