From 561b09457c7a1f34a8183e3464b6a1def3fa8ccc Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Thu, 10 Jan 2013 19:01:58 -0600 Subject: [PATCH] Fix warnings. Forgot to add Sdk flags. --- Source/Core/DolphinWX/Src/GameListCtrl.cpp | 3 - .../Core/DolphinWX/resources/Flag_Europe.xpm | 2 +- .../Core/DolphinWX/resources/Flag_France.xpm | 2 +- .../Core/DolphinWX/resources/Flag_Germany.xpm | 2 +- .../Core/DolphinWX/resources/Flag_Italy.xpm | 2 +- .../Core/DolphinWX/resources/Flag_Japan.xpm | 2 +- .../Core/DolphinWX/resources/Flag_Korea.xpm | 2 +- Source/Core/DolphinWX/resources/Flag_Sdk.png | Bin 0 -> 588 bytes Source/Core/DolphinWX/resources/Flag_Sdk.xpm | 114 ++++++++++++++++++ .../Core/DolphinWX/resources/Flag_Taiwan.xpm | 2 +- Source/Core/DolphinWX/resources/Flag_USA.xpm | 2 +- .../Core/DolphinWX/resources/Flag_Unknown.xpm | 2 +- 12 files changed, 123 insertions(+), 12 deletions(-) create mode 100644 Source/Core/DolphinWX/resources/Flag_Sdk.png create mode 100644 Source/Core/DolphinWX/resources/Flag_Sdk.xpm diff --git a/Source/Core/DolphinWX/Src/GameListCtrl.cpp b/Source/Core/DolphinWX/Src/GameListCtrl.cpp index 8d9815e4cd..1b35e06c29 100644 --- a/Source/Core/DolphinWX/Src/GameListCtrl.cpp +++ b/Source/Core/DolphinWX/Src/GameListCtrl.cpp @@ -35,8 +35,6 @@ #include "WxUtils.h" #include "Main.h" -extern "C" -{ #include "../resources/Flag_Europe.xpm" #include "../resources/Flag_Germany.xpm" #include "../resources/Flag_France.xpm" @@ -47,7 +45,6 @@ extern "C" #include "../resources/Flag_Korea.xpm" #include "../resources/Flag_Unknown.xpm" #include "../resources/Flag_Sdk.xpm" -} #include "../resources/Platform_Wad.xpm" #include "../resources/Platform_Wii.xpm" diff --git a/Source/Core/DolphinWX/resources/Flag_Europe.xpm b/Source/Core/DolphinWX/resources/Flag_Europe.xpm index 1608b2cb78..ea966ec317 100644 --- a/Source/Core/DolphinWX/resources/Flag_Europe.xpm +++ b/Source/Core/DolphinWX/resources/Flag_Europe.xpm @@ -1,5 +1,5 @@ /* XPM */ -static char * Flag_Europe_xpm[] = { +static const char * Flag_Europe_xpm[] = { "96 32 43 1", " c None", ". c #000000", diff --git a/Source/Core/DolphinWX/resources/Flag_France.xpm b/Source/Core/DolphinWX/resources/Flag_France.xpm index 6336122380..f53abf6822 100644 --- a/Source/Core/DolphinWX/resources/Flag_France.xpm +++ b/Source/Core/DolphinWX/resources/Flag_France.xpm @@ -1,5 +1,5 @@ /* XPM */ -static char * Flag_France_xpm[] = { +static const char * Flag_France_xpm[] = { "96 32 5 1", " c None", ". c #000000", diff --git a/Source/Core/DolphinWX/resources/Flag_Germany.xpm b/Source/Core/DolphinWX/resources/Flag_Germany.xpm index 4e4c69324d..cd925bd2c8 100644 --- a/Source/Core/DolphinWX/resources/Flag_Germany.xpm +++ b/Source/Core/DolphinWX/resources/Flag_Germany.xpm @@ -1,5 +1,5 @@ /* XPM */ -static char * Flag_Germany_xpm[] = { +static const char * Flag_Germany_xpm[] = { "96 32 4 1", " c None", ". c #000000", diff --git a/Source/Core/DolphinWX/resources/Flag_Italy.xpm b/Source/Core/DolphinWX/resources/Flag_Italy.xpm index f81cc4bc94..78d39a848c 100644 --- a/Source/Core/DolphinWX/resources/Flag_Italy.xpm +++ b/Source/Core/DolphinWX/resources/Flag_Italy.xpm @@ -1,5 +1,5 @@ /* XPM */ -static char * Flag_Italy_xpm[] = { +static const char * Flag_Italy_xpm[] = { "96 32 5 1", " c None", ". c #000000", diff --git a/Source/Core/DolphinWX/resources/Flag_Japan.xpm b/Source/Core/DolphinWX/resources/Flag_Japan.xpm index 556dd9fa36..baf2c5982c 100644 --- a/Source/Core/DolphinWX/resources/Flag_Japan.xpm +++ b/Source/Core/DolphinWX/resources/Flag_Japan.xpm @@ -1,5 +1,5 @@ /* XPM */ -static char * Flag_Japan_xpm[] = { +static const char * Flag_Japan_xpm[] = { "96 32 19 1", " c None", ". c #000000", diff --git a/Source/Core/DolphinWX/resources/Flag_Korea.xpm b/Source/Core/DolphinWX/resources/Flag_Korea.xpm index 857f82e721..32ce1a5289 100644 --- a/Source/Core/DolphinWX/resources/Flag_Korea.xpm +++ b/Source/Core/DolphinWX/resources/Flag_Korea.xpm @@ -1,5 +1,5 @@ /* XPM */ -static char * Flag_Korea_xpm[] = { +static const char * Flag_Korea_xpm[] = { "96 32 107 2", " c None", ". c #000000", diff --git a/Source/Core/DolphinWX/resources/Flag_Sdk.png b/Source/Core/DolphinWX/resources/Flag_Sdk.png new file mode 100644 index 0000000000000000000000000000000000000000..803aab2b9a17a1bc2a6d29a05f2407572a26319d GIT binary patch literal 588 zcmW-eZAg;=6oub+n{IASrA=GYEgQ4QF&HKa%GRtcx2DT2G5irTNo9X3+O#N$CgxfY zgqleVDlr>m!-;HBSTHOHjtVjSz?BH|t6X0{oFwP%T^G)MxaZ$F*HdS%=5xhdf*|-t zgU(8`iB=(pN$*AJ-BubImkf;#g5U{KB8i7y5pA-a##%i)M)C+{#f2lcCunP{uBKj3 z^Z!sJ2?hg9CRi+_r6D~XY&JL?WMqKLMP?@Wd}L)II~zGU5D1W)3$Yma`6wuWL;|T4 zg@usGAeTd-fKrK)5|oueqd{#gEEY60ps^7)8`|1nx1+rs9UXAF;C92~K~E2Qd(qd2 z{(gA97#zgV5PUw2jKJ^5=qLgKjE^H2L@0!C7?YETMlmyk*;&M5SXn_lj@4DHtzmr~ z8ync%L?VIhZ6uS}*}?8ED2ke5@BF0Gl1{7nG@)IcPqjrho2qpr#ZZ2sk9ni6s@^cQ zbzd(CtAt(W?1vkcVzDPL_l79S@tCo+tnJ=VEgWw>^|$E9guFuXnKDsTUzz@kdh#gw zeN6g6^43je?pI3AU$N!g2%ccwd%s+2QUsb~c?*i0o@tHD!8oLQTJZbL^T@P$l(p7% zQrJ~Fx2PdZSBvJF_T*dDqU+>9W$`k{d|CTwNqBZRp0oQ=kd&V(AGju;a;81t`h4nj z(L&h)?bvHIFA@oSn-lV1bRXQOEsi=|;i@|=lEBIzX^q$S=~*YE^jC}3Vz-sQdv!~s S8thG^er?p7b^c>bo&Nv@3KIGN literal 0 HcmV?d00001 diff --git a/Source/Core/DolphinWX/resources/Flag_Sdk.xpm b/Source/Core/DolphinWX/resources/Flag_Sdk.xpm new file mode 100644 index 0000000000..0df81bf81f --- /dev/null +++ b/Source/Core/DolphinWX/resources/Flag_Sdk.xpm @@ -0,0 +1,114 @@ +/* XPM */ +static const char * Flag_Sdk_xpm[] = { +"96 32 79 1", +" c None", +". c #000000", +"+ c #FFFFFF", +"@ c #E9E9FE", +"# c #5959FE", +"$ c #1515FE", +"% c #0505FE", +"& c #1313FE", +"* c #3232FE", +"= c #0000FF", +"- c #0202FE", +"; c #0C0CFE", +"> c #2B2BFE", +", c #7676FE", +"' c #EEEEFE", +") c #D4D4FE", +"! c #1C1CFE", +"~ c #0303FE", +"{ c #9292FE", +"] c #5151FE", +"^ c #B1B1FE", +"/ c #F8F8FE", +"( c #CCCCFE", +"_ c #E5E5FE", +": c #9393FE", +"< c #0A0AFE", +"[ c #2424FE", +"} c #EAEAFE", +"| c #C2C2FE", +"1 c #1010FE", +"2 c #0D0DFE", +"3 c #B6B6FE", +"4 c #0F0FFE", +"5 c #8989FE", +"6 c #6767FE", +"7 c #ACACFE", +"8 c #0808FE", +"9 c #1E1EFE", +"0 c #D2D2FE", +"a c #5F5FFE", +"b c #9C9CFE", +"c c #E8E8FE", +"d c #DDDDFE", +"e c #1A1AFE", +"f c #9494FE", +"g c #3636FE", +"h c #E7E7FE", +"i c #B7B7FE", +"j c #0707FE", +"k c #A4A4FE", +"l c #F7F7FE", +"m c #B0B0FE", +"n c #FCFCFE", +"o c #C4C4FE", +"p c #8181FE", +"q c #2020FE", +"r c #1B1BFE", +"s c #0101FE", +"t c #0606FE", +"u c #AEAEFE", +"v c #E2E2FE", +"w c #8787FE", +"x c #0404FE", +"y c #A2A2FE", +"z c #3E3EFE", +"A c #A8A8FE", +"B c #F9F9FE", +"C c #5656FE", +"D c #E6E6FE", +"E c #B4B4FE", +"F c #0909FE", +"G c #9696FE", +"H c #4D4DFE", +"I c #2222FE", +"J c #1D1DFE", +"K c #6969FE", +"L c #0E0EFE", +"M c #2D2DFE", +"N c #7575FE", +" ", +" ", +" ", +" ", +" ", +"................................ ", +".++++++++++++++++++++++++++++++. ", +".++++++++++++++++++++++++++++++. ", +".++++++++++++++++++++++++++++++. ", +".++++++++++++++++++++++++++++++. ", +".+@#$%&*+++==-;>,'+++==+++)!~{+. ", +".+]=^/(]+++==+_:<[}++==++|123++. ", +".+4=_++++++==+++5=6++==+7890+++. ", +".+9=&abc+++==+++d=e++==f-gh++++. ", +".+ie===jk++==+++l=%++====m+++++. ", +".++nopq=!++==+++d=r++==:stu++++. ", +".+++++v=1++==+++w=6++==+kx~y+++. ", +".+zAcB7=C++==+D:<[}++==++EFsG++. ", +".+HI;%JK'++==~LMN'+++==+++|4=w+. ", +".++++++++++++++++++++++++++++++. ", +".++++++++++++++++++++++++++++++. ", +".++++++++++++++++++++++++++++++. ", +".++++++++++++++++++++++++++++++. ", +".++++++++++++++++++++++++++++++. ", +"................................ ", +" ", +" ", +" ", +" ", +" ", +" ", +" "}; diff --git a/Source/Core/DolphinWX/resources/Flag_Taiwan.xpm b/Source/Core/DolphinWX/resources/Flag_Taiwan.xpm index 3f092d6149..da0f13de47 100644 --- a/Source/Core/DolphinWX/resources/Flag_Taiwan.xpm +++ b/Source/Core/DolphinWX/resources/Flag_Taiwan.xpm @@ -1,5 +1,5 @@ /* XPM */ -static char * Flag_Taiwan_xpm[] = { +static const char * Flag_Taiwan_xpm[] = { "96 32 24 1", " c None", ". c #000000", diff --git a/Source/Core/DolphinWX/resources/Flag_USA.xpm b/Source/Core/DolphinWX/resources/Flag_USA.xpm index eca9509e16..44260eca52 100644 --- a/Source/Core/DolphinWX/resources/Flag_USA.xpm +++ b/Source/Core/DolphinWX/resources/Flag_USA.xpm @@ -1,5 +1,5 @@ /* XPM */ -static char * Flag_USA_xpm[] = { +static const char * Flag_USA_xpm[] = { "96 32 88 1", " c None", ". c #000000", diff --git a/Source/Core/DolphinWX/resources/Flag_Unknown.xpm b/Source/Core/DolphinWX/resources/Flag_Unknown.xpm index 5c8c19968d..381d43f304 100644 --- a/Source/Core/DolphinWX/resources/Flag_Unknown.xpm +++ b/Source/Core/DolphinWX/resources/Flag_Unknown.xpm @@ -1,5 +1,5 @@ /* XPM */ -static char * Flag_Unknown_xpm[] = { +static const char * Flag_Unknown_xpm[] = { "96 32 59 1", " c None", ". c #000000",