configure wxWidgets 3.0, update .gitignore

Configures the settings in include/wx/msw/setup.h.
Removes icons from include/wx/msw/wx.rc.
Deletes include/wx/msw/rcdefs.h (autogenerated by build process).

Updates .gitignore by including wxWidgets3.0 build files and adds a
missing '/' to build.

.gitignore

@@ -23,7 +23,7 @@ postBuild.inc.cmd
 postBuild.cmd
 svnrev.h
 
-build
+/build
 
 .DS_Store
 Thumbs.db
@@ -83,6 +83,8 @@ oprofile_data/
 /3rdparty/wxWidgets/lib/vc_lib/msw/wx/setup.h
 /3rdparty/wxWidgets/lib/vc_lib/mswd/wx/setup.h
 /3rdparty/wxWidgets/lib/vc_lib/mswd/wx/msw/rcdefs.h
+/3rdparty/wxwidgets3.0/include/wx/setup.h
+/3rdparty/wxwidgets3.0/include/wx/msw/rcdefs.h
 /3rdparty/zlib/Win32
 /common/deps
 /common/build/Utilities/Win32

3rdparty/wxwidgets3.0/include/wx/msw/rcdefs.h

@@ -1,41 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/msw/rcdefs.h
-// Purpose:     Fallback for the generated rcdefs.h under the lib directory
-// Author:      Mike Wetherell
-// Copyright:   (c) 2005 Mike Wetherell
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_RCDEFS_H
-#define _WX_RCDEFS_H
-
-#ifdef __GNUC__
-    // We must be using windres which uses gcc as its preprocessor. We do need
-    // to generate the manifest then as gcc doesn't do it automatically and we
-    // can define the architecture macro on our own as all the usual symbols
-    // are available (unlike with Microsoft RC.EXE which doesn't predefine
-    // anything useful at all).
-    #ifndef wxUSE_RC_MANIFEST
-        #define wxUSE_RC_MANIFEST 1
-    #endif
-
-    #if defined __i386__
-        #ifndef WX_CPU_X86
-            #define WX_CPU_X86
-        #endif
-    #elif defined __x86_64__
-        #ifndef WX_CPU_AMD64
-            #define WX_CPU_AMD64
-        #endif
-    #elif defined __ia64__
-        #ifndef WX_CPU_IA64
-            #define WX_CPU_IA64
-        #endif
-    #endif
-#endif
-
-// Don't do anything here for the other compilers, in particular don't define
-// WX_CPU_X86 here as we used to do. If people define wxUSE_RC_MANIFEST, they
-// must also define the architecture constant correctly.
-
-#endif

3rdparty/wxwidgets3.0/include/wx/msw/setup.h

@@ -44,7 +44,7 @@
 // in the version after it completely.
 //
 // Recommended setting: 0 (please update your code)
-#define WXWIN_COMPATIBILITY_2_8 1
+#define WXWIN_COMPATIBILITY_2_8 0
 
 // MSW-only: Set to 0 for accurate dialog units, else 1 for old behaviour when
 // default system font is used for wxWindow::GetCharWidth/Height() instead of
@@ -664,7 +664,7 @@
 //
 // Recommended setting: 1 if your compiler supports it, if it doesn't please
 // contribute us a makefile for src/regex for it
-#define wxUSE_REGEX       1
+#define wxUSE_REGEX       0
 
 // wxSystemOptions class
 #define wxUSE_SYSTEM_OPTIONS 1
@@ -1459,7 +1459,7 @@
 #define wxUSE_LIBJPEG       1
 
 // Set to 1 for TIFF format support (requires libtiff)
-#define wxUSE_LIBTIFF       1
+#define wxUSE_LIBTIFF       0
 
 // Set to 1 for TGA format support (loading only)
 #define wxUSE_TGA           1

3rdparty/wxwidgets3.0/include/wx/msw/wx.rc

@@ -41,13 +41,13 @@ END
 //
 
 WXCURSOR_HAND           CURSOR  DISCARDABLE     "wx/msw/hand.cur"
-WXCURSOR_BULLSEYE       CURSOR  DISCARDABLE     "wx/msw/bullseye.cur"
+//WXCURSOR_BULLSEYE       CURSOR  DISCARDABLE     "wx/msw/bullseye.cur"
-WXCURSOR_PENCIL         CURSOR  DISCARDABLE     "wx/msw/pencil.cur"
+//WXCURSOR_PENCIL         CURSOR  DISCARDABLE     "wx/msw/pencil.cur"
-WXCURSOR_MAGNIFIER      CURSOR  DISCARDABLE     "wx/msw/magnif1.cur"
+//WXCURSOR_MAGNIFIER      CURSOR  DISCARDABLE     "wx/msw/magnif1.cur"
-WXCURSOR_ROLLER         CURSOR  DISCARDABLE     "wx/msw/roller.cur"
+//WXCURSOR_ROLLER         CURSOR  DISCARDABLE     "wx/msw/roller.cur"
-WXCURSOR_PBRUSH         CURSOR  DISCARDABLE     "wx/msw/pbrush.cur"
+//WXCURSOR_PBRUSH         CURSOR  DISCARDABLE     "wx/msw/pbrush.cur"
-WXCURSOR_PLEFT          CURSOR  DISCARDABLE     "wx/msw/pntleft.cur"
+//WXCURSOR_PLEFT          CURSOR  DISCARDABLE     "wx/msw/pntleft.cur"
-WXCURSOR_PRIGHT         CURSOR  DISCARDABLE     "wx/msw/pntright.cur"
+//WXCURSOR_PRIGHT         CURSOR  DISCARDABLE     "wx/msw/pntright.cur"
 WXCURSOR_BLANK          CURSOR  DISCARDABLE     "wx/msw/blank.cur"
 WXCURSOR_CROSS          CURSOR  DISCARDABLE     "wx/msw/cross.cur"
 
@@ -59,21 +59,21 @@ WXCURSOR_CROSS          CURSOR  DISCARDABLE     "wx/msw/cross.cur"
 
 // First wx icon in alphabetical order, so it will be used by Explorer if the
 // application doesn't have any icons of its own
-wxICON_AAA                      ICON "wx/msw/std.ico"
+//wxICON_AAA                      ICON "wx/msw/std.ico"
 
 //wxDEFAULT_FRAME               ICON "wx/msw/std.ico"
 //wxDEFAULT_MDIPARENTFRAME      ICON "wx/msw/mdi.ico"
 //wxDEFAULT_MDICHILDFRAME       ICON "wx/msw/child.ico"
 
 // Standard small icons
-wxICON_SMALL_CLOSED_FOLDER      ICON "wx/msw/folder1.ico"
+//wxICON_SMALL_CLOSED_FOLDER      ICON "wx/msw/folder1.ico"
-wxICON_SMALL_OPEN_FOLDER        ICON "wx/msw/folder2.ico"
+//wxICON_SMALL_OPEN_FOLDER        ICON "wx/msw/folder2.ico"
-wxICON_SMALL_FILE               ICON "wx/msw/file1.ico"
+//wxICON_SMALL_FILE               ICON "wx/msw/file1.ico"
-wxICON_SMALL_COMPUTER           ICON "wx/msw/computer.ico"
+//wxICON_SMALL_COMPUTER           ICON "wx/msw/computer.ico"
-wxICON_SMALL_DRIVE              ICON "wx/msw/drive.ico"
+//wxICON_SMALL_DRIVE              ICON "wx/msw/drive.ico"
-wxICON_SMALL_CDROM              ICON "wx/msw/cdrom.ico"
+//wxICON_SMALL_CDROM              ICON "wx/msw/cdrom.ico"
-wxICON_SMALL_FLOPPY             ICON "wx/msw/floppy.ico"
+//wxICON_SMALL_FLOPPY             ICON "wx/msw/floppy.ico"
-wxICON_SMALL_REMOVEABLE         ICON "wx/msw/removble.ico"
+//wxICON_SMALL_REMOVEABLE         ICON "wx/msw/removble.ico"
 
 //////////////////////////////////////////////////////////////////////////////
 //