mirror of https://github.com/RPCS3/rpcs3.git
Merge branch 'master' of https://github.com/DHrpcs3/rpcs3
This commit is contained in:
Nekotekina
commit
a6faf04db4
|
|
@ -0,0 +1,3 @@
|
|||
[submodule "wxWidgets"]
|
||||
path = wxWidgets
|
||||
url = https://github.com/DHrpcs3/wxWidgets.git
|
||||
|
|
@ -0,0 +1,339 @@
|
|||
GNU GENERAL PUBLIC LICENSE
|
||||
Version 2, June 1991
|
||||
|
||||
Copyright (C) 1989, 1991 Free Software Foundation, Inc., <http://fsf.org/>
|
||||
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
Everyone is permitted to copy and distribute verbatim copies
|
||||
of this license document, but changing it is not allowed.
|
||||
|
||||
Preamble
|
||||
|
||||
The licenses for most software are designed to take away your
|
||||
freedom to share and change it. By contrast, the GNU General Public
|
||||
License is intended to guarantee your freedom to share and change free
|
||||
software--to make sure the software is free for all its users. This
|
||||
General Public License applies to most of the Free Software
|
||||
Foundation's software and to any other program whose authors commit to
|
||||
using it. (Some other Free Software Foundation software is covered by
|
||||
the GNU Lesser General Public License instead.) You can apply it to
|
||||
your programs, too.
|
||||
|
||||
When we speak of free software, we are referring to freedom, not
|
||||
price. Our General Public Licenses are designed to make sure that you
|
||||
have the freedom to distribute copies of free software (and charge for
|
||||
this service if you wish), that you receive source code or can get it
|
||||
if you want it, that you can change the software or use pieces of it
|
||||
in new free programs; and that you know you can do these things.
|
||||
|
||||
To protect your rights, we need to make restrictions that forbid
|
||||
anyone to deny you these rights or to ask you to surrender the rights.
|
||||
These restrictions translate to certain responsibilities for you if you
|
||||
distribute copies of the software, or if you modify it.
|
||||
|
||||
For example, if you distribute copies of such a program, whether
|
||||
gratis or for a fee, you must give the recipients all the rights that
|
||||
you have. You must make sure that they, too, receive or can get the
|
||||
source code. And you must show them these terms so they know their
|
||||
rights.
|
||||
|
||||
We protect your rights with two steps: (1) copyright the software, and
|
||||
(2) offer you this license which gives you legal permission to copy,
|
||||
distribute and/or modify the software.
|
||||
|
||||
Also, for each author's protection and ours, we want to make certain
|
||||
that everyone understands that there is no warranty for this free
|
||||
software. If the software is modified by someone else and passed on, we
|
||||
want its recipients to know that what they have is not the original, so
|
||||
that any problems introduced by others will not reflect on the original
|
||||
authors' reputations.
|
||||
|
||||
Finally, any free program is threatened constantly by software
|
||||
patents. We wish to avoid the danger that redistributors of a free
|
||||
program will individually obtain patent licenses, in effect making the
|
||||
program proprietary. To prevent this, we have made it clear that any
|
||||
patent must be licensed for everyone's free use or not licensed at all.
|
||||
|
||||
The precise terms and conditions for copying, distribution and
|
||||
modification follow.
|
||||
|
||||
GNU GENERAL PUBLIC LICENSE
|
||||
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
|
||||
|
||||
0. This License applies to any program or other work which contains
|
||||
a notice placed by the copyright holder saying it may be distributed
|
||||
under the terms of this General Public License. The "Program", below,
|
||||
refers to any such program or work, and a "work based on the Program"
|
||||
means either the Program or any derivative work under copyright law:
|
||||
that is to say, a work containing the Program or a portion of it,
|
||||
either verbatim or with modifications and/or translated into another
|
||||
language. (Hereinafter, translation is included without limitation in
|
||||
the term "modification".) Each licensee is addressed as "you".
|
||||
|
||||
Activities other than copying, distribution and modification are not
|
||||
covered by this License; they are outside its scope. The act of
|
||||
running the Program is not restricted, and the output from the Program
|
||||
is covered only if its contents constitute a work based on the
|
||||
Program (independent of having been made by running the Program).
|
||||
Whether that is true depends on what the Program does.
|
||||
|
||||
1. You may copy and distribute verbatim copies of the Program's
|
||||
source code as you receive it, in any medium, provided that you
|
||||
conspicuously and appropriately publish on each copy an appropriate
|
||||
copyright notice and disclaimer of warranty; keep intact all the
|
||||
notices that refer to this License and to the absence of any warranty;
|
||||
and give any other recipients of the Program a copy of this License
|
||||
along with the Program.
|
||||
|
||||
You may charge a fee for the physical act of transferring a copy, and
|
||||
you may at your option offer warranty protection in exchange for a fee.
|
||||
|
||||
2. You may modify your copy or copies of the Program or any portion
|
||||
of it, thus forming a work based on the Program, and copy and
|
||||
distribute such modifications or work under the terms of Section 1
|
||||
above, provided that you also meet all of these conditions:
|
||||
|
||||
a) You must cause the modified files to carry prominent notices
|
||||
stating that you changed the files and the date of any change.
|
||||
|
||||
b) You must cause any work that you distribute or publish, that in
|
||||
whole or in part contains or is derived from the Program or any
|
||||
part thereof, to be licensed as a whole at no charge to all third
|
||||
parties under the terms of this License.
|
||||
|
||||
c) If the modified program normally reads commands interactively
|
||||
when run, you must cause it, when started running for such
|
||||
interactive use in the most ordinary way, to print or display an
|
||||
announcement including an appropriate copyright notice and a
|
||||
notice that there is no warranty (or else, saying that you provide
|
||||
a warranty) and that users may redistribute the program under
|
||||
these conditions, and telling the user how to view a copy of this
|
||||
License. (Exception: if the Program itself is interactive but
|
||||
does not normally print such an announcement, your work based on
|
||||
the Program is not required to print an announcement.)
|
||||
|
||||
These requirements apply to the modified work as a whole. If
|
||||
identifiable sections of that work are not derived from the Program,
|
||||
and can be reasonably considered independent and separate works in
|
||||
themselves, then this License, and its terms, do not apply to those
|
||||
sections when you distribute them as separate works. But when you
|
||||
distribute the same sections as part of a whole which is a work based
|
||||
on the Program, the distribution of the whole must be on the terms of
|
||||
this License, whose permissions for other licensees extend to the
|
||||
entire whole, and thus to each and every part regardless of who wrote it.
|
||||
|
||||
Thus, it is not the intent of this section to claim rights or contest
|
||||
your rights to work written entirely by you; rather, the intent is to
|
||||
exercise the right to control the distribution of derivative or
|
||||
collective works based on the Program.
|
||||
|
||||
In addition, mere aggregation of another work not based on the Program
|
||||
with the Program (or with a work based on the Program) on a volume of
|
||||
a storage or distribution medium does not bring the other work under
|
||||
the scope of this License.
|
||||
|
||||
3. You may copy and distribute the Program (or a work based on it,
|
||||
under Section 2) in object code or executable form under the terms of
|
||||
Sections 1 and 2 above provided that you also do one of the following:
|
||||
|
||||
a) Accompany it with the complete corresponding machine-readable
|
||||
source code, which must be distributed under the terms of Sections
|
||||
1 and 2 above on a medium customarily used for software interchange; or,
|
||||
|
||||
b) Accompany it with a written offer, valid for at least three
|
||||
years, to give any third party, for a charge no more than your
|
||||
cost of physically performing source distribution, a complete
|
||||
machine-readable copy of the corresponding source code, to be
|
||||
distributed under the terms of Sections 1 and 2 above on a medium
|
||||
customarily used for software interchange; or,
|
||||
|
||||
c) Accompany it with the information you received as to the offer
|
||||
to distribute corresponding source code. (This alternative is
|
||||
allowed only for noncommercial distribution and only if you
|
||||
received the program in object code or executable form with such
|
||||
an offer, in accord with Subsection b above.)
|
||||
|
||||
The source code for a work means the preferred form of the work for
|
||||
making modifications to it. For an executable work, complete source
|
||||
code means all the source code for all modules it contains, plus any
|
||||
associated interface definition files, plus the scripts used to
|
||||
control compilation and installation of the executable. However, as a
|
||||
special exception, the source code distributed need not include
|
||||
anything that is normally distributed (in either source or binary
|
||||
form) with the major components (compiler, kernel, and so on) of the
|
||||
operating system on which the executable runs, unless that component
|
||||
itself accompanies the executable.
|
||||
|
||||
If distribution of executable or object code is made by offering
|
||||
access to copy from a designated place, then offering equivalent
|
||||
access to copy the source code from the same place counts as
|
||||
distribution of the source code, even though third parties are not
|
||||
compelled to copy the source along with the object code.
|
||||
|
||||
4. You may not copy, modify, sublicense, or distribute the Program
|
||||
except as expressly provided under this License. Any attempt
|
||||
otherwise to copy, modify, sublicense or distribute the Program is
|
||||
void, and will automatically terminate your rights under this License.
|
||||
However, parties who have received copies, or rights, from you under
|
||||
this License will not have their licenses terminated so long as such
|
||||
parties remain in full compliance.
|
||||
|
||||
5. You are not required to accept this License, since you have not
|
||||
signed it. However, nothing else grants you permission to modify or
|
||||
distribute the Program or its derivative works. These actions are
|
||||
prohibited by law if you do not accept this License. Therefore, by
|
||||
modifying or distributing the Program (or any work based on the
|
||||
Program), you indicate your acceptance of this License to do so, and
|
||||
all its terms and conditions for copying, distributing or modifying
|
||||
the Program or works based on it.
|
||||
|
||||
6. Each time you redistribute the Program (or any work based on the
|
||||
Program), the recipient automatically receives a license from the
|
||||
original licensor to copy, distribute or modify the Program subject to
|
||||
these terms and conditions. You may not impose any further
|
||||
restrictions on the recipients' exercise of the rights granted herein.
|
||||
You are not responsible for enforcing compliance by third parties to
|
||||
this License.
|
||||
|
||||
7. If, as a consequence of a court judgment or allegation of patent
|
||||
infringement or for any other reason (not limited to patent issues),
|
||||
conditions are imposed on you (whether by court order, agreement or
|
||||
otherwise) that contradict the conditions of this License, they do not
|
||||
excuse you from the conditions of this License. If you cannot
|
||||
distribute so as to satisfy simultaneously your obligations under this
|
||||
License and any other pertinent obligations, then as a consequence you
|
||||
may not distribute the Program at all. For example, if a patent
|
||||
license would not permit royalty-free redistribution of the Program by
|
||||
all those who receive copies directly or indirectly through you, then
|
||||
the only way you could satisfy both it and this License would be to
|
||||
refrain entirely from distribution of the Program.
|
||||
|
||||
If any portion of this section is held invalid or unenforceable under
|
||||
any particular circumstance, the balance of the section is intended to
|
||||
apply and the section as a whole is intended to apply in other
|
||||
circumstances.
|
||||
|
||||
It is not the purpose of this section to induce you to infringe any
|
||||
patents or other property right claims or to contest validity of any
|
||||
such claims; this section has the sole purpose of protecting the
|
||||
integrity of the free software distribution system, which is
|
||||
implemented by public license practices. Many people have made
|
||||
generous contributions to the wide range of software distributed
|
||||
through that system in reliance on consistent application of that
|
||||
system; it is up to the author/donor to decide if he or she is willing
|
||||
to distribute software through any other system and a licensee cannot
|
||||
impose that choice.
|
||||
|
||||
This section is intended to make thoroughly clear what is believed to
|
||||
be a consequence of the rest of this License.
|
||||
|
||||
8. If the distribution and/or use of the Program is restricted in
|
||||
certain countries either by patents or by copyrighted interfaces, the
|
||||
original copyright holder who places the Program under this License
|
||||
may add an explicit geographical distribution limitation excluding
|
||||
those countries, so that distribution is permitted only in or among
|
||||
countries not thus excluded. In such case, this License incorporates
|
||||
the limitation as if written in the body of this License.
|
||||
|
||||
9. The Free Software Foundation may publish revised and/or new versions
|
||||
of the General Public License from time to time. Such new versions will
|
||||
be similar in spirit to the present version, but may differ in detail to
|
||||
address new problems or concerns.
|
||||
|
||||
Each version is given a distinguishing version number. If the Program
|
||||
specifies a version number of this License which applies to it and "any
|
||||
later version", you have the option of following the terms and conditions
|
||||
either of that version or of any later version published by the Free
|
||||
Software Foundation. If the Program does not specify a version number of
|
||||
this License, you may choose any version ever published by the Free Software
|
||||
Foundation.
|
||||
|
||||
10. If you wish to incorporate parts of the Program into other free
|
||||
programs whose distribution conditions are different, write to the author
|
||||
to ask for permission. For software which is copyrighted by the Free
|
||||
Software Foundation, write to the Free Software Foundation; we sometimes
|
||||
make exceptions for this. Our decision will be guided by the two goals
|
||||
of preserving the free status of all derivatives of our free software and
|
||||
of promoting the sharing and reuse of software generally.
|
||||
|
||||
NO WARRANTY
|
||||
|
||||
11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
|
||||
FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
|
||||
OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
|
||||
PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
|
||||
OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
|
||||
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
|
||||
TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
|
||||
PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
|
||||
REPAIR OR CORRECTION.
|
||||
|
||||
12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
|
||||
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
|
||||
REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
|
||||
INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
|
||||
OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
|
||||
TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
|
||||
YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
|
||||
PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
|
||||
POSSIBILITY OF SUCH DAMAGES.
|
||||
|
||||
END OF TERMS AND CONDITIONS
|
||||
|
||||
How to Apply These Terms to Your New Programs
|
||||
|
||||
If you develop a new program, and you want it to be of the greatest
|
||||
possible use to the public, the best way to achieve this is to make it
|
||||
free software which everyone can redistribute and change under these terms.
|
||||
|
||||
To do so, attach the following notices to the program. It is safest
|
||||
to attach them to the start of each source file to most effectively
|
||||
convey the exclusion of warranty; and each file should have at least
|
||||
the "copyright" line and a pointer to where the full notice is found.
|
||||
|
||||
{description}
|
||||
Copyright (C) {year} {fullname}
|
||||
|
||||
This program is free software; you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation; either version 2 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License along
|
||||
with this program; if not, write to the Free Software Foundation, Inc.,
|
||||
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
|
||||
Also add information on how to contact you by electronic and paper mail.
|
||||
|
||||
If the program is interactive, make it output a short notice like this
|
||||
when it starts in an interactive mode:
|
||||
|
||||
Gnomovision version 69, Copyright (C) year name of author
|
||||
Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
|
||||
This is free software, and you are welcome to redistribute it
|
||||
under certain conditions; type `show c' for details.
|
||||
|
||||
The hypothetical commands `show w' and `show c' should show the appropriate
|
||||
parts of the General Public License. Of course, the commands you use may
|
||||
be called something other than `show w' and `show c'; they could even be
|
||||
mouse-clicks or menu items--whatever suits your program.
|
||||
|
||||
You should also get your employer (if you work as a programmer) or your
|
||||
school, if any, to sign a "copyright disclaimer" for the program, if
|
||||
necessary. Here is a sample; alter the names:
|
||||
|
||||
Yoyodyne, Inc., hereby disclaims all copyright interest in the program
|
||||
`Gnomovision' (which makes passes at compilers) written by James Hacker.
|
||||
|
||||
{signature of Ty Coon}, 1 April 1989
|
||||
Ty Coon, President of Vice
|
||||
|
||||
This General Public License does not permit incorporating your program into
|
||||
proprietary programs. If your program is a subroutine library, you may
|
||||
consider it more useful to permit linking proprietary applications with the
|
||||
library. If this is what you want to do, use the GNU Lesser General
|
||||
Public License instead of this License.
|
||||
|
|
@ -9,3 +9,4 @@ For discussion about the emulator and PS3 emulation please visit the [official f
|
|||
|
||||
If you want to contribute please take a took at the [Coding Style](https://github.com/DHrpcs3/rpcs3/wiki/Coding-Style) and [Roadmap](https://github.com/DHrpcs3/rpcs3/wiki/Roadmap) pages.
|
||||
|
||||
To initialize the repository don't forget to execute `git submodule update --init` to pull the wxWidgets source.
|
||||
|
|
|
|||
302
rpcs3.sln
302
rpcs3.sln
|
|
@ -1,61 +1,71 @@
|
|||
Microsoft Visual Studio Solution File, Format Version 12.00
|
||||
# Visual Studio 2012
|
||||
# Visual Studio 2013
|
||||
VisualStudioVersion = 12.0.30110.0
|
||||
MinimumVisualStudioVersion = 10.0.40219.1
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rpcs3", "rpcs3\rpcs3.vcxproj", "{70CD65B0-91D6-4FAE-9A7B-4AF55D0D1B12}"
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
{3111D679-7796-23C4-BA0C-271F1145DA24} = {3111D679-7796-23C4-BA0C-271F1145DA24}
|
||||
{5C363C34-4741-7036-861C-2E2279CF552E} = {5C363C34-4741-7036-861C-2E2279CF552E}
|
||||
{46333DC3-B4A5-3DCC-E8BF-A3F20ADC56D2} = {46333DC3-B4A5-3DCC-E8BF-A3F20ADC56D2}
|
||||
{949C6DB8-E638-6EC6-AB31-BCCFD1379E01} = {949C6DB8-E638-6EC6-AB31-BCCFD1379E01}
|
||||
{99C9EB95-DB4C-1996-490E-5212EFBF07C3} = {99C9EB95-DB4C-1996-490E-5212EFBF07C3}
|
||||
{6FCB55A5-563F-4039-1D79-1EB6ED8AAB82} = {6FCB55A5-563F-4039-1D79-1EB6ED8AAB82}
|
||||
{B87216CD-6C64-1DB0-D900-BC6E745C1DF9} = {B87216CD-6C64-1DB0-D900-BC6E745C1DF9}
|
||||
{76169FE8-0814-4F36-6409-699EF1A23001} = {76169FE8-0814-4F36-6409-699EF1A23001}
|
||||
{CD478F02-7550-58A5-E085-CE4BC0C0AD23} = {CD478F02-7550-58A5-E085-CE4BC0C0AD23}
|
||||
{067D9406-2A93-DACA-9449-93A2D356357D} = {067D9406-2A93-DACA-9449-93A2D356357D}
|
||||
{7047EE97-7F80-A70D-6147-BC11102DB6F4} = {7047EE97-7F80-A70D-6147-BC11102DB6F4}
|
||||
{5C363C34-4741-7036-861C-2E2279CF552E} = {5C363C34-4741-7036-861C-2E2279CF552E}
|
||||
{23E1C437-A951-5943-8639-A17F3CF2E606} = {23E1C437-A951-5943-8639-A17F3CF2E606}
|
||||
{22B14659-C5B6-B775-868D-A49198FEAD4A} = {22B14659-C5B6-B775-868D-A49198FEAD4A}
|
||||
{9ED1866B-D4AE-3440-24E4-7A9475B163B2} = {9ED1866B-D4AE-3440-24E4-7A9475B163B2}
|
||||
{3111D679-7796-23C4-BA0C-271F1145DA24} = {3111D679-7796-23C4-BA0C-271F1145DA24}
|
||||
{AFF2C68B-B867-DD50-6AC5-74B09D41F8EA} = {AFF2C68B-B867-DD50-6AC5-74B09D41F8EA}
|
||||
{FAF0CB93-F7CE-A6B8-8342-19CE99BAF774} = {FAF0CB93-F7CE-A6B8-8342-19CE99BAF774}
|
||||
{8BECCA95-C7D7-CFF8-FDB1-4950E9F8E8E6} = {8BECCA95-C7D7-CFF8-FDB1-4950E9F8E8E6}
|
||||
{99C9EB95-DB4C-1996-490E-5212EFBF07C3} = {99C9EB95-DB4C-1996-490E-5212EFBF07C3}
|
||||
{7047EE97-7F80-A70D-6147-BC11102DB6F4} = {7047EE97-7F80-A70D-6147-BC11102DB6F4}
|
||||
{87B42A9C-3F5C-53D7-9017-2B1CAE39457D} = {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}
|
||||
{6FCB55A5-563F-4039-1D79-1EB6ED8AAB82} = {6FCB55A5-563F-4039-1D79-1EB6ED8AAB82}
|
||||
{949C6DB8-E638-6EC6-AB31-BCCFD1379E01} = {949C6DB8-E638-6EC6-AB31-BCCFD1379E01}
|
||||
{74827EBD-93DC-5110-BA95-3F2AB029B6B0} = {74827EBD-93DC-5110-BA95-3F2AB029B6B0}
|
||||
{46333DC3-B4A5-3DCC-E8BF-A3F20ADC56D2} = {46333DC3-B4A5-3DCC-E8BF-A3F20ADC56D2}
|
||||
{B87216CD-6C64-1DB0-D900-BC6E745C1DF9} = {B87216CD-6C64-1DB0-D900-BC6E745C1DF9}
|
||||
{6FDC76D5-CB44-B9F8-5EF6-C59B020719DF} = {6FDC76D5-CB44-B9F8-5EF6-C59B020719DF}
|
||||
{76169FE8-0814-4F36-6409-699EF1A23001} = {76169FE8-0814-4F36-6409-699EF1A23001}
|
||||
{A9AC9CF5-8E6C-0BA2-0769-6E42EDB88E25} = {A9AC9CF5-8E6C-0BA2-0769-6E42EDB88E25}
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "wxWidgets", "wxWidgets", "{5812E712-6213-4372-B095-9EB9BAA1F2DF}"
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "adv", "wxWidgets\build\msw\wx_adv.vcxproj", "{6FCB55A5-563F-4039-1D79-1EB6ED8AAB82}"
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "adv", "wxWidgets\build\msw\wx_vc10_adv.vcxproj", "{6FCB55A5-563F-4039-1D79-1EB6ED8AAB82}"
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "aui", "wxWidgets\build\msw\wx_aui.vcxproj", "{7047EE97-7F80-A70D-6147-BC11102DB6F4}"
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "aui", "wxWidgets\build\msw\wx_vc10_aui.vcxproj", "{7047EE97-7F80-A70D-6147-BC11102DB6F4}"
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "base", "wxWidgets\build\msw\wx_base.vcxproj", "{3111D679-7796-23C4-BA0C-271F1145DA24}"
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "base", "wxWidgets\build\msw\wx_vc10_base.vcxproj", "{3111D679-7796-23C4-BA0C-271F1145DA24}"
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "core", "wxWidgets\build\msw\wx_core.vcxproj", "{067D9406-2A93-DACA-9449-93A2D356357D}"
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "core", "wxWidgets\build\msw\wx_vc10_core.vcxproj", "{067D9406-2A93-DACA-9449-93A2D356357D}"
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dbgrid", "wxWidgets\build\msw\wx_dbgrid.vcxproj", "{9ED1866B-D4AE-3440-24E4-7A9475B163B2}"
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "propgrid", "wxWidgets\build\msw\wx_vc10_propgrid.vcxproj", "{9ED1866B-D4AE-3440-24E4-7A9475B163B2}"
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gl", "wxWidgets\build\msw\wx_gl.vcxproj", "{99C9EB95-DB4C-1996-490E-5212EFBF07C3}"
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gl", "wxWidgets\build\msw\wx_vc10_gl.vcxproj", "{99C9EB95-DB4C-1996-490E-5212EFBF07C3}"
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "html", "wxWidgets\build\msw\wx_html.vcxproj", "{6EDC3B79-D217-F11A-406F-F11D856493F9}"
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "html", "wxWidgets\build\msw\wx_vc10_html.vcxproj", "{6EDC3B79-D217-F11A-406F-F11D856493F9}"
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "media", "wxWidgets\build\msw\wx_media.vcxproj", "{A9AC9CF5-8E6C-0BA2-0769-6E42EDB88E25}"
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "media", "wxWidgets\build\msw\wx_vc10_media.vcxproj", "{A9AC9CF5-8E6C-0BA2-0769-6E42EDB88E25}"
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "net", "wxWidgets\build\msw\wx_net.vcxproj", "{CD478F02-7550-58A5-E085-CE4BC0C0AD23}"
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "net", "wxWidgets\build\msw\wx_vc10_net.vcxproj", "{CD478F02-7550-58A5-E085-CE4BC0C0AD23}"
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "odbc", "wxWidgets\build\msw\wx_odbc.vcxproj", "{C051C502-820F-2983-EF97-144C0CD92905}"
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qa", "wxWidgets\build\msw\wx_vc10_qa.vcxproj", "{22B14659-C5B6-B775-868D-A49198FEAD4A}"
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qa", "wxWidgets\build\msw\wx_qa.vcxproj", "{22B14659-C5B6-B775-868D-A49198FEAD4A}"
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "richtext", "wxWidgets\build\msw\wx_vc10_richtext.vcxproj", "{FAF0CB93-F7CE-A6B8-8342-19CE99BAF774}"
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "richtext", "wxWidgets\build\msw\wx_richtext.vcxproj", "{FAF0CB93-F7CE-A6B8-8342-19CE99BAF774}"
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxexpat", "wxWidgets\build\msw\wx_vc10_wxexpat.vcxproj", "{46333DC3-B4A5-3DCC-E8BF-A3F20ADC56D2}"
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxexpat", "wxWidgets\build\msw\wx_wxexpat.vcxproj", "{46333DC3-B4A5-3DCC-E8BF-A3F20ADC56D2}"
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxjpeg", "wxWidgets\build\msw\wx_vc10_wxjpeg.vcxproj", "{5C363C34-4741-7036-861C-2E2279CF552E}"
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxjpeg", "wxWidgets\build\msw\wx_wxjpeg.vcxproj", "{5C363C34-4741-7036-861C-2E2279CF552E}"
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxpng", "wxWidgets\build\msw\wx_vc10_wxpng.vcxproj", "{76169FE8-0814-4F36-6409-699EF1A23001}"
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxpng", "wxWidgets\build\msw\wx_wxpng.vcxproj", "{76169FE8-0814-4F36-6409-699EF1A23001}"
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxregex", "wxWidgets\build\msw\wx_vc10_wxregex.vcxproj", "{949C6DB8-E638-6EC6-AB31-BCCFD1379E01}"
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxregex", "wxWidgets\build\msw\wx_wxregex.vcxproj", "{949C6DB8-E638-6EC6-AB31-BCCFD1379E01}"
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxtiff", "wxWidgets\build\msw\wx_vc10_wxtiff.vcxproj", "{B87216CD-6C64-1DB0-D900-BC6E745C1DF9}"
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxtiff", "wxWidgets\build\msw\wx_wxtiff.vcxproj", "{B87216CD-6C64-1DB0-D900-BC6E745C1DF9}"
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxzlib", "wxWidgets\build\msw\wx_vc10_wxzlib.vcxproj", "{AFF2C68B-B867-DD50-6AC5-74B09D41F8EA}"
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxzlib", "wxWidgets\build\msw\wx_wxzlib.vcxproj", "{AFF2C68B-B867-DD50-6AC5-74B09D41F8EA}"
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xml", "wxWidgets\build\msw\wx_vc10_xml.vcxproj", "{6FDC76D5-CB44-B9F8-5EF6-C59B020719DF}"
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xml", "wxWidgets\build\msw\wx_xml.vcxproj", "{6FDC76D5-CB44-B9F8-5EF6-C59B020719DF}"
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xrc", "wxWidgets\build\msw\wx_xrc.vcxproj", "{8BECCA95-C7D7-CFF8-FDB1-4950E9F8E8E6}"
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xrc", "wxWidgets\build\msw\wx_vc10_xrc.vcxproj", "{8BECCA95-C7D7-CFF8-FDB1-4950E9F8E8E6}"
|
||||
EndProject
|
||||
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "stblib", "stblib", "{9D839DFB-76E6-4F10-8EED-BA2AC7CC3FB6}"
|
||||
ProjectSection(SolutionItems) = preProject
|
||||
|
|
@ -103,10 +113,20 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "unpkg", "unpkg", "{9F2D2094
|
|||
unpkg\unpkg.h = unpkg\unpkg.h
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ribbon", "wxWidgets\build\msw\wx_vc10_ribbon.vcxproj", "{87B42A9C-3F5C-53D7-9017-2B1CAE39457D}"
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "stc", "wxWidgets\build\msw\wx_vc10_stc.vcxproj", "{23E1C437-A951-5943-8639-A17F3CF2E606}"
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxscintilla", "wxWidgets\build\msw\wx_vc10_wxscintilla.vcxproj", "{74827EBD-93DC-5110-BA95-3F2AB029B6B0}"
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
Debug|Win32 = Debug|Win32
|
||||
Debug|x64 = Debug|x64
|
||||
DLL Debug|Win32 = DLL Debug|Win32
|
||||
DLL Debug|x64 = DLL Debug|x64
|
||||
DLL Release|Win32 = DLL Release|Win32
|
||||
DLL Release|x64 = DLL Release|x64
|
||||
Release|Win32 = Release|Win32
|
||||
Release|x64 = Release|x64
|
||||
EndGlobalSection
|
||||
|
|
@ -115,6 +135,14 @@ Global
|
|||
{70CD65B0-91D6-4FAE-9A7B-4AF55D0D1B12}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{70CD65B0-91D6-4FAE-9A7B-4AF55D0D1B12}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{70CD65B0-91D6-4FAE-9A7B-4AF55D0D1B12}.Debug|x64.Build.0 = Debug|x64
|
||||
{70CD65B0-91D6-4FAE-9A7B-4AF55D0D1B12}.DLL Debug|Win32.ActiveCfg = Debug|Win32
|
||||
{70CD65B0-91D6-4FAE-9A7B-4AF55D0D1B12}.DLL Debug|Win32.Build.0 = Debug|Win32
|
||||
{70CD65B0-91D6-4FAE-9A7B-4AF55D0D1B12}.DLL Debug|x64.ActiveCfg = Debug|x64
|
||||
{70CD65B0-91D6-4FAE-9A7B-4AF55D0D1B12}.DLL Debug|x64.Build.0 = Debug|x64
|
||||
{70CD65B0-91D6-4FAE-9A7B-4AF55D0D1B12}.DLL Release|Win32.ActiveCfg = Release|Win32
|
||||
{70CD65B0-91D6-4FAE-9A7B-4AF55D0D1B12}.DLL Release|Win32.Build.0 = Release|Win32
|
||||
{70CD65B0-91D6-4FAE-9A7B-4AF55D0D1B12}.DLL Release|x64.ActiveCfg = Release|x64
|
||||
{70CD65B0-91D6-4FAE-9A7B-4AF55D0D1B12}.DLL Release|x64.Build.0 = Release|x64
|
||||
{70CD65B0-91D6-4FAE-9A7B-4AF55D0D1B12}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{70CD65B0-91D6-4FAE-9A7B-4AF55D0D1B12}.Release|Win32.Build.0 = Release|Win32
|
||||
{70CD65B0-91D6-4FAE-9A7B-4AF55D0D1B12}.Release|x64.ActiveCfg = Release|x64
|
||||
|
|
@ -123,6 +151,14 @@ Global
|
|||
{6FCB55A5-563F-4039-1D79-1EB6ED8AAB82}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{6FCB55A5-563F-4039-1D79-1EB6ED8AAB82}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{6FCB55A5-563F-4039-1D79-1EB6ED8AAB82}.Debug|x64.Build.0 = Debug|x64
|
||||
{6FCB55A5-563F-4039-1D79-1EB6ED8AAB82}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32
|
||||
{6FCB55A5-563F-4039-1D79-1EB6ED8AAB82}.DLL Debug|Win32.Build.0 = DLL Debug|Win32
|
||||
{6FCB55A5-563F-4039-1D79-1EB6ED8AAB82}.DLL Debug|x64.ActiveCfg = DLL Debug|x64
|
||||
{6FCB55A5-563F-4039-1D79-1EB6ED8AAB82}.DLL Debug|x64.Build.0 = DLL Debug|x64
|
||||
{6FCB55A5-563F-4039-1D79-1EB6ED8AAB82}.DLL Release|Win32.ActiveCfg = DLL Release|Win32
|
||||
{6FCB55A5-563F-4039-1D79-1EB6ED8AAB82}.DLL Release|Win32.Build.0 = DLL Release|Win32
|
||||
{6FCB55A5-563F-4039-1D79-1EB6ED8AAB82}.DLL Release|x64.ActiveCfg = DLL Release|x64
|
||||
{6FCB55A5-563F-4039-1D79-1EB6ED8AAB82}.DLL Release|x64.Build.0 = DLL Release|x64
|
||||
{6FCB55A5-563F-4039-1D79-1EB6ED8AAB82}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{6FCB55A5-563F-4039-1D79-1EB6ED8AAB82}.Release|Win32.Build.0 = Release|Win32
|
||||
{6FCB55A5-563F-4039-1D79-1EB6ED8AAB82}.Release|x64.ActiveCfg = Release|x64
|
||||
|
|
@ -131,6 +167,14 @@ Global
|
|||
{7047EE97-7F80-A70D-6147-BC11102DB6F4}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{7047EE97-7F80-A70D-6147-BC11102DB6F4}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{7047EE97-7F80-A70D-6147-BC11102DB6F4}.Debug|x64.Build.0 = Debug|x64
|
||||
{7047EE97-7F80-A70D-6147-BC11102DB6F4}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32
|
||||
{7047EE97-7F80-A70D-6147-BC11102DB6F4}.DLL Debug|Win32.Build.0 = DLL Debug|Win32
|
||||
{7047EE97-7F80-A70D-6147-BC11102DB6F4}.DLL Debug|x64.ActiveCfg = DLL Debug|x64
|
||||
{7047EE97-7F80-A70D-6147-BC11102DB6F4}.DLL Debug|x64.Build.0 = DLL Debug|x64
|
||||
{7047EE97-7F80-A70D-6147-BC11102DB6F4}.DLL Release|Win32.ActiveCfg = DLL Release|Win32
|
||||
{7047EE97-7F80-A70D-6147-BC11102DB6F4}.DLL Release|Win32.Build.0 = DLL Release|Win32
|
||||
{7047EE97-7F80-A70D-6147-BC11102DB6F4}.DLL Release|x64.ActiveCfg = DLL Release|x64
|
||||
{7047EE97-7F80-A70D-6147-BC11102DB6F4}.DLL Release|x64.Build.0 = DLL Release|x64
|
||||
{7047EE97-7F80-A70D-6147-BC11102DB6F4}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{7047EE97-7F80-A70D-6147-BC11102DB6F4}.Release|Win32.Build.0 = Release|Win32
|
||||
{7047EE97-7F80-A70D-6147-BC11102DB6F4}.Release|x64.ActiveCfg = Release|x64
|
||||
|
|
@ -139,6 +183,14 @@ Global
|
|||
{3111D679-7796-23C4-BA0C-271F1145DA24}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{3111D679-7796-23C4-BA0C-271F1145DA24}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{3111D679-7796-23C4-BA0C-271F1145DA24}.Debug|x64.Build.0 = Debug|x64
|
||||
{3111D679-7796-23C4-BA0C-271F1145DA24}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32
|
||||
{3111D679-7796-23C4-BA0C-271F1145DA24}.DLL Debug|Win32.Build.0 = DLL Debug|Win32
|
||||
{3111D679-7796-23C4-BA0C-271F1145DA24}.DLL Debug|x64.ActiveCfg = DLL Debug|x64
|
||||
{3111D679-7796-23C4-BA0C-271F1145DA24}.DLL Debug|x64.Build.0 = DLL Debug|x64
|
||||
{3111D679-7796-23C4-BA0C-271F1145DA24}.DLL Release|Win32.ActiveCfg = DLL Release|Win32
|
||||
{3111D679-7796-23C4-BA0C-271F1145DA24}.DLL Release|Win32.Build.0 = DLL Release|Win32
|
||||
{3111D679-7796-23C4-BA0C-271F1145DA24}.DLL Release|x64.ActiveCfg = DLL Release|x64
|
||||
{3111D679-7796-23C4-BA0C-271F1145DA24}.DLL Release|x64.Build.0 = DLL Release|x64
|
||||
{3111D679-7796-23C4-BA0C-271F1145DA24}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{3111D679-7796-23C4-BA0C-271F1145DA24}.Release|Win32.Build.0 = Release|Win32
|
||||
{3111D679-7796-23C4-BA0C-271F1145DA24}.Release|x64.ActiveCfg = Release|x64
|
||||
|
|
@ -147,6 +199,14 @@ Global
|
|||
{067D9406-2A93-DACA-9449-93A2D356357D}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{067D9406-2A93-DACA-9449-93A2D356357D}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{067D9406-2A93-DACA-9449-93A2D356357D}.Debug|x64.Build.0 = Debug|x64
|
||||
{067D9406-2A93-DACA-9449-93A2D356357D}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32
|
||||
{067D9406-2A93-DACA-9449-93A2D356357D}.DLL Debug|Win32.Build.0 = DLL Debug|Win32
|
||||
{067D9406-2A93-DACA-9449-93A2D356357D}.DLL Debug|x64.ActiveCfg = DLL Debug|x64
|
||||
{067D9406-2A93-DACA-9449-93A2D356357D}.DLL Debug|x64.Build.0 = DLL Debug|x64
|
||||
{067D9406-2A93-DACA-9449-93A2D356357D}.DLL Release|Win32.ActiveCfg = DLL Release|Win32
|
||||
{067D9406-2A93-DACA-9449-93A2D356357D}.DLL Release|Win32.Build.0 = DLL Release|Win32
|
||||
{067D9406-2A93-DACA-9449-93A2D356357D}.DLL Release|x64.ActiveCfg = DLL Release|x64
|
||||
{067D9406-2A93-DACA-9449-93A2D356357D}.DLL Release|x64.Build.0 = DLL Release|x64
|
||||
{067D9406-2A93-DACA-9449-93A2D356357D}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{067D9406-2A93-DACA-9449-93A2D356357D}.Release|Win32.Build.0 = Release|Win32
|
||||
{067D9406-2A93-DACA-9449-93A2D356357D}.Release|x64.ActiveCfg = Release|x64
|
||||
|
|
@ -155,6 +215,14 @@ Global
|
|||
{9ED1866B-D4AE-3440-24E4-7A9475B163B2}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{9ED1866B-D4AE-3440-24E4-7A9475B163B2}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{9ED1866B-D4AE-3440-24E4-7A9475B163B2}.Debug|x64.Build.0 = Debug|x64
|
||||
{9ED1866B-D4AE-3440-24E4-7A9475B163B2}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32
|
||||
{9ED1866B-D4AE-3440-24E4-7A9475B163B2}.DLL Debug|Win32.Build.0 = DLL Debug|Win32
|
||||
{9ED1866B-D4AE-3440-24E4-7A9475B163B2}.DLL Debug|x64.ActiveCfg = DLL Debug|x64
|
||||
{9ED1866B-D4AE-3440-24E4-7A9475B163B2}.DLL Debug|x64.Build.0 = DLL Debug|x64
|
||||
{9ED1866B-D4AE-3440-24E4-7A9475B163B2}.DLL Release|Win32.ActiveCfg = DLL Release|Win32
|
||||
{9ED1866B-D4AE-3440-24E4-7A9475B163B2}.DLL Release|Win32.Build.0 = DLL Release|Win32
|
||||
{9ED1866B-D4AE-3440-24E4-7A9475B163B2}.DLL Release|x64.ActiveCfg = DLL Release|x64
|
||||
{9ED1866B-D4AE-3440-24E4-7A9475B163B2}.DLL Release|x64.Build.0 = DLL Release|x64
|
||||
{9ED1866B-D4AE-3440-24E4-7A9475B163B2}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{9ED1866B-D4AE-3440-24E4-7A9475B163B2}.Release|Win32.Build.0 = Release|Win32
|
||||
{9ED1866B-D4AE-3440-24E4-7A9475B163B2}.Release|x64.ActiveCfg = Release|x64
|
||||
|
|
@ -163,6 +231,14 @@ Global
|
|||
{99C9EB95-DB4C-1996-490E-5212EFBF07C3}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{99C9EB95-DB4C-1996-490E-5212EFBF07C3}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{99C9EB95-DB4C-1996-490E-5212EFBF07C3}.Debug|x64.Build.0 = Debug|x64
|
||||
{99C9EB95-DB4C-1996-490E-5212EFBF07C3}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32
|
||||
{99C9EB95-DB4C-1996-490E-5212EFBF07C3}.DLL Debug|Win32.Build.0 = DLL Debug|Win32
|
||||
{99C9EB95-DB4C-1996-490E-5212EFBF07C3}.DLL Debug|x64.ActiveCfg = DLL Debug|x64
|
||||
{99C9EB95-DB4C-1996-490E-5212EFBF07C3}.DLL Debug|x64.Build.0 = DLL Debug|x64
|
||||
{99C9EB95-DB4C-1996-490E-5212EFBF07C3}.DLL Release|Win32.ActiveCfg = DLL Release|Win32
|
||||
{99C9EB95-DB4C-1996-490E-5212EFBF07C3}.DLL Release|Win32.Build.0 = DLL Release|Win32
|
||||
{99C9EB95-DB4C-1996-490E-5212EFBF07C3}.DLL Release|x64.ActiveCfg = DLL Release|x64
|
||||
{99C9EB95-DB4C-1996-490E-5212EFBF07C3}.DLL Release|x64.Build.0 = DLL Release|x64
|
||||
{99C9EB95-DB4C-1996-490E-5212EFBF07C3}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{99C9EB95-DB4C-1996-490E-5212EFBF07C3}.Release|Win32.Build.0 = Release|Win32
|
||||
{99C9EB95-DB4C-1996-490E-5212EFBF07C3}.Release|x64.ActiveCfg = Release|x64
|
||||
|
|
@ -171,6 +247,14 @@ Global
|
|||
{6EDC3B79-D217-F11A-406F-F11D856493F9}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{6EDC3B79-D217-F11A-406F-F11D856493F9}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{6EDC3B79-D217-F11A-406F-F11D856493F9}.Debug|x64.Build.0 = Debug|x64
|
||||
{6EDC3B79-D217-F11A-406F-F11D856493F9}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32
|
||||
{6EDC3B79-D217-F11A-406F-F11D856493F9}.DLL Debug|Win32.Build.0 = DLL Debug|Win32
|
||||
{6EDC3B79-D217-F11A-406F-F11D856493F9}.DLL Debug|x64.ActiveCfg = DLL Debug|x64
|
||||
{6EDC3B79-D217-F11A-406F-F11D856493F9}.DLL Debug|x64.Build.0 = DLL Debug|x64
|
||||
{6EDC3B79-D217-F11A-406F-F11D856493F9}.DLL Release|Win32.ActiveCfg = DLL Release|Win32
|
||||
{6EDC3B79-D217-F11A-406F-F11D856493F9}.DLL Release|Win32.Build.0 = DLL Release|Win32
|
||||
{6EDC3B79-D217-F11A-406F-F11D856493F9}.DLL Release|x64.ActiveCfg = DLL Release|x64
|
||||
{6EDC3B79-D217-F11A-406F-F11D856493F9}.DLL Release|x64.Build.0 = DLL Release|x64
|
||||
{6EDC3B79-D217-F11A-406F-F11D856493F9}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{6EDC3B79-D217-F11A-406F-F11D856493F9}.Release|Win32.Build.0 = Release|Win32
|
||||
{6EDC3B79-D217-F11A-406F-F11D856493F9}.Release|x64.ActiveCfg = Release|x64
|
||||
|
|
@ -179,6 +263,14 @@ Global
|
|||
{A9AC9CF5-8E6C-0BA2-0769-6E42EDB88E25}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{A9AC9CF5-8E6C-0BA2-0769-6E42EDB88E25}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{A9AC9CF5-8E6C-0BA2-0769-6E42EDB88E25}.Debug|x64.Build.0 = Debug|x64
|
||||
{A9AC9CF5-8E6C-0BA2-0769-6E42EDB88E25}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32
|
||||
{A9AC9CF5-8E6C-0BA2-0769-6E42EDB88E25}.DLL Debug|Win32.Build.0 = DLL Debug|Win32
|
||||
{A9AC9CF5-8E6C-0BA2-0769-6E42EDB88E25}.DLL Debug|x64.ActiveCfg = DLL Debug|x64
|
||||
{A9AC9CF5-8E6C-0BA2-0769-6E42EDB88E25}.DLL Debug|x64.Build.0 = DLL Debug|x64
|
||||
{A9AC9CF5-8E6C-0BA2-0769-6E42EDB88E25}.DLL Release|Win32.ActiveCfg = DLL Release|Win32
|
||||
{A9AC9CF5-8E6C-0BA2-0769-6E42EDB88E25}.DLL Release|Win32.Build.0 = DLL Release|Win32
|
||||
{A9AC9CF5-8E6C-0BA2-0769-6E42EDB88E25}.DLL Release|x64.ActiveCfg = DLL Release|x64
|
||||
{A9AC9CF5-8E6C-0BA2-0769-6E42EDB88E25}.DLL Release|x64.Build.0 = DLL Release|x64
|
||||
{A9AC9CF5-8E6C-0BA2-0769-6E42EDB88E25}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{A9AC9CF5-8E6C-0BA2-0769-6E42EDB88E25}.Release|Win32.Build.0 = Release|Win32
|
||||
{A9AC9CF5-8E6C-0BA2-0769-6E42EDB88E25}.Release|x64.ActiveCfg = Release|x64
|
||||
|
|
@ -187,22 +279,30 @@ Global
|
|||
{CD478F02-7550-58A5-E085-CE4BC0C0AD23}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{CD478F02-7550-58A5-E085-CE4BC0C0AD23}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{CD478F02-7550-58A5-E085-CE4BC0C0AD23}.Debug|x64.Build.0 = Debug|x64
|
||||
{CD478F02-7550-58A5-E085-CE4BC0C0AD23}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32
|
||||
{CD478F02-7550-58A5-E085-CE4BC0C0AD23}.DLL Debug|Win32.Build.0 = DLL Debug|Win32
|
||||
{CD478F02-7550-58A5-E085-CE4BC0C0AD23}.DLL Debug|x64.ActiveCfg = DLL Debug|x64
|
||||
{CD478F02-7550-58A5-E085-CE4BC0C0AD23}.DLL Debug|x64.Build.0 = DLL Debug|x64
|
||||
{CD478F02-7550-58A5-E085-CE4BC0C0AD23}.DLL Release|Win32.ActiveCfg = DLL Release|Win32
|
||||
{CD478F02-7550-58A5-E085-CE4BC0C0AD23}.DLL Release|Win32.Build.0 = DLL Release|Win32
|
||||
{CD478F02-7550-58A5-E085-CE4BC0C0AD23}.DLL Release|x64.ActiveCfg = DLL Release|x64
|
||||
{CD478F02-7550-58A5-E085-CE4BC0C0AD23}.DLL Release|x64.Build.0 = DLL Release|x64
|
||||
{CD478F02-7550-58A5-E085-CE4BC0C0AD23}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{CD478F02-7550-58A5-E085-CE4BC0C0AD23}.Release|Win32.Build.0 = Release|Win32
|
||||
{CD478F02-7550-58A5-E085-CE4BC0C0AD23}.Release|x64.ActiveCfg = Release|x64
|
||||
{CD478F02-7550-58A5-E085-CE4BC0C0AD23}.Release|x64.Build.0 = Release|x64
|
||||
{C051C502-820F-2983-EF97-144C0CD92905}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||
{C051C502-820F-2983-EF97-144C0CD92905}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{C051C502-820F-2983-EF97-144C0CD92905}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{C051C502-820F-2983-EF97-144C0CD92905}.Debug|x64.Build.0 = Debug|x64
|
||||
{C051C502-820F-2983-EF97-144C0CD92905}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{C051C502-820F-2983-EF97-144C0CD92905}.Release|Win32.Build.0 = Release|Win32
|
||||
{C051C502-820F-2983-EF97-144C0CD92905}.Release|x64.ActiveCfg = Release|x64
|
||||
{C051C502-820F-2983-EF97-144C0CD92905}.Release|x64.Build.0 = Release|x64
|
||||
{22B14659-C5B6-B775-868D-A49198FEAD4A}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||
{22B14659-C5B6-B775-868D-A49198FEAD4A}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{22B14659-C5B6-B775-868D-A49198FEAD4A}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{22B14659-C5B6-B775-868D-A49198FEAD4A}.Debug|x64.Build.0 = Debug|x64
|
||||
{22B14659-C5B6-B775-868D-A49198FEAD4A}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32
|
||||
{22B14659-C5B6-B775-868D-A49198FEAD4A}.DLL Debug|Win32.Build.0 = DLL Debug|Win32
|
||||
{22B14659-C5B6-B775-868D-A49198FEAD4A}.DLL Debug|x64.ActiveCfg = DLL Debug|x64
|
||||
{22B14659-C5B6-B775-868D-A49198FEAD4A}.DLL Debug|x64.Build.0 = DLL Debug|x64
|
||||
{22B14659-C5B6-B775-868D-A49198FEAD4A}.DLL Release|Win32.ActiveCfg = DLL Release|Win32
|
||||
{22B14659-C5B6-B775-868D-A49198FEAD4A}.DLL Release|Win32.Build.0 = DLL Release|Win32
|
||||
{22B14659-C5B6-B775-868D-A49198FEAD4A}.DLL Release|x64.ActiveCfg = DLL Release|x64
|
||||
{22B14659-C5B6-B775-868D-A49198FEAD4A}.DLL Release|x64.Build.0 = DLL Release|x64
|
||||
{22B14659-C5B6-B775-868D-A49198FEAD4A}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{22B14659-C5B6-B775-868D-A49198FEAD4A}.Release|Win32.Build.0 = Release|Win32
|
||||
{22B14659-C5B6-B775-868D-A49198FEAD4A}.Release|x64.ActiveCfg = Release|x64
|
||||
|
|
@ -211,6 +311,14 @@ Global
|
|||
{FAF0CB93-F7CE-A6B8-8342-19CE99BAF774}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{FAF0CB93-F7CE-A6B8-8342-19CE99BAF774}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{FAF0CB93-F7CE-A6B8-8342-19CE99BAF774}.Debug|x64.Build.0 = Debug|x64
|
||||
{FAF0CB93-F7CE-A6B8-8342-19CE99BAF774}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32
|
||||
{FAF0CB93-F7CE-A6B8-8342-19CE99BAF774}.DLL Debug|Win32.Build.0 = DLL Debug|Win32
|
||||
{FAF0CB93-F7CE-A6B8-8342-19CE99BAF774}.DLL Debug|x64.ActiveCfg = DLL Debug|x64
|
||||
{FAF0CB93-F7CE-A6B8-8342-19CE99BAF774}.DLL Debug|x64.Build.0 = DLL Debug|x64
|
||||
{FAF0CB93-F7CE-A6B8-8342-19CE99BAF774}.DLL Release|Win32.ActiveCfg = DLL Release|Win32
|
||||
{FAF0CB93-F7CE-A6B8-8342-19CE99BAF774}.DLL Release|Win32.Build.0 = DLL Release|Win32
|
||||
{FAF0CB93-F7CE-A6B8-8342-19CE99BAF774}.DLL Release|x64.ActiveCfg = DLL Release|x64
|
||||
{FAF0CB93-F7CE-A6B8-8342-19CE99BAF774}.DLL Release|x64.Build.0 = DLL Release|x64
|
||||
{FAF0CB93-F7CE-A6B8-8342-19CE99BAF774}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{FAF0CB93-F7CE-A6B8-8342-19CE99BAF774}.Release|Win32.Build.0 = Release|Win32
|
||||
{FAF0CB93-F7CE-A6B8-8342-19CE99BAF774}.Release|x64.ActiveCfg = Release|x64
|
||||
|
|
@ -219,6 +327,14 @@ Global
|
|||
{46333DC3-B4A5-3DCC-E8BF-A3F20ADC56D2}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{46333DC3-B4A5-3DCC-E8BF-A3F20ADC56D2}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{46333DC3-B4A5-3DCC-E8BF-A3F20ADC56D2}.Debug|x64.Build.0 = Debug|x64
|
||||
{46333DC3-B4A5-3DCC-E8BF-A3F20ADC56D2}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32
|
||||
{46333DC3-B4A5-3DCC-E8BF-A3F20ADC56D2}.DLL Debug|Win32.Build.0 = DLL Debug|Win32
|
||||
{46333DC3-B4A5-3DCC-E8BF-A3F20ADC56D2}.DLL Debug|x64.ActiveCfg = DLL Debug|x64
|
||||
{46333DC3-B4A5-3DCC-E8BF-A3F20ADC56D2}.DLL Debug|x64.Build.0 = DLL Debug|x64
|
||||
{46333DC3-B4A5-3DCC-E8BF-A3F20ADC56D2}.DLL Release|Win32.ActiveCfg = DLL Release|Win32
|
||||
{46333DC3-B4A5-3DCC-E8BF-A3F20ADC56D2}.DLL Release|Win32.Build.0 = DLL Release|Win32
|
||||
{46333DC3-B4A5-3DCC-E8BF-A3F20ADC56D2}.DLL Release|x64.ActiveCfg = DLL Release|x64
|
||||
{46333DC3-B4A5-3DCC-E8BF-A3F20ADC56D2}.DLL Release|x64.Build.0 = DLL Release|x64
|
||||
{46333DC3-B4A5-3DCC-E8BF-A3F20ADC56D2}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{46333DC3-B4A5-3DCC-E8BF-A3F20ADC56D2}.Release|Win32.Build.0 = Release|Win32
|
||||
{46333DC3-B4A5-3DCC-E8BF-A3F20ADC56D2}.Release|x64.ActiveCfg = Release|x64
|
||||
|
|
@ -227,6 +343,14 @@ Global
|
|||
{5C363C34-4741-7036-861C-2E2279CF552E}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{5C363C34-4741-7036-861C-2E2279CF552E}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{5C363C34-4741-7036-861C-2E2279CF552E}.Debug|x64.Build.0 = Debug|x64
|
||||
{5C363C34-4741-7036-861C-2E2279CF552E}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32
|
||||
{5C363C34-4741-7036-861C-2E2279CF552E}.DLL Debug|Win32.Build.0 = DLL Debug|Win32
|
||||
{5C363C34-4741-7036-861C-2E2279CF552E}.DLL Debug|x64.ActiveCfg = DLL Debug|x64
|
||||
{5C363C34-4741-7036-861C-2E2279CF552E}.DLL Debug|x64.Build.0 = DLL Debug|x64
|
||||
{5C363C34-4741-7036-861C-2E2279CF552E}.DLL Release|Win32.ActiveCfg = DLL Release|Win32
|
||||
{5C363C34-4741-7036-861C-2E2279CF552E}.DLL Release|Win32.Build.0 = DLL Release|Win32
|
||||
{5C363C34-4741-7036-861C-2E2279CF552E}.DLL Release|x64.ActiveCfg = DLL Release|x64
|
||||
{5C363C34-4741-7036-861C-2E2279CF552E}.DLL Release|x64.Build.0 = DLL Release|x64
|
||||
{5C363C34-4741-7036-861C-2E2279CF552E}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{5C363C34-4741-7036-861C-2E2279CF552E}.Release|Win32.Build.0 = Release|Win32
|
||||
{5C363C34-4741-7036-861C-2E2279CF552E}.Release|x64.ActiveCfg = Release|x64
|
||||
|
|
@ -235,6 +359,14 @@ Global
|
|||
{76169FE8-0814-4F36-6409-699EF1A23001}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{76169FE8-0814-4F36-6409-699EF1A23001}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{76169FE8-0814-4F36-6409-699EF1A23001}.Debug|x64.Build.0 = Debug|x64
|
||||
{76169FE8-0814-4F36-6409-699EF1A23001}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32
|
||||
{76169FE8-0814-4F36-6409-699EF1A23001}.DLL Debug|Win32.Build.0 = DLL Debug|Win32
|
||||
{76169FE8-0814-4F36-6409-699EF1A23001}.DLL Debug|x64.ActiveCfg = DLL Debug|x64
|
||||
{76169FE8-0814-4F36-6409-699EF1A23001}.DLL Debug|x64.Build.0 = DLL Debug|x64
|
||||
{76169FE8-0814-4F36-6409-699EF1A23001}.DLL Release|Win32.ActiveCfg = DLL Release|Win32
|
||||
{76169FE8-0814-4F36-6409-699EF1A23001}.DLL Release|Win32.Build.0 = DLL Release|Win32
|
||||
{76169FE8-0814-4F36-6409-699EF1A23001}.DLL Release|x64.ActiveCfg = DLL Release|x64
|
||||
{76169FE8-0814-4F36-6409-699EF1A23001}.DLL Release|x64.Build.0 = DLL Release|x64
|
||||
{76169FE8-0814-4F36-6409-699EF1A23001}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{76169FE8-0814-4F36-6409-699EF1A23001}.Release|Win32.Build.0 = Release|Win32
|
||||
{76169FE8-0814-4F36-6409-699EF1A23001}.Release|x64.ActiveCfg = Release|x64
|
||||
|
|
@ -243,6 +375,14 @@ Global
|
|||
{949C6DB8-E638-6EC6-AB31-BCCFD1379E01}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{949C6DB8-E638-6EC6-AB31-BCCFD1379E01}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{949C6DB8-E638-6EC6-AB31-BCCFD1379E01}.Debug|x64.Build.0 = Debug|x64
|
||||
{949C6DB8-E638-6EC6-AB31-BCCFD1379E01}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32
|
||||
{949C6DB8-E638-6EC6-AB31-BCCFD1379E01}.DLL Debug|Win32.Build.0 = DLL Debug|Win32
|
||||
{949C6DB8-E638-6EC6-AB31-BCCFD1379E01}.DLL Debug|x64.ActiveCfg = DLL Debug|x64
|
||||
{949C6DB8-E638-6EC6-AB31-BCCFD1379E01}.DLL Debug|x64.Build.0 = DLL Debug|x64
|
||||
{949C6DB8-E638-6EC6-AB31-BCCFD1379E01}.DLL Release|Win32.ActiveCfg = DLL Release|Win32
|
||||
{949C6DB8-E638-6EC6-AB31-BCCFD1379E01}.DLL Release|Win32.Build.0 = DLL Release|Win32
|
||||
{949C6DB8-E638-6EC6-AB31-BCCFD1379E01}.DLL Release|x64.ActiveCfg = DLL Release|x64
|
||||
{949C6DB8-E638-6EC6-AB31-BCCFD1379E01}.DLL Release|x64.Build.0 = DLL Release|x64
|
||||
{949C6DB8-E638-6EC6-AB31-BCCFD1379E01}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{949C6DB8-E638-6EC6-AB31-BCCFD1379E01}.Release|Win32.Build.0 = Release|Win32
|
||||
{949C6DB8-E638-6EC6-AB31-BCCFD1379E01}.Release|x64.ActiveCfg = Release|x64
|
||||
|
|
@ -251,6 +391,14 @@ Global
|
|||
{B87216CD-6C64-1DB0-D900-BC6E745C1DF9}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{B87216CD-6C64-1DB0-D900-BC6E745C1DF9}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{B87216CD-6C64-1DB0-D900-BC6E745C1DF9}.Debug|x64.Build.0 = Debug|x64
|
||||
{B87216CD-6C64-1DB0-D900-BC6E745C1DF9}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32
|
||||
{B87216CD-6C64-1DB0-D900-BC6E745C1DF9}.DLL Debug|Win32.Build.0 = DLL Debug|Win32
|
||||
{B87216CD-6C64-1DB0-D900-BC6E745C1DF9}.DLL Debug|x64.ActiveCfg = DLL Debug|x64
|
||||
{B87216CD-6C64-1DB0-D900-BC6E745C1DF9}.DLL Debug|x64.Build.0 = DLL Debug|x64
|
||||
{B87216CD-6C64-1DB0-D900-BC6E745C1DF9}.DLL Release|Win32.ActiveCfg = DLL Release|Win32
|
||||
{B87216CD-6C64-1DB0-D900-BC6E745C1DF9}.DLL Release|Win32.Build.0 = DLL Release|Win32
|
||||
{B87216CD-6C64-1DB0-D900-BC6E745C1DF9}.DLL Release|x64.ActiveCfg = DLL Release|x64
|
||||
{B87216CD-6C64-1DB0-D900-BC6E745C1DF9}.DLL Release|x64.Build.0 = DLL Release|x64
|
||||
{B87216CD-6C64-1DB0-D900-BC6E745C1DF9}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{B87216CD-6C64-1DB0-D900-BC6E745C1DF9}.Release|Win32.Build.0 = Release|Win32
|
||||
{B87216CD-6C64-1DB0-D900-BC6E745C1DF9}.Release|x64.ActiveCfg = Release|x64
|
||||
|
|
@ -259,6 +407,14 @@ Global
|
|||
{AFF2C68B-B867-DD50-6AC5-74B09D41F8EA}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{AFF2C68B-B867-DD50-6AC5-74B09D41F8EA}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{AFF2C68B-B867-DD50-6AC5-74B09D41F8EA}.Debug|x64.Build.0 = Debug|x64
|
||||
{AFF2C68B-B867-DD50-6AC5-74B09D41F8EA}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32
|
||||
{AFF2C68B-B867-DD50-6AC5-74B09D41F8EA}.DLL Debug|Win32.Build.0 = DLL Debug|Win32
|
||||
{AFF2C68B-B867-DD50-6AC5-74B09D41F8EA}.DLL Debug|x64.ActiveCfg = DLL Debug|x64
|
||||
{AFF2C68B-B867-DD50-6AC5-74B09D41F8EA}.DLL Debug|x64.Build.0 = DLL Debug|x64
|
||||
{AFF2C68B-B867-DD50-6AC5-74B09D41F8EA}.DLL Release|Win32.ActiveCfg = DLL Release|Win32
|
||||
{AFF2C68B-B867-DD50-6AC5-74B09D41F8EA}.DLL Release|Win32.Build.0 = DLL Release|Win32
|
||||
{AFF2C68B-B867-DD50-6AC5-74B09D41F8EA}.DLL Release|x64.ActiveCfg = DLL Release|x64
|
||||
{AFF2C68B-B867-DD50-6AC5-74B09D41F8EA}.DLL Release|x64.Build.0 = DLL Release|x64
|
||||
{AFF2C68B-B867-DD50-6AC5-74B09D41F8EA}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{AFF2C68B-B867-DD50-6AC5-74B09D41F8EA}.Release|Win32.Build.0 = Release|Win32
|
||||
{AFF2C68B-B867-DD50-6AC5-74B09D41F8EA}.Release|x64.ActiveCfg = Release|x64
|
||||
|
|
@ -267,6 +423,14 @@ Global
|
|||
{6FDC76D5-CB44-B9F8-5EF6-C59B020719DF}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{6FDC76D5-CB44-B9F8-5EF6-C59B020719DF}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{6FDC76D5-CB44-B9F8-5EF6-C59B020719DF}.Debug|x64.Build.0 = Debug|x64
|
||||
{6FDC76D5-CB44-B9F8-5EF6-C59B020719DF}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32
|
||||
{6FDC76D5-CB44-B9F8-5EF6-C59B020719DF}.DLL Debug|Win32.Build.0 = DLL Debug|Win32
|
||||
{6FDC76D5-CB44-B9F8-5EF6-C59B020719DF}.DLL Debug|x64.ActiveCfg = DLL Debug|x64
|
||||
{6FDC76D5-CB44-B9F8-5EF6-C59B020719DF}.DLL Debug|x64.Build.0 = DLL Debug|x64
|
||||
{6FDC76D5-CB44-B9F8-5EF6-C59B020719DF}.DLL Release|Win32.ActiveCfg = DLL Release|Win32
|
||||
{6FDC76D5-CB44-B9F8-5EF6-C59B020719DF}.DLL Release|Win32.Build.0 = DLL Release|Win32
|
||||
{6FDC76D5-CB44-B9F8-5EF6-C59B020719DF}.DLL Release|x64.ActiveCfg = DLL Release|x64
|
||||
{6FDC76D5-CB44-B9F8-5EF6-C59B020719DF}.DLL Release|x64.Build.0 = DLL Release|x64
|
||||
{6FDC76D5-CB44-B9F8-5EF6-C59B020719DF}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{6FDC76D5-CB44-B9F8-5EF6-C59B020719DF}.Release|Win32.Build.0 = Release|Win32
|
||||
{6FDC76D5-CB44-B9F8-5EF6-C59B020719DF}.Release|x64.ActiveCfg = Release|x64
|
||||
|
|
@ -275,10 +439,66 @@ Global
|
|||
{8BECCA95-C7D7-CFF8-FDB1-4950E9F8E8E6}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{8BECCA95-C7D7-CFF8-FDB1-4950E9F8E8E6}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{8BECCA95-C7D7-CFF8-FDB1-4950E9F8E8E6}.Debug|x64.Build.0 = Debug|x64
|
||||
{8BECCA95-C7D7-CFF8-FDB1-4950E9F8E8E6}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32
|
||||
{8BECCA95-C7D7-CFF8-FDB1-4950E9F8E8E6}.DLL Debug|Win32.Build.0 = DLL Debug|Win32
|
||||
{8BECCA95-C7D7-CFF8-FDB1-4950E9F8E8E6}.DLL Debug|x64.ActiveCfg = DLL Debug|x64
|
||||
{8BECCA95-C7D7-CFF8-FDB1-4950E9F8E8E6}.DLL Debug|x64.Build.0 = DLL Debug|x64
|
||||
{8BECCA95-C7D7-CFF8-FDB1-4950E9F8E8E6}.DLL Release|Win32.ActiveCfg = DLL Release|Win32
|
||||
{8BECCA95-C7D7-CFF8-FDB1-4950E9F8E8E6}.DLL Release|Win32.Build.0 = DLL Release|Win32
|
||||
{8BECCA95-C7D7-CFF8-FDB1-4950E9F8E8E6}.DLL Release|x64.ActiveCfg = DLL Release|x64
|
||||
{8BECCA95-C7D7-CFF8-FDB1-4950E9F8E8E6}.DLL Release|x64.Build.0 = DLL Release|x64
|
||||
{8BECCA95-C7D7-CFF8-FDB1-4950E9F8E8E6}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{8BECCA95-C7D7-CFF8-FDB1-4950E9F8E8E6}.Release|Win32.Build.0 = Release|Win32
|
||||
{8BECCA95-C7D7-CFF8-FDB1-4950E9F8E8E6}.Release|x64.ActiveCfg = Release|x64
|
||||
{8BECCA95-C7D7-CFF8-FDB1-4950E9F8E8E6}.Release|x64.Build.0 = Release|x64
|
||||
{87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||
{87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.Debug|x64.Build.0 = Debug|x64
|
||||
{87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32
|
||||
{87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.DLL Debug|Win32.Build.0 = DLL Debug|Win32
|
||||
{87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.DLL Debug|x64.ActiveCfg = DLL Debug|x64
|
||||
{87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.DLL Debug|x64.Build.0 = DLL Debug|x64
|
||||
{87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.DLL Release|Win32.ActiveCfg = DLL Release|Win32
|
||||
{87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.DLL Release|Win32.Build.0 = DLL Release|Win32
|
||||
{87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.DLL Release|x64.ActiveCfg = DLL Release|x64
|
||||
{87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.DLL Release|x64.Build.0 = DLL Release|x64
|
||||
{87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.Release|Win32.Build.0 = Release|Win32
|
||||
{87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.Release|x64.ActiveCfg = Release|x64
|
||||
{87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.Release|x64.Build.0 = Release|x64
|
||||
{23E1C437-A951-5943-8639-A17F3CF2E606}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||
{23E1C437-A951-5943-8639-A17F3CF2E606}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{23E1C437-A951-5943-8639-A17F3CF2E606}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{23E1C437-A951-5943-8639-A17F3CF2E606}.Debug|x64.Build.0 = Debug|x64
|
||||
{23E1C437-A951-5943-8639-A17F3CF2E606}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32
|
||||
{23E1C437-A951-5943-8639-A17F3CF2E606}.DLL Debug|Win32.Build.0 = DLL Debug|Win32
|
||||
{23E1C437-A951-5943-8639-A17F3CF2E606}.DLL Debug|x64.ActiveCfg = DLL Debug|x64
|
||||
{23E1C437-A951-5943-8639-A17F3CF2E606}.DLL Debug|x64.Build.0 = DLL Debug|x64
|
||||
{23E1C437-A951-5943-8639-A17F3CF2E606}.DLL Release|Win32.ActiveCfg = DLL Release|Win32
|
||||
{23E1C437-A951-5943-8639-A17F3CF2E606}.DLL Release|Win32.Build.0 = DLL Release|Win32
|
||||
{23E1C437-A951-5943-8639-A17F3CF2E606}.DLL Release|x64.ActiveCfg = DLL Release|x64
|
||||
{23E1C437-A951-5943-8639-A17F3CF2E606}.DLL Release|x64.Build.0 = DLL Release|x64
|
||||
{23E1C437-A951-5943-8639-A17F3CF2E606}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{23E1C437-A951-5943-8639-A17F3CF2E606}.Release|Win32.Build.0 = Release|Win32
|
||||
{23E1C437-A951-5943-8639-A17F3CF2E606}.Release|x64.ActiveCfg = Release|x64
|
||||
{23E1C437-A951-5943-8639-A17F3CF2E606}.Release|x64.Build.0 = Release|x64
|
||||
{74827EBD-93DC-5110-BA95-3F2AB029B6B0}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||
{74827EBD-93DC-5110-BA95-3F2AB029B6B0}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{74827EBD-93DC-5110-BA95-3F2AB029B6B0}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{74827EBD-93DC-5110-BA95-3F2AB029B6B0}.Debug|x64.Build.0 = Debug|x64
|
||||
{74827EBD-93DC-5110-BA95-3F2AB029B6B0}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32
|
||||
{74827EBD-93DC-5110-BA95-3F2AB029B6B0}.DLL Debug|Win32.Build.0 = DLL Debug|Win32
|
||||
{74827EBD-93DC-5110-BA95-3F2AB029B6B0}.DLL Debug|x64.ActiveCfg = DLL Debug|x64
|
||||
{74827EBD-93DC-5110-BA95-3F2AB029B6B0}.DLL Debug|x64.Build.0 = DLL Debug|x64
|
||||
{74827EBD-93DC-5110-BA95-3F2AB029B6B0}.DLL Release|Win32.ActiveCfg = DLL Release|Win32
|
||||
{74827EBD-93DC-5110-BA95-3F2AB029B6B0}.DLL Release|Win32.Build.0 = DLL Release|Win32
|
||||
{74827EBD-93DC-5110-BA95-3F2AB029B6B0}.DLL Release|x64.ActiveCfg = DLL Release|x64
|
||||
{74827EBD-93DC-5110-BA95-3F2AB029B6B0}.DLL Release|x64.Build.0 = DLL Release|x64
|
||||
{74827EBD-93DC-5110-BA95-3F2AB029B6B0}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{74827EBD-93DC-5110-BA95-3F2AB029B6B0}.Release|Win32.Build.0 = Release|Win32
|
||||
{74827EBD-93DC-5110-BA95-3F2AB029B6B0}.Release|x64.ActiveCfg = Release|x64
|
||||
{74827EBD-93DC-5110-BA95-3F2AB029B6B0}.Release|x64.Build.0 = Release|x64
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
|
|
@ -293,7 +513,6 @@ Global
|
|||
{6EDC3B79-D217-F11A-406F-F11D856493F9} = {5812E712-6213-4372-B095-9EB9BAA1F2DF}
|
||||
{A9AC9CF5-8E6C-0BA2-0769-6E42EDB88E25} = {5812E712-6213-4372-B095-9EB9BAA1F2DF}
|
||||
{CD478F02-7550-58A5-E085-CE4BC0C0AD23} = {5812E712-6213-4372-B095-9EB9BAA1F2DF}
|
||||
{C051C502-820F-2983-EF97-144C0CD92905} = {5812E712-6213-4372-B095-9EB9BAA1F2DF}
|
||||
{22B14659-C5B6-B775-868D-A49198FEAD4A} = {5812E712-6213-4372-B095-9EB9BAA1F2DF}
|
||||
{FAF0CB93-F7CE-A6B8-8342-19CE99BAF774} = {5812E712-6213-4372-B095-9EB9BAA1F2DF}
|
||||
{46333DC3-B4A5-3DCC-E8BF-A3F20ADC56D2} = {5812E712-6213-4372-B095-9EB9BAA1F2DF}
|
||||
|
|
@ -304,5 +523,8 @@ Global
|
|||
{AFF2C68B-B867-DD50-6AC5-74B09D41F8EA} = {5812E712-6213-4372-B095-9EB9BAA1F2DF}
|
||||
{6FDC76D5-CB44-B9F8-5EF6-C59B020719DF} = {5812E712-6213-4372-B095-9EB9BAA1F2DF}
|
||||
{8BECCA95-C7D7-CFF8-FDB1-4950E9F8E8E6} = {5812E712-6213-4372-B095-9EB9BAA1F2DF}
|
||||
{87B42A9C-3F5C-53D7-9017-2B1CAE39457D} = {5812E712-6213-4372-B095-9EB9BAA1F2DF}
|
||||
{23E1C437-A951-5943-8639-A17F3CF2E606} = {5812E712-6213-4372-B095-9EB9BAA1F2DF}
|
||||
{74827EBD-93DC-5110-BA95-3F2AB029B6B0} = {5812E712-6213-4372-B095-9EB9BAA1F2DF}
|
||||
EndGlobalSection
|
||||
EndGlobal
|
||||
|
|
|
|||
|
|
@ -142,7 +142,7 @@ void CPUThread::SetBranch(const u64 pc, bool record_branch)
|
|||
{
|
||||
if(!Memory.IsGoodAddr(m_offset + pc))
|
||||
{
|
||||
ConLog.Error("%s branch error: bad address 0x%llx #pc: 0x%llx", GetFName().mb_str(), m_offset + pc, m_offset + PC);
|
||||
ConLog.Error("%s branch error: bad address 0x%llx #pc: 0x%llx", GetFName().wx_str(), m_offset + pc, m_offset + PC);
|
||||
Emu.Pause();
|
||||
}
|
||||
|
||||
|
|
@ -294,7 +294,7 @@ void CPUThread::ExecOnce()
|
|||
|
||||
void CPUThread::Task()
|
||||
{
|
||||
ConLog.Write("%s enter", CPUThread::GetFName());
|
||||
ConLog.Write("%s enter", CPUThread::GetFName().wx_str());
|
||||
|
||||
const Array<u64>& bp = Emu.GetBreakPoints();
|
||||
|
||||
|
|
@ -345,7 +345,7 @@ void CPUThread::Task()
|
|||
}
|
||||
catch(const wxString& e)
|
||||
{
|
||||
ConLog.Error("Exception: %s", e.mb_str());
|
||||
ConLog.Error("Exception: %s", e.wx_str());
|
||||
}
|
||||
catch(const char* e)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -91,9 +91,9 @@ public:
|
|||
{
|
||||
return
|
||||
wxString::Format("%s[%d] Thread%s",
|
||||
GetTypeString().mb_str(),
|
||||
GetTypeString().wx_str(),
|
||||
m_id,
|
||||
(GetName().empty() ? "" : std::string(" (" + GetName() + ")").c_str())
|
||||
wxString(GetName().empty() ? "" : std::string(" (" + GetName() + ")")).wx_str()
|
||||
);
|
||||
}
|
||||
|
||||
|
|
@ -114,7 +114,8 @@ public:
|
|||
|
||||
virtual std::string GetThreadName() const
|
||||
{
|
||||
return (GetFName() + wxString::Format("[0x%08llx]", PC)).mb_str();
|
||||
wxString temp = (GetFName() + wxString::Format("[0x%08llx]", PC));
|
||||
return std::string(temp.mb_str());
|
||||
}
|
||||
|
||||
public:
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ CPUThread& CPUThreadManager::AddThread(CPUThreadType type)
|
|||
default: assert(0);
|
||||
}
|
||||
|
||||
new_thread->SetId(Emu.GetIdManager().GetNewID(wxString::Format("%s Thread", new_thread->GetTypeString().mb_str()).mb_str(), new_thread));
|
||||
new_thread->SetId(Emu.GetIdManager().GetNewID(wxString::Format("%s Thread", new_thread->GetTypeString().wx_str()).ToStdString(), new_thread));
|
||||
|
||||
m_threads.Add(new_thread);
|
||||
#ifndef QT_UI
|
||||
|
|
|
|||
|
|
@ -15,39 +15,39 @@ protected:
|
|||
|
||||
void DisAsm_V4(const wxString& op, u32 v0, u32 v1, u32 v2, u32 v3)
|
||||
{
|
||||
Write(wxString::Format("%s v%d,v%d,v%d,v%d", FixOp(op).mb_str(), v0, v1, v2, v3));
|
||||
Write(wxString::Format("%s v%d,v%d,v%d,v%d", FixOp(op).wx_str(), v0, v1, v2, v3));
|
||||
}
|
||||
void DisAsm_V3_UIMM(const wxString& op, u32 v0, u32 v1, u32 v2, u32 uimm)
|
||||
{
|
||||
Write(wxString::Format("%s v%d,v%d,v%d,%u #%x", FixOp(op).mb_str(), v0, v1, v2, uimm, uimm));
|
||||
Write(wxString::Format("%s v%d,v%d,v%d,%u #%x", FixOp(op).wx_str(), v0, v1, v2, uimm, uimm));
|
||||
}
|
||||
void DisAsm_V3(const wxString& op, u32 v0, u32 v1, u32 v2)
|
||||
{
|
||||
Write(wxString::Format("%s v%d,v%d,v%d", FixOp(op).mb_str(), v0, v1, v2));
|
||||
Write(wxString::Format("%s v%d,v%d,v%d", FixOp(op).wx_str(), v0, v1, v2));
|
||||
}
|
||||
void DisAsm_V2_UIMM(const wxString& op, u32 v0, u32 v1, u32 uimm)
|
||||
{
|
||||
Write(wxString::Format("%s v%d,v%d,%u #%x", FixOp(op).mb_str(), v0, v1, uimm, uimm));
|
||||
Write(wxString::Format("%s v%d,v%d,%u #%x", FixOp(op).wx_str(), v0, v1, uimm, uimm));
|
||||
}
|
||||
void DisAsm_V2(const wxString& op, u32 v0, u32 v1)
|
||||
{
|
||||
Write(wxString::Format("%s v%d,v%d", FixOp(op).mb_str(), v0, v1));
|
||||
Write(wxString::Format("%s v%d,v%d", FixOp(op).wx_str(), v0, v1));
|
||||
}
|
||||
void DisAsm_V1_SIMM(const wxString& op, u32 v0, s32 simm)
|
||||
{
|
||||
Write(wxString::Format("%s v%d,%d #%x", FixOp(op).mb_str(), v0, simm, simm));
|
||||
Write(wxString::Format("%s v%d,%d #%x", FixOp(op).wx_str(), v0, simm, simm));
|
||||
}
|
||||
void DisAsm_V1(const wxString& op, u32 v0)
|
||||
{
|
||||
Write(wxString::Format("%s v%d", FixOp(op).mb_str(), v0));
|
||||
Write(wxString::Format("%s v%d", FixOp(op).wx_str(), v0));
|
||||
}
|
||||
void DisAsm_V1_R2(const wxString& op, u32 v0, u32 r1, u32 r2)
|
||||
{
|
||||
Write(wxString::Format("%s v%d,r%d,r%d", FixOp(op).mb_str(), v0, r1, r2));
|
||||
Write(wxString::Format("%s v%d,r%d,r%d", FixOp(op).wx_str(), v0, r1, r2));
|
||||
}
|
||||
void DisAsm_CR1_F2_RC(const wxString& op, u32 cr0, u32 f0, u32 f1, bool rc)
|
||||
{
|
||||
Write(wxString::Format("%s%s cr%d,f%d,f%d", FixOp(op).mb_str(), rc ? "." : "", cr0, f0, f1));
|
||||
Write(wxString::Format("%s%s cr%d,f%d,f%d", FixOp(op).wx_str(), rc ? "." : "", cr0, f0, f1));
|
||||
}
|
||||
void DisAsm_CR1_F2(const wxString& op, u32 cr0, u32 f0, u32 f1)
|
||||
{
|
||||
|
|
@ -55,15 +55,15 @@ protected:
|
|||
}
|
||||
void DisAsm_INT1_R2(const wxString& op, u32 i0, u32 r0, u32 r1)
|
||||
{
|
||||
Write(wxString::Format("%s %d,r%d,r%d", FixOp(op).mb_str(), i0, r0, r1));
|
||||
Write(wxString::Format("%s %d,r%d,r%d", FixOp(op).wx_str(), i0, r0, r1));
|
||||
}
|
||||
void DisAsm_INT1_R1_IMM(const wxString& op, u32 i0, u32 r0, s32 imm0)
|
||||
{
|
||||
Write(wxString::Format("%s %d,r%d,%d #%x", FixOp(op).mb_str(), i0, r0, imm0, imm0));
|
||||
Write(wxString::Format("%s %d,r%d,%d #%x", FixOp(op).wx_str(), i0, r0, imm0, imm0));
|
||||
}
|
||||
void DisAsm_INT1_R1_RC(const wxString& op, u32 i0, u32 r0, bool rc)
|
||||
{
|
||||
Write(wxString::Format("%s%s %d,r%d", FixOp(op).mb_str(), rc ? "." : "", i0, r0));
|
||||
Write(wxString::Format("%s%s %d,r%d", FixOp(op).wx_str(), rc ? "." : "", i0, r0));
|
||||
}
|
||||
void DisAsm_INT1_R1(const wxString& op, u32 i0, u32 r0)
|
||||
{
|
||||
|
|
@ -71,11 +71,11 @@ protected:
|
|||
}
|
||||
void DisAsm_F4_RC(const wxString& op, u32 f0, u32 f1, u32 f2, u32 f3, bool rc)
|
||||
{
|
||||
Write(wxString::Format("%s%s f%d,f%d,f%d,f%d", FixOp(op).mb_str(), rc ? "." : "", f0, f1, f2, f3));
|
||||
Write(wxString::Format("%s%s f%d,f%d,f%d,f%d", FixOp(op).wx_str(), rc ? "." : "", f0, f1, f2, f3));
|
||||
}
|
||||
void DisAsm_F3_RC(const wxString& op, u32 f0, u32 f1, u32 f2, bool rc)
|
||||
{
|
||||
Write(wxString::Format("%s%s f%d,f%d,f%d", FixOp(op).mb_str(), rc ? "." : "", f0, f1, f2));
|
||||
Write(wxString::Format("%s%s f%d,f%d,f%d", FixOp(op).wx_str(), rc ? "." : "", f0, f1, f2));
|
||||
}
|
||||
void DisAsm_F3(const wxString& op, u32 f0, u32 f1, u32 f2)
|
||||
{
|
||||
|
|
@ -83,7 +83,7 @@ protected:
|
|||
}
|
||||
void DisAsm_F2_RC(const wxString& op, u32 f0, u32 f1, bool rc)
|
||||
{
|
||||
Write(wxString::Format("%s%s f%d,f%d", FixOp(op).mb_str(), rc ? "." : "", f0, f1));
|
||||
Write(wxString::Format("%s%s f%d,f%d", FixOp(op).wx_str(), rc ? "." : "", f0, f1));
|
||||
}
|
||||
void DisAsm_F2(const wxString& op, u32 f0, u32 f1)
|
||||
{
|
||||
|
|
@ -93,21 +93,21 @@ protected:
|
|||
{
|
||||
if(m_mode == CPUDisAsm_CompilerElfMode)
|
||||
{
|
||||
Write(wxString::Format("%s f%d,r%d,r%d", FixOp(op).mb_str(), f0, r0, r1));
|
||||
Write(wxString::Format("%s f%d,r%d,r%d", FixOp(op).wx_str(), f0, r0, r1));
|
||||
return;
|
||||
}
|
||||
|
||||
Write(wxString::Format("%s f%d,r%d(r%d)", FixOp(op).mb_str(), f0, r0, r1));
|
||||
Write(wxString::Format("%s f%d,r%d(r%d)", FixOp(op).wx_str(), f0, r0, r1));
|
||||
}
|
||||
void DisAsm_F1_IMM_R1_RC(const wxString& op, u32 f0, s32 imm0, u32 r0, bool rc)
|
||||
{
|
||||
if(m_mode == CPUDisAsm_CompilerElfMode)
|
||||
{
|
||||
Write(wxString::Format("%s%s f%d,r%d,%d #%x", FixOp(op).mb_str(), rc ? "." : "", f0, r0, imm0, imm0));
|
||||
Write(wxString::Format("%s%s f%d,r%d,%d #%x", FixOp(op).wx_str(), rc ? "." : "", f0, r0, imm0, imm0));
|
||||
return;
|
||||
}
|
||||
|
||||
Write(wxString::Format("%s%s f%d,%d(r%d) #%x", FixOp(op).mb_str(), rc ? "." : "", f0, imm0, r0, imm0));
|
||||
Write(wxString::Format("%s%s f%d,%d(r%d) #%x", FixOp(op).wx_str(), rc ? "." : "", f0, imm0, r0, imm0));
|
||||
}
|
||||
void DisAsm_F1_IMM_R1(const wxString& op, u32 f0, s32 imm0, u32 r0)
|
||||
{
|
||||
|
|
@ -115,11 +115,11 @@ protected:
|
|||
}
|
||||
void DisAsm_F1_RC(const wxString& op, u32 f0, bool rc)
|
||||
{
|
||||
Write(wxString::Format("%s%s f%d", FixOp(op).mb_str(), rc ? "." : "", f0));
|
||||
Write(wxString::Format("%s%s f%d", FixOp(op).wx_str(), rc ? "." : "", f0));
|
||||
}
|
||||
void DisAsm_R1_RC(const wxString& op, u32 r0, bool rc)
|
||||
{
|
||||
Write(wxString::Format("%s%s r%d", FixOp(op).mb_str(), rc ? "." : "", r0));
|
||||
Write(wxString::Format("%s%s r%d", FixOp(op).wx_str(), rc ? "." : "", r0));
|
||||
}
|
||||
void DisAsm_R1(const wxString& op, u32 r0)
|
||||
{
|
||||
|
|
@ -127,7 +127,7 @@ protected:
|
|||
}
|
||||
void DisAsm_R2_OE_RC(const wxString& op, u32 r0, u32 r1, u32 oe, bool rc)
|
||||
{
|
||||
Write(wxString::Format("%s%s%s r%d,r%d", FixOp(op).mb_str(), oe ? "o" : "", rc ? "." : "", r0, r1));
|
||||
Write(wxString::Format("%s%s%s r%d,r%d", FixOp(op).wx_str(), oe ? "o" : "", rc ? "." : "", r0, r1));
|
||||
}
|
||||
void DisAsm_R2_RC(const wxString& op, u32 r0, u32 r1, bool rc)
|
||||
{
|
||||
|
|
@ -139,11 +139,11 @@ protected:
|
|||
}
|
||||
void DisAsm_R3_OE_RC(const wxString& op, u32 r0, u32 r1, u32 r2, u32 oe, bool rc)
|
||||
{
|
||||
Write(wxString::Format("%s%s%s r%d,r%d,r%d", FixOp(op).mb_str(), oe ? "o" : "", rc ? "." : "", r0, r1, r2));
|
||||
Write(wxString::Format("%s%s%s r%d,r%d,r%d", FixOp(op).wx_str(), oe ? "o" : "", rc ? "." : "", r0, r1, r2));
|
||||
}
|
||||
void DisAsm_R3_INT2_RC(const wxString& op, u32 r0, u32 r1, u32 r2, s32 i0, s32 i1, bool rc)
|
||||
{
|
||||
Write(wxString::Format("%s%s r%d,r%d,r%d,%d,%d", FixOp(op).mb_str(), rc ? "." : "", r0, r1, r2, i0, i1));
|
||||
Write(wxString::Format("%s%s r%d,r%d,r%d,%d,%d", FixOp(op).wx_str(), rc ? "." : "", r0, r1, r2, i0, i1));
|
||||
}
|
||||
void DisAsm_R3_RC(const wxString& op, u32 r0, u32 r1, u32 r2, bool rc)
|
||||
{
|
||||
|
|
@ -155,7 +155,7 @@ protected:
|
|||
}
|
||||
void DisAsm_R2_INT3_RC(const wxString& op, u32 r0, u32 r1, s32 i0, s32 i1, s32 i2, bool rc)
|
||||
{
|
||||
Write(wxString::Format("%s%s r%d,r%d,%d,%d,%d", FixOp(op).mb_str(), rc ? "." : "", r0, r1, i0, i1, i2));
|
||||
Write(wxString::Format("%s%s r%d,r%d,%d,%d,%d", FixOp(op).wx_str(), rc ? "." : "", r0, r1, i0, i1, i2));
|
||||
}
|
||||
void DisAsm_R2_INT3(const wxString& op, u32 r0, u32 r1, s32 i0, s32 i1, s32 i2)
|
||||
{
|
||||
|
|
@ -163,7 +163,7 @@ protected:
|
|||
}
|
||||
void DisAsm_R2_INT2_RC(const wxString& op, u32 r0, u32 r1, s32 i0, s32 i1, bool rc)
|
||||
{
|
||||
Write(wxString::Format("%s%s r%d,r%d,%d,%d", FixOp(op).mb_str(), rc ? "." : "", r0, r1, i0, i1));
|
||||
Write(wxString::Format("%s%s r%d,r%d,%d,%d", FixOp(op).wx_str(), rc ? "." : "", r0, r1, i0, i1));
|
||||
}
|
||||
void DisAsm_R2_INT2(const wxString& op, u32 r0, u32 r1, s32 i0, s32 i1)
|
||||
{
|
||||
|
|
@ -171,7 +171,7 @@ protected:
|
|||
}
|
||||
void DisAsm_R2_INT1_RC(const wxString& op, u32 r0, u32 r1, s32 i0, bool rc)
|
||||
{
|
||||
Write(wxString::Format("%s%s r%d,r%d,%d", FixOp(op).mb_str(), rc ? "." : "", r0, r1, i0));
|
||||
Write(wxString::Format("%s%s r%d,r%d,%d", FixOp(op).wx_str(), rc ? "." : "", r0, r1, i0));
|
||||
}
|
||||
void DisAsm_R2_INT1(const wxString& op, u32 r0, u32 r1, s32 i0)
|
||||
{
|
||||
|
|
@ -181,27 +181,27 @@ protected:
|
|||
{
|
||||
if(m_mode == CPUDisAsm_CompilerElfMode)
|
||||
{
|
||||
Write(wxString::Format("%s r%d,r%d,%d #%x", FixOp(op).mb_str(), r0, r1, imm0, imm0));
|
||||
Write(wxString::Format("%s r%d,r%d,%d #%x", FixOp(op).wx_str(), r0, r1, imm0, imm0));
|
||||
return;
|
||||
}
|
||||
|
||||
Write(wxString::Format("%s r%d,%d(r%d) #%x", FixOp(op).mb_str(), r0, imm0, r1, imm0));
|
||||
Write(wxString::Format("%s r%d,%d(r%d) #%x", FixOp(op).wx_str(), r0, imm0, r1, imm0));
|
||||
}
|
||||
void DisAsm_R1_IMM(const wxString& op, u32 r0, s32 imm0)
|
||||
{
|
||||
Write(wxString::Format("%s r%d,%d #%x", FixOp(op).mb_str(), r0, imm0, imm0));
|
||||
Write(wxString::Format("%s r%d,%d #%x", FixOp(op).wx_str(), r0, imm0, imm0));
|
||||
}
|
||||
void DisAsm_IMM_R1(const wxString& op, s32 imm0, u32 r0)
|
||||
{
|
||||
Write(wxString::Format("%s %d,r%d #%x", FixOp(op).mb_str(), imm0, r0, imm0));
|
||||
Write(wxString::Format("%s %d,r%d #%x", FixOp(op).wx_str(), imm0, r0, imm0));
|
||||
}
|
||||
void DisAsm_CR1_R1_IMM(const wxString& op, u32 cr0, u32 r0, s32 imm0)
|
||||
{
|
||||
Write(wxString::Format("%s cr%d,r%d,%d #%x", FixOp(op).mb_str(), cr0, r0, imm0, imm0));
|
||||
Write(wxString::Format("%s cr%d,r%d,%d #%x", FixOp(op).wx_str(), cr0, r0, imm0, imm0));
|
||||
}
|
||||
void DisAsm_CR1_R2_RC(const wxString& op, u32 cr0, u32 r0, u32 r1, bool rc)
|
||||
{
|
||||
Write(wxString::Format("%s%s cr%d,r%d,r%d", FixOp(op).mb_str(), rc ? "." : "", cr0, r0, r1));
|
||||
Write(wxString::Format("%s%s cr%d,r%d,r%d", FixOp(op).wx_str(), rc ? "." : "", cr0, r0, r1));
|
||||
}
|
||||
void DisAsm_CR1_R2(const wxString& op, u32 cr0, u32 r0, u32 r1)
|
||||
{
|
||||
|
|
@ -209,30 +209,30 @@ protected:
|
|||
}
|
||||
void DisAsm_CR2(const wxString& op, u32 cr0, u32 cr1)
|
||||
{
|
||||
Write(wxString::Format("%s cr%d,cr%d", FixOp(op).mb_str(), cr0, cr1));
|
||||
Write(wxString::Format("%s cr%d,cr%d", FixOp(op).wx_str(), cr0, cr1));
|
||||
}
|
||||
void DisAsm_INT3(const wxString& op, const int i0, const int i1, const int i2)
|
||||
{
|
||||
Write(wxString::Format("%s %d,%d,%d", FixOp(op).mb_str(), i0, i1, i2));
|
||||
Write(wxString::Format("%s %d,%d,%d", FixOp(op).wx_str(), i0, i1, i2));
|
||||
}
|
||||
void DisAsm_INT1(const wxString& op, const int i0)
|
||||
{
|
||||
Write(wxString::Format("%s %d", FixOp(op).mb_str(), i0));
|
||||
Write(wxString::Format("%s %d", FixOp(op).wx_str(), i0));
|
||||
}
|
||||
void DisAsm_BRANCH(const wxString& op, const int pc)
|
||||
{
|
||||
Write(wxString::Format("%s 0x%x", FixOp(op).mb_str(), DisAsmBranchTarget(pc)));
|
||||
Write(wxString::Format("%s 0x%x", FixOp(op).wx_str(), DisAsmBranchTarget(pc)));
|
||||
}
|
||||
void DisAsm_BRANCH_A(const wxString& op, const int pc)
|
||||
{
|
||||
Write(wxString::Format("%s 0x%x", FixOp(op).mb_str(), pc));
|
||||
Write(wxString::Format("%s 0x%x", FixOp(op).wx_str(), pc));
|
||||
}
|
||||
void DisAsm_B2_BRANCH(const wxString& op, u32 b0, u32 b1, const int pc)
|
||||
{
|
||||
Write(wxString::Format("%s %d,%d,0x%x ", FixOp(op).mb_str(), b0, b1, DisAsmBranchTarget(pc)));
|
||||
Write(wxString::Format("%s %d,%d,0x%x ", FixOp(op).wx_str(), b0, b1, DisAsmBranchTarget(pc)));
|
||||
}
|
||||
void DisAsm_CR_BRANCH(const wxString& op, u32 cr, const int pc)
|
||||
{
|
||||
Write(wxString::Format("%s cr%d,0x%x ", FixOp(op).mb_str(), cr, DisAsmBranchTarget(pc)));
|
||||
Write(wxString::Format("%s cr%d,0x%x ", FixOp(op).wx_str(), cr, DisAsmBranchTarget(pc)));
|
||||
}
|
||||
};
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ public:
|
|||
|
||||
virtual std::string GetThreadName() const
|
||||
{
|
||||
return (GetFName() + wxString::Format("[0x%08llx]", PC)).mb_str();
|
||||
return (GetFName() + wxString::Format("[0x%08llx]", PC)).ToStdString();
|
||||
}
|
||||
|
||||
protected:
|
||||
|
|
|
|||
|
|
@ -24,39 +24,39 @@ private:
|
|||
private:
|
||||
void DisAsm_V4(const wxString& op, u32 v0, u32 v1, u32 v2, u32 v3)
|
||||
{
|
||||
Write(wxString::Format("%s v%d,v%d,v%d,v%d", FixOp(op).mb_str(), v0, v1, v2, v3));
|
||||
Write(wxString::Format("%s v%d,v%d,v%d,v%d", FixOp(op).wx_str(), v0, v1, v2, v3));
|
||||
}
|
||||
void DisAsm_V3_UIMM(const wxString& op, u32 v0, u32 v1, u32 v2, u32 uimm)
|
||||
{
|
||||
Write(wxString::Format("%s v%d,v%d,v%d,%u #%x", FixOp(op).mb_str(), v0, v1, v2, uimm, uimm));
|
||||
Write(wxString::Format("%s v%d,v%d,v%d,%u #%x", FixOp(op).wx_str(), v0, v1, v2, uimm, uimm));
|
||||
}
|
||||
void DisAsm_V3(const wxString& op, u32 v0, u32 v1, u32 v2)
|
||||
{
|
||||
Write(wxString::Format("%s v%d,v%d,v%d", FixOp(op).mb_str(), v0, v1, v2));
|
||||
Write(wxString::Format("%s v%d,v%d,v%d", FixOp(op).wx_str(), v0, v1, v2));
|
||||
}
|
||||
void DisAsm_V2_UIMM(const wxString& op, u32 v0, u32 v1, u32 uimm)
|
||||
{
|
||||
Write(wxString::Format("%s v%d,v%d,%u #%x", FixOp(op).mb_str(), v0, v1, uimm, uimm));
|
||||
Write(wxString::Format("%s v%d,v%d,%u #%x", FixOp(op).wx_str(), v0, v1, uimm, uimm));
|
||||
}
|
||||
void DisAsm_V2(const wxString& op, u32 v0, u32 v1)
|
||||
{
|
||||
Write(wxString::Format("%s v%d,v%d", FixOp(op).mb_str(), v0, v1));
|
||||
Write(wxString::Format("%s v%d,v%d", FixOp(op).wx_str(), v0, v1));
|
||||
}
|
||||
void DisAsm_V1_SIMM(const wxString& op, u32 v0, s32 simm)
|
||||
{
|
||||
Write(wxString::Format("%s v%d,%d #%x", FixOp(op).mb_str(), v0, simm, simm));
|
||||
Write(wxString::Format("%s v%d,%d #%x", FixOp(op).wx_str(), v0, simm, simm));
|
||||
}
|
||||
void DisAsm_V1(const wxString& op, u32 v0)
|
||||
{
|
||||
Write(wxString::Format("%s v%d", FixOp(op).mb_str(), v0));
|
||||
Write(wxString::Format("%s v%d", FixOp(op).wx_str(), v0));
|
||||
}
|
||||
void DisAsm_V1_R2(const wxString& op, u32 v0, u32 r1, u32 r2)
|
||||
{
|
||||
Write(wxString::Format("%s v%d,r%d,r%d", FixOp(op).mb_str(), v0, r1, r2));
|
||||
Write(wxString::Format("%s v%d,r%d,r%d", FixOp(op).wx_str(), v0, r1, r2));
|
||||
}
|
||||
void DisAsm_CR1_F2_RC(const wxString& op, u32 cr0, u32 f0, u32 f1, bool rc)
|
||||
{
|
||||
Write(wxString::Format("%s%s cr%d,f%d,f%d", FixOp(op).mb_str(), rc ? "." : "", cr0, f0, f1));
|
||||
Write(wxString::Format("%s%s cr%d,f%d,f%d", FixOp(op).wx_str(), rc ? "." : "", cr0, f0, f1));
|
||||
}
|
||||
void DisAsm_CR1_F2(const wxString& op, u32 cr0, u32 f0, u32 f1)
|
||||
{
|
||||
|
|
@ -64,15 +64,15 @@ private:
|
|||
}
|
||||
void DisAsm_INT1_R2(const wxString& op, u32 i0, u32 r0, u32 r1)
|
||||
{
|
||||
Write(wxString::Format("%s %d,r%d,r%d", FixOp(op).mb_str(), i0, r0, r1));
|
||||
Write(wxString::Format("%s %d,r%d,r%d", FixOp(op).wx_str(), i0, r0, r1));
|
||||
}
|
||||
void DisAsm_INT1_R1_IMM(const wxString& op, u32 i0, u32 r0, s32 imm0)
|
||||
{
|
||||
Write(wxString::Format("%s %d,r%d,%d #%x", FixOp(op).mb_str(), i0, r0, imm0, imm0));
|
||||
Write(wxString::Format("%s %d,r%d,%d #%x", FixOp(op).wx_str(), i0, r0, imm0, imm0));
|
||||
}
|
||||
void DisAsm_INT1_R1_RC(const wxString& op, u32 i0, u32 r0, bool rc)
|
||||
{
|
||||
Write(wxString::Format("%s%s %d,r%d", FixOp(op).mb_str(), rc ? "." : "", i0, r0));
|
||||
Write(wxString::Format("%s%s %d,r%d", FixOp(op).wx_str(), rc ? "." : "", i0, r0));
|
||||
}
|
||||
void DisAsm_INT1_R1(const wxString& op, u32 i0, u32 r0)
|
||||
{
|
||||
|
|
@ -80,11 +80,11 @@ private:
|
|||
}
|
||||
void DisAsm_F4_RC(const wxString& op, u32 f0, u32 f1, u32 f2, u32 f3, bool rc)
|
||||
{
|
||||
Write(wxString::Format("%s%s f%d,f%d,f%d,f%d", FixOp(op).mb_str(), rc ? "." : "", f0, f1, f2, f3));
|
||||
Write(wxString::Format("%s%s f%d,f%d,f%d,f%d", FixOp(op).wx_str(), rc ? "." : "", f0, f1, f2, f3));
|
||||
}
|
||||
void DisAsm_F3_RC(const wxString& op, u32 f0, u32 f1, u32 f2, bool rc)
|
||||
{
|
||||
Write(wxString::Format("%s%s f%d,f%d,f%d", FixOp(op).mb_str(), rc ? "." : "", f0, f1, f2));
|
||||
Write(wxString::Format("%s%s f%d,f%d,f%d", FixOp(op).wx_str(), rc ? "." : "", f0, f1, f2));
|
||||
}
|
||||
void DisAsm_F3(const wxString& op, u32 f0, u32 f1, u32 f2)
|
||||
{
|
||||
|
|
@ -92,7 +92,7 @@ private:
|
|||
}
|
||||
void DisAsm_F2_RC(const wxString& op, u32 f0, u32 f1, bool rc)
|
||||
{
|
||||
Write(wxString::Format("%s%s f%d,f%d", FixOp(op).mb_str(), rc ? "." : "", f0, f1));
|
||||
Write(wxString::Format("%s%s f%d,f%d", FixOp(op).wx_str(), rc ? "." : "", f0, f1));
|
||||
}
|
||||
void DisAsm_F2(const wxString& op, u32 f0, u32 f1)
|
||||
{
|
||||
|
|
@ -102,21 +102,21 @@ private:
|
|||
{
|
||||
if(m_mode == CPUDisAsm_CompilerElfMode)
|
||||
{
|
||||
Write(wxString::Format("%s f%d,r%d,r%d", FixOp(op).mb_str(), f0, r0, r1));
|
||||
Write(wxString::Format("%s f%d,r%d,r%d", FixOp(op).wx_str(), f0, r0, r1));
|
||||
return;
|
||||
}
|
||||
|
||||
Write(wxString::Format("%s f%d,r%d(r%d)", FixOp(op).mb_str(), f0, r0, r1));
|
||||
Write(wxString::Format("%s f%d,r%d(r%d)", FixOp(op).wx_str(), f0, r0, r1));
|
||||
}
|
||||
void DisAsm_F1_IMM_R1_RC(const wxString& op, u32 f0, s32 imm0, u32 r0, bool rc)
|
||||
{
|
||||
if(m_mode == CPUDisAsm_CompilerElfMode)
|
||||
{
|
||||
Write(wxString::Format("%s%s f%d,r%d,%d #%x", FixOp(op).mb_str(), rc ? "." : "", f0, r0, imm0, imm0));
|
||||
Write(wxString::Format("%s%s f%d,r%d,%d #%x", FixOp(op).wx_str(), rc ? "." : "", f0, r0, imm0, imm0));
|
||||
return;
|
||||
}
|
||||
|
||||
Write(wxString::Format("%s%s f%d,%d(r%d) #%x", FixOp(op).mb_str(), rc ? "." : "", f0, imm0, r0, imm0));
|
||||
Write(wxString::Format("%s%s f%d,%d(r%d) #%x", FixOp(op).wx_str(), rc ? "." : "", f0, imm0, r0, imm0));
|
||||
}
|
||||
void DisAsm_F1_IMM_R1(const wxString& op, u32 f0, s32 imm0, u32 r0)
|
||||
{
|
||||
|
|
@ -124,11 +124,11 @@ private:
|
|||
}
|
||||
void DisAsm_F1_RC(const wxString& op, u32 f0, bool rc)
|
||||
{
|
||||
Write(wxString::Format("%s%s f%d", FixOp(op).mb_str(), rc ? "." : "", f0));
|
||||
Write(wxString::Format("%s%s f%d", FixOp(op).wx_str(), rc ? "." : "", f0));
|
||||
}
|
||||
void DisAsm_R1_RC(const wxString& op, u32 r0, bool rc)
|
||||
{
|
||||
Write(wxString::Format("%s%s r%d", FixOp(op).mb_str(), rc ? "." : "", r0));
|
||||
Write(wxString::Format("%s%s r%d", FixOp(op).wx_str(), rc ? "." : "", r0));
|
||||
}
|
||||
void DisAsm_R1(const wxString& op, u32 r0)
|
||||
{
|
||||
|
|
@ -136,7 +136,7 @@ private:
|
|||
}
|
||||
void DisAsm_R2_OE_RC(const wxString& op, u32 r0, u32 r1, u32 oe, bool rc)
|
||||
{
|
||||
Write(wxString::Format("%s%s%s r%d,r%d", FixOp(op).mb_str(), oe ? "o" : "", rc ? "." : "", r0, r1));
|
||||
Write(wxString::Format("%s%s%s r%d,r%d", FixOp(op).wx_str(), oe ? "o" : "", rc ? "." : "", r0, r1));
|
||||
}
|
||||
void DisAsm_R2_RC(const wxString& op, u32 r0, u32 r1, bool rc)
|
||||
{
|
||||
|
|
@ -148,11 +148,11 @@ private:
|
|||
}
|
||||
void DisAsm_R3_OE_RC(const wxString& op, u32 r0, u32 r1, u32 r2, u32 oe, bool rc)
|
||||
{
|
||||
Write(wxString::Format("%s%s%s r%d,r%d,r%d", FixOp(op).mb_str(), oe ? "o" : "", rc ? "." : "", r0, r1, r2));
|
||||
Write(wxString::Format("%s%s%s r%d,r%d,r%d", FixOp(op).wx_str(), oe ? "o" : "", rc ? "." : "", r0, r1, r2));
|
||||
}
|
||||
void DisAsm_R3_INT2_RC(const wxString& op, u32 r0, u32 r1, u32 r2, s32 i0, s32 i1, bool rc)
|
||||
{
|
||||
Write(wxString::Format("%s%s r%d,r%d,r%d,%d,%d", FixOp(op).mb_str(), rc ? "." : "", r0, r1, r2, i0, i1));
|
||||
Write(wxString::Format("%s%s r%d,r%d,r%d,%d,%d", FixOp(op).wx_str(), rc ? "." : "", r0, r1, r2, i0, i1));
|
||||
}
|
||||
void DisAsm_R3_RC(const wxString& op, u32 r0, u32 r1, u32 r2, bool rc)
|
||||
{
|
||||
|
|
@ -164,7 +164,7 @@ private:
|
|||
}
|
||||
void DisAsm_R2_INT3_RC(const wxString& op, u32 r0, u32 r1, s32 i0, s32 i1, s32 i2, bool rc)
|
||||
{
|
||||
Write(wxString::Format("%s%s r%d,r%d,%d,%d,%d", FixOp(op).mb_str(), rc ? "." : "", r0, r1, i0, i1, i2));
|
||||
Write(wxString::Format("%s%s r%d,r%d,%d,%d,%d", FixOp(op).wx_str(), rc ? "." : "", r0, r1, i0, i1, i2));
|
||||
}
|
||||
void DisAsm_R2_INT3(const wxString& op, u32 r0, u32 r1, s32 i0, s32 i1, s32 i2)
|
||||
{
|
||||
|
|
@ -172,7 +172,7 @@ private:
|
|||
}
|
||||
void DisAsm_R2_INT2_RC(const wxString& op, u32 r0, u32 r1, s32 i0, s32 i1, bool rc)
|
||||
{
|
||||
Write(wxString::Format("%s%s r%d,r%d,%d,%d", FixOp(op).mb_str(), rc ? "." : "", r0, r1, i0, i1));
|
||||
Write(wxString::Format("%s%s r%d,r%d,%d,%d", FixOp(op).wx_str(), rc ? "." : "", r0, r1, i0, i1));
|
||||
}
|
||||
void DisAsm_R2_INT2(const wxString& op, u32 r0, u32 r1, s32 i0, s32 i1)
|
||||
{
|
||||
|
|
@ -180,7 +180,7 @@ private:
|
|||
}
|
||||
void DisAsm_R2_INT1_RC(const wxString& op, u32 r0, u32 r1, s32 i0, bool rc)
|
||||
{
|
||||
Write(wxString::Format("%s%s r%d,r%d,%d", FixOp(op).mb_str(), rc ? "." : "", r0, r1, i0));
|
||||
Write(wxString::Format("%s%s r%d,r%d,%d", FixOp(op).wx_str(), rc ? "." : "", r0, r1, i0));
|
||||
}
|
||||
void DisAsm_R2_INT1(const wxString& op, u32 r0, u32 r1, s32 i0)
|
||||
{
|
||||
|
|
@ -190,27 +190,27 @@ private:
|
|||
{
|
||||
if(m_mode == CPUDisAsm_CompilerElfMode)
|
||||
{
|
||||
Write(wxString::Format("%s r%d,r%d,%d #%x", FixOp(op).mb_str(), r0, r1, imm0, imm0));
|
||||
Write(wxString::Format("%s r%d,r%d,%d #%x", FixOp(op).wx_str(), r0, r1, imm0, imm0));
|
||||
return;
|
||||
}
|
||||
|
||||
Write(wxString::Format("%s r%d,%d(r%d) #%x", FixOp(op).mb_str(), r0, imm0, r1, imm0));
|
||||
Write(wxString::Format("%s r%d,%d(r%d) #%x", FixOp(op).wx_str(), r0, imm0, r1, imm0));
|
||||
}
|
||||
void DisAsm_R1_IMM(const wxString& op, u32 r0, s32 imm0)
|
||||
{
|
||||
Write(wxString::Format("%s r%d,%d #%x", FixOp(op).mb_str(), r0, imm0, imm0));
|
||||
Write(wxString::Format("%s r%d,%d #%x", FixOp(op).wx_str(), r0, imm0, imm0));
|
||||
}
|
||||
void DisAsm_IMM_R1(const wxString& op, s32 imm0, u32 r0)
|
||||
{
|
||||
Write(wxString::Format("%s %d,r%d #%x", FixOp(op).mb_str(), imm0, r0, imm0));
|
||||
Write(wxString::Format("%s %d,r%d #%x", FixOp(op).wx_str(), imm0, r0, imm0));
|
||||
}
|
||||
void DisAsm_CR1_R1_IMM(const wxString& op, u32 cr0, u32 r0, s32 imm0)
|
||||
{
|
||||
Write(wxString::Format("%s cr%d,r%d,%d #%x", FixOp(op).mb_str(), cr0, r0, imm0, imm0));
|
||||
Write(wxString::Format("%s cr%d,r%d,%d #%x", FixOp(op).wx_str(), cr0, r0, imm0, imm0));
|
||||
}
|
||||
void DisAsm_CR1_R2_RC(const wxString& op, u32 cr0, u32 r0, u32 r1, bool rc)
|
||||
{
|
||||
Write(wxString::Format("%s%s cr%d,r%d,r%d", FixOp(op).mb_str(), rc ? "." : "", cr0, r0, r1));
|
||||
Write(wxString::Format("%s%s cr%d,r%d,r%d", FixOp(op).wx_str(), rc ? "." : "", cr0, r0, r1));
|
||||
}
|
||||
void DisAsm_CR1_R2(const wxString& op, u32 cr0, u32 r0, u32 r1)
|
||||
{
|
||||
|
|
@ -218,31 +218,31 @@ private:
|
|||
}
|
||||
void DisAsm_CR2(const wxString& op, u32 cr0, u32 cr1)
|
||||
{
|
||||
Write(wxString::Format("%s cr%d,cr%d", FixOp(op).mb_str(), cr0, cr1));
|
||||
Write(wxString::Format("%s cr%d,cr%d", FixOp(op).wx_str(), cr0, cr1));
|
||||
}
|
||||
void DisAsm_INT3(const wxString& op, const int i0, const int i1, const int i2)
|
||||
{
|
||||
Write(wxString::Format("%s %d,%d,%d", FixOp(op).mb_str(), i0, i1, i2));
|
||||
Write(wxString::Format("%s %d,%d,%d", FixOp(op).wx_str(), i0, i1, i2));
|
||||
}
|
||||
void DisAsm_INT1(const wxString& op, const int i0)
|
||||
{
|
||||
Write(wxString::Format("%s %d", FixOp(op).mb_str(), i0));
|
||||
Write(wxString::Format("%s %d", FixOp(op).wx_str(), i0));
|
||||
}
|
||||
void DisAsm_BRANCH(const wxString& op, const int pc)
|
||||
{
|
||||
Write(wxString::Format("%s 0x%x", FixOp(op).mb_str(), DisAsmBranchTarget(pc)));
|
||||
Write(wxString::Format("%s 0x%x", FixOp(op).wx_str(), DisAsmBranchTarget(pc)));
|
||||
}
|
||||
void DisAsm_BRANCH_A(const wxString& op, const int pc)
|
||||
{
|
||||
Write(wxString::Format("%s 0x%x", FixOp(op).mb_str(), pc));
|
||||
Write(wxString::Format("%s 0x%x", FixOp(op).wx_str(), pc));
|
||||
}
|
||||
void DisAsm_B2_BRANCH(const wxString& op, u32 b0, u32 b1, const int pc)
|
||||
{
|
||||
Write(wxString::Format("%s %d,%d,0x%x ", FixOp(op).mb_str(), b0, b1, DisAsmBranchTarget(pc)));
|
||||
Write(wxString::Format("%s %d,%d,0x%x ", FixOp(op).wx_str(), b0, b1, DisAsmBranchTarget(pc)));
|
||||
}
|
||||
void DisAsm_CR_BRANCH(const wxString& op, u32 cr, const int pc)
|
||||
{
|
||||
Write(wxString::Format("%s cr%d,0x%x ", FixOp(op).mb_str(), cr, DisAsmBranchTarget(pc)));
|
||||
Write(wxString::Format("%s cr%d,0x%x ", FixOp(op).wx_str(), cr, DisAsmBranchTarget(pc)));
|
||||
}
|
||||
|
||||
private:
|
||||
|
|
|
|||
|
|
@ -3950,7 +3950,7 @@ private:
|
|||
|
||||
for(uint i=0; i<32; ++i) ConLog.Write("r%d = 0x%llx", i, CPU.GPR[i]);
|
||||
for(uint i=0; i<32; ++i) ConLog.Write("f%d = %llf", i, CPU.FPR[i]);
|
||||
for(uint i=0; i<32; ++i) ConLog.Write("v%d = 0x%s [%s]", i, CPU.VPR[i].ToString(true).mb_str(), CPU.VPR[i].ToString().mb_str());
|
||||
for(uint i=0; i<32; ++i) ConLog.Write("v%d = 0x%s [%s]", i, CPU.VPR[i].ToString(true).wx_str(), CPU.VPR[i].ToString().wx_str());
|
||||
ConLog.Write("CR = 0x%08x", CPU.CR);
|
||||
ConLog.Write("LR = 0x%llx", CPU.LR);
|
||||
ConLog.Write("CTR = 0x%llx", CPU.CTR);
|
||||
|
|
|
|||
|
|
@ -46,13 +46,13 @@ s64 FindOp(const wxString& text, const wxString& op, s64 from)
|
|||
|
||||
for(s64 i=from; i<text.Len(); ++i)
|
||||
{
|
||||
if(i - 1 < 0 || text[i - 1] == '\n' || CompilePPUProgram::IsSkip(text[i - 1]))
|
||||
if(i - 1 < 0 || text[(size_t)i - 1] == '\n' || CompilePPUProgram::IsSkip(text[(size_t)i - 1]))
|
||||
{
|
||||
if(text.Len() - i < op.Len()) return -1;
|
||||
|
||||
if(text(i, op.Len()).Cmp(op) != 0) continue;
|
||||
if(i + op.Len() >= text.Len() || text[i + op.Len()] == '\n' ||
|
||||
CompilePPUProgram::IsSkip(text[i + op.Len()])) return i;
|
||||
if(i + op.Len() >= text.Len() || text[(size_t)i + op.Len()] == '\n' ||
|
||||
CompilePPUProgram::IsSkip(text[(size_t)i + op.Len()])) return i;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -65,7 +65,7 @@ u32 section_offs = 0;
|
|||
|
||||
SectionInfo::SectionInfo(const wxString& _name)
|
||||
{
|
||||
name = _name.c_str();
|
||||
name = _name.ToStdString();
|
||||
memset(&shdr, 0, sizeof(Elf64_Shdr));
|
||||
|
||||
section_num = sections_list.Add(this);
|
||||
|
|
@ -149,7 +149,7 @@ void CompilePPUProgram::WriteError(const wxString& error)
|
|||
{
|
||||
if(m_err_list)
|
||||
{
|
||||
m_err_list->WriteText(wxString::Format("line %lld: %s\n", m_line, error.mb_str()));
|
||||
m_err_list->WriteText(wxString::Format("line %lld: %s\n", m_line, static_cast<const char*>(error)));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -158,7 +158,7 @@ bool CompilePPUProgram::IsCommit(const char c) { return c == '#'; }
|
|||
bool CompilePPUProgram::IsEnd() const { return p >= m_asm.Len(); }
|
||||
bool CompilePPUProgram::IsEndLn(const char c) const { return c == '\n' || p - 1 >= m_asm.Len(); }
|
||||
|
||||
char CompilePPUProgram::NextChar() { return *m_asm(p++, 1); }
|
||||
char CompilePPUProgram::NextChar() { return *(const char*)m_asm(p++, 1); }
|
||||
void CompilePPUProgram::NextLn() { while( !IsEndLn(NextChar()) ); if(!IsEnd()) m_line++; }
|
||||
void CompilePPUProgram::EndLn()
|
||||
{
|
||||
|
|
@ -176,9 +176,9 @@ void CompilePPUProgram::FirstChar()
|
|||
|
||||
void CompilePPUProgram::PrevArg()
|
||||
{
|
||||
while( --p >= 0 && (IsSkip(m_asm[p]) || m_asm[p] == ','));
|
||||
while( --p >= 0 && !IsSkip(m_asm[p]) && !IsEndLn(m_asm[p]) );
|
||||
if(IsEndLn(m_asm[p])) p++;
|
||||
while( --p >= 0 && (IsSkip(m_asm[(size_t)p]) || m_asm[(size_t)p] == ','));
|
||||
while( --p >= 0 && !IsSkip(m_asm[(size_t)p]) && !IsEndLn(m_asm[(size_t)p]) );
|
||||
if(IsEndLn(m_asm[(size_t)p])) p++;
|
||||
}
|
||||
|
||||
bool CompilePPUProgram::GetOp(wxString& result)
|
||||
|
|
@ -234,12 +234,12 @@ int CompilePPUProgram::GetArg(wxString& result, bool func)
|
|||
continue;
|
||||
}
|
||||
|
||||
const bool text = m_asm[from] == '"';
|
||||
const bool text = m_asm[(size_t)from] == '"';
|
||||
const bool end_text = cur_char == '"';
|
||||
|
||||
if((text ? end_text : (skip || commit || end)) || endln)
|
||||
{
|
||||
if(text && p > 2 && m_asm[p - 2] == '\\' && (p <= 3 || m_asm[p - 3] != '\\'))
|
||||
if(text && p > 2 && m_asm[(size_t)p - 2] == '\\' && (p <= 3 || m_asm[(size_t)p - 3] != '\\'))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
|
@ -373,7 +373,7 @@ void CompilePPUProgram::DetectArgInfo(Arg& arg)
|
|||
{
|
||||
for(u32 i=0; i<m_branches.GetCount(); ++i)
|
||||
{
|
||||
if(str.mb_str() != m_branches[i].m_name)
|
||||
if(str.ToStdString() != m_branches[i].m_name)
|
||||
continue;
|
||||
|
||||
arg.type = ARG_BRANCH;
|
||||
|
|
@ -382,7 +382,7 @@ void CompilePPUProgram::DetectArgInfo(Arg& arg)
|
|||
}
|
||||
}
|
||||
|
||||
switch(str[0])
|
||||
switch((char)str[0])
|
||||
{
|
||||
case 'r': case 'f': case 'v':
|
||||
|
||||
|
|
@ -417,7 +417,7 @@ void CompilePPUProgram::DetectArgInfo(Arg& arg)
|
|||
return;
|
||||
}
|
||||
|
||||
switch(str[0])
|
||||
switch((char)str[0])
|
||||
{
|
||||
case 'r': arg.type = ARG_REG_R; break;
|
||||
case 'f': arg.type = ARG_REG_F; break;
|
||||
|
|
@ -470,7 +470,7 @@ void CompilePPUProgram::DetectArgInfo(Arg& arg)
|
|||
return;
|
||||
}
|
||||
|
||||
arg.string = str(1, str.Len() - 2).c_str();
|
||||
arg.string = str(1, str.Len() - 2).ToStdString();
|
||||
arg.type = ARG_TXT;
|
||||
return;
|
||||
}
|
||||
|
|
@ -534,7 +534,7 @@ u32 CompilePPUProgram::GetBranchValue(const wxString& branch)
|
|||
{
|
||||
for(u32 i=0; i<m_branches.GetCount(); ++i)
|
||||
{
|
||||
if(branch.mb_str() != m_branches[i].m_name)
|
||||
if(branch.ToStdString() != m_branches[i].m_name)
|
||||
continue;
|
||||
if(m_branches[i].m_pos >= 0) return m_text_addr + m_branches[i].m_pos * 4;
|
||||
|
||||
|
|
@ -667,7 +667,7 @@ CompilePPUProgram::Branch& CompilePPUProgram::GetBranch(const wxString& name)
|
|||
{
|
||||
for(u32 i=0; i<m_branches.GetCount(); ++i)
|
||||
{
|
||||
if(name.mb_str() != m_branches[i].m_name) continue;
|
||||
if(name.ToStdString() != m_branches[i].m_name) continue;
|
||||
|
||||
return m_branches[i];
|
||||
}
|
||||
|
|
@ -687,7 +687,7 @@ void CompilePPUProgram::SetSp(const wxString& name, u32 addr, bool create)
|
|||
|
||||
for(u32 i=0; i<m_branches.GetCount(); ++i)
|
||||
{
|
||||
if(name.mb_str() != m_branches[i].m_name)
|
||||
if(name.ToStdString() != m_branches[i].m_name)
|
||||
continue;
|
||||
m_branches[i].m_addr = addr;
|
||||
}
|
||||
|
|
@ -701,20 +701,20 @@ void CompilePPUProgram::LoadSp(const wxString& op, Elf64_Shdr& s_opd)
|
|||
if(!GetArg(test) || test[0] != '[')
|
||||
{
|
||||
if(m_analyze) WriteHex("error\n");
|
||||
WriteError(wxString::Format("data not found. style: %s", GetSpStyle(sp).mb_str()));
|
||||
WriteError(wxString::Format("data not found. style: %s", GetSpStyle(sp).wx_str()));
|
||||
m_error = true;
|
||||
NextLn();
|
||||
return;
|
||||
}
|
||||
|
||||
while(p > 0 && m_asm[p] != '[') p--;
|
||||
while(p > 0 && m_asm[(size_t)p] != '[') p--;
|
||||
p++;
|
||||
|
||||
wxString dst;
|
||||
if(!GetArg(dst))
|
||||
{
|
||||
if(m_analyze) WriteHex("error\n");
|
||||
WriteError(wxString::Format("dst not found. style: %s", GetSpStyle(sp).mb_str()));
|
||||
WriteError(wxString::Format("dst not found. style: %s", GetSpStyle(sp).wx_str()));
|
||||
m_error = true;
|
||||
NextLn();
|
||||
return;
|
||||
|
|
@ -745,7 +745,7 @@ void CompilePPUProgram::LoadSp(const wxString& op, Elf64_Shdr& s_opd)
|
|||
if(!dst_branch)
|
||||
{
|
||||
if(m_analyze) WriteHex("error\n");
|
||||
WriteError(wxString::Format("bad dst type. style: %s", GetSpStyle(sp).mb_str()));
|
||||
WriteError(wxString::Format("bad dst type. style: %s", GetSpStyle(sp).wx_str()));
|
||||
m_error = true;
|
||||
NextLn();
|
||||
return;
|
||||
|
|
@ -763,7 +763,7 @@ void CompilePPUProgram::LoadSp(const wxString& op, Elf64_Shdr& s_opd)
|
|||
if(!GetArg(src1, true))
|
||||
{
|
||||
if(m_analyze) WriteHex("error\n");
|
||||
WriteError(wxString::Format("src not found. style: %s", GetSpStyle(sp).mb_str()));
|
||||
WriteError(wxString::Format("src not found. style: %s", GetSpStyle(sp).wx_str()));
|
||||
m_error = true;
|
||||
NextLn();
|
||||
return;
|
||||
|
|
@ -779,16 +779,16 @@ void CompilePPUProgram::LoadSp(const wxString& op, Elf64_Shdr& s_opd)
|
|||
: ~(ARG_IMM | ARG_BRANCH) & a_src1.type)
|
||||
{
|
||||
if(m_analyze) WriteHex("error\n");
|
||||
WriteError(wxString::Format("bad src type. style: %s", GetSpStyle(sp).mb_str()));
|
||||
WriteError(wxString::Format("bad src type. style: %s", GetSpStyle(sp).wx_str()));
|
||||
m_error = true;
|
||||
NextLn();
|
||||
return;
|
||||
}
|
||||
|
||||
if(m_asm[p - 1] != ']')
|
||||
if(m_asm[(size_t)p - 1] != ']')
|
||||
{
|
||||
if(m_analyze) WriteHex("error\n");
|
||||
WriteError(wxString::Format("']' not found. style: %s", GetSpStyle(sp).mb_str()));
|
||||
WriteError(wxString::Format("']' not found. style: %s", GetSpStyle(sp).wx_str()));
|
||||
m_error = true;
|
||||
NextLn();
|
||||
return;
|
||||
|
|
@ -807,7 +807,7 @@ void CompilePPUProgram::LoadSp(const wxString& op, Elf64_Shdr& s_opd)
|
|||
|
||||
for(u32 i=0; i<m_sp_string.GetCount(); ++i)
|
||||
{
|
||||
if(src1.mb_str() != m_sp_string[i].m_data) continue;
|
||||
if(src1.ToStdString() != m_sp_string[i].m_data) continue;
|
||||
*dst_branch = Branch(dst, -1, m_sp_string[i].m_addr);
|
||||
founded = true;
|
||||
}
|
||||
|
|
@ -869,7 +869,7 @@ void CompilePPUProgram::LoadSp(const wxString& op, Elf64_Shdr& s_opd)
|
|||
if(!GetArg(src1))
|
||||
{
|
||||
if(m_analyze) WriteHex("error\n");
|
||||
WriteError(wxString::Format("src1 not found. style: %s", GetSpStyle(sp).mb_str()));
|
||||
WriteError(wxString::Format("src1 not found. style: %s", GetSpStyle(sp).wx_str()));
|
||||
m_error = true;
|
||||
NextLn();
|
||||
return;
|
||||
|
|
@ -881,7 +881,7 @@ void CompilePPUProgram::LoadSp(const wxString& op, Elf64_Shdr& s_opd)
|
|||
if(~(ARG_IMM | ARG_BRANCH) & a_src1.type)
|
||||
{
|
||||
if(m_analyze) WriteHex("error\n");
|
||||
WriteError(wxString::Format("bad src1 type. style: %s", GetSpStyle(sp).mb_str()));
|
||||
WriteError(wxString::Format("bad src1 type. style: %s", GetSpStyle(sp).wx_str()));
|
||||
m_error = true;
|
||||
NextLn();
|
||||
return;
|
||||
|
|
@ -891,7 +891,7 @@ void CompilePPUProgram::LoadSp(const wxString& op, Elf64_Shdr& s_opd)
|
|||
if(!GetArg(src2, true))
|
||||
{
|
||||
if(m_analyze) WriteHex("error\n");
|
||||
WriteError(wxString::Format("src2 not found. style: %s", GetSpStyle(sp).mb_str()));
|
||||
WriteError(wxString::Format("src2 not found. style: %s", GetSpStyle(sp).wx_str()));
|
||||
m_error = true;
|
||||
return;
|
||||
}
|
||||
|
|
@ -902,16 +902,16 @@ void CompilePPUProgram::LoadSp(const wxString& op, Elf64_Shdr& s_opd)
|
|||
if(~(ARG_IMM | ARG_BRANCH) & a_src2.type)
|
||||
{
|
||||
if(m_analyze) WriteHex("error\n");
|
||||
WriteError(wxString::Format("bad src2 type. style: %s", GetSpStyle(sp).mb_str()));
|
||||
WriteError(wxString::Format("bad src2 type. style: %s", GetSpStyle(sp).wx_str()));
|
||||
m_error = true;
|
||||
NextLn();
|
||||
return;
|
||||
}
|
||||
|
||||
if(m_asm[p - 1] != ']')
|
||||
if(m_asm[(size_t)p - 1] != ']')
|
||||
{
|
||||
if(m_analyze) WriteHex("error\n");
|
||||
WriteError(wxString::Format("']' not found. style: %s", GetSpStyle(sp).mb_str()));
|
||||
WriteError(wxString::Format("']' not found. style: %s", GetSpStyle(sp).wx_str()));
|
||||
m_error = true;
|
||||
NextLn();
|
||||
return;
|
||||
|
|
@ -1046,7 +1046,7 @@ void CompilePPUProgram::Compile()
|
|||
continue;
|
||||
}
|
||||
|
||||
while(p > 0 && m_asm[p] != '[') p--;
|
||||
while(p > 0 && m_asm[(size_t)p] != '[') p--;
|
||||
p++;
|
||||
|
||||
wxString module, name, id;
|
||||
|
|
@ -1108,7 +1108,7 @@ void CompilePPUProgram::Compile()
|
|||
continue;
|
||||
}
|
||||
|
||||
if(m_asm[p - 1] != ']')
|
||||
if(m_asm[(size_t)p - 1] != ']')
|
||||
{
|
||||
WriteError("']' not found. style: [module, name, id]");
|
||||
m_error = true;
|
||||
|
|
@ -1339,8 +1339,8 @@ void CompilePPUProgram::Compile()
|
|||
|
||||
for(u32 i=0; i<m_branches.GetCount(); ++i)
|
||||
{
|
||||
if(name.mb_str() != m_branches[i].m_name) continue;
|
||||
WriteError(wxString::Format("'%s' already declared", name.mb_str()));
|
||||
if(name.ToStdString() != m_branches[i].m_name) continue;
|
||||
WriteError(wxString::Format("'%s' already declared", name.wx_str()));
|
||||
m_error = true;
|
||||
break;
|
||||
}
|
||||
|
|
@ -1350,7 +1350,7 @@ void CompilePPUProgram::Compile()
|
|||
|
||||
if(a_name.type != ARG_ERR)
|
||||
{
|
||||
WriteError(wxString::Format("bad name '%s'", name.mb_str()));
|
||||
WriteError(wxString::Format("bad name '%s'", name.wx_str()));
|
||||
m_error = true;
|
||||
}
|
||||
|
||||
|
|
@ -1430,7 +1430,7 @@ void CompilePPUProgram::Compile()
|
|||
}
|
||||
else
|
||||
{
|
||||
WriteError(wxString::Format("unknown instruction '%s'", op.mb_str()));
|
||||
WriteError(wxString::Format("unknown instruction '%s'", op.wx_str()));
|
||||
EndLn();
|
||||
m_error = true;
|
||||
}
|
||||
|
|
@ -1469,7 +1469,7 @@ void CompilePPUProgram::Compile()
|
|||
m_branch_pos++;
|
||||
}
|
||||
|
||||
if(m_file_path && !m_analyze && !m_error)
|
||||
if(!m_file_path.IsEmpty() && !m_analyze && !m_error)
|
||||
{
|
||||
s_opd.sh_size = Memory.AlignAddr(s_opd.sh_size, s_opd.sh_addralign);
|
||||
section_offset += s_opd.sh_size;
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ struct Arg
|
|||
: value(_value)
|
||||
, type(_type)
|
||||
{
|
||||
string = _string.c_str();
|
||||
string = _string.ToStdString();
|
||||
}
|
||||
};
|
||||
|
||||
|
|
@ -72,7 +72,7 @@ class CompilePPUProgram
|
|||
, m_id(-1)
|
||||
, m_addr(-1)
|
||||
{
|
||||
m_name = name.c_str();
|
||||
m_name = name.ToStdString();
|
||||
}
|
||||
|
||||
Branch(const wxString& name, u32 id, u32 addr)
|
||||
|
|
@ -80,7 +80,7 @@ class CompilePPUProgram
|
|||
, m_id(id)
|
||||
, m_addr(addr)
|
||||
{
|
||||
m_name = name.c_str();
|
||||
m_name = name.ToStdString();
|
||||
}
|
||||
};
|
||||
|
||||
|
|
@ -107,7 +107,7 @@ class CompilePPUProgram
|
|||
SpData(const wxString& data, u32 addr)
|
||||
: m_addr(addr)
|
||||
{
|
||||
m_data = data.c_str();
|
||||
m_data = data.ToStdString();
|
||||
}
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -736,19 +736,19 @@ public:
|
|||
wxString ret = "Registers:\n=========\n";
|
||||
|
||||
for(uint i=0; i<32; ++i) ret += wxString::Format("GPR[%d] = 0x%llx\n", i, GPR[i]);
|
||||
for(uint i=0; i<32; ++i) ret += wxString::Format("FPR[%d] = %.6G\n", i, FPR[i]);
|
||||
for(uint i=0; i<32; ++i) ret += wxString::Format("VPR[%d] = 0x%s [%s]\n", i, VPR[i].ToString(true).mb_str(), VPR[i].ToString().mb_str());
|
||||
ret += wxString::Format("CR = 0x%08x\n", CR);
|
||||
for(uint i=0; i<32; ++i) ret += wxString::Format("FPR[%d] = %.6G\n", i, (double)FPR[i]);
|
||||
for(uint i=0; i<32; ++i) ret += wxString::Format("VPR[%d] = 0x%s [%s]\n", i, (const char*)VPR[i].ToString(true).wx_str(), (const char*)VPR[i].ToString().wx_str());
|
||||
ret += wxString::Format("CR = 0x%08x\n", CR.CR);
|
||||
ret += wxString::Format("LR = 0x%llx\n", LR);
|
||||
ret += wxString::Format("CTR = 0x%llx\n", CTR);
|
||||
ret += wxString::Format("XER = 0x%llx [CA=%lld | OV=%lld | SO=%lld]\n", XER, XER.CA, XER.OV, XER.SO);
|
||||
ret += wxString::Format("XER = 0x%llx [CA=%lld | OV=%lld | SO=%lld]\n", XER.XER, XER.CA, XER.OV, XER.SO);
|
||||
ret += wxString::Format("FPSCR = 0x%x "
|
||||
"[RN=%d | NI=%d | XE=%d | ZE=%d | UE=%d | OE=%d | VE=%d | "
|
||||
"VXCVI=%d | VXSQRT=%d | VXSOFT=%d | FPRF=%d | "
|
||||
"FI=%d | FR=%d | VXVC=%d | VXIMZ=%d | "
|
||||
"VXZDZ=%d | VXIDI=%d | VXISI=%d | VXSNAN=%d | "
|
||||
"XX=%d | ZX=%d | UX=%d | OX=%d | VX=%d | FEX=%d | FX=%d]\n",
|
||||
FPSCR,
|
||||
FPSCR.FPSCR,
|
||||
FPSCR.RN,
|
||||
FPSCR.NI, FPSCR.XE, FPSCR.ZE, FPSCR.UE, FPSCR.OE, FPSCR.VE,
|
||||
FPSCR.VXCVI, FPSCR.VXSQRT, FPSCR.VXSOFT, FPSCR.FPRF,
|
||||
|
|
@ -766,14 +766,14 @@ public:
|
|||
long reg_index;
|
||||
reg.AfterFirst('[').RemoveLast().ToLong(®_index);
|
||||
if (reg.StartsWith("GPR")) return wxString::Format("%016llx", GPR[reg_index]);
|
||||
if (reg.StartsWith("FPR")) return wxString::Format("%016llx", FPR[reg_index]);
|
||||
if (reg.StartsWith("FPR")) return wxString::Format("%016llx", (double)FPR[reg_index]);
|
||||
if (reg.StartsWith("VPR")) return wxString::Format("%016llx%016llx", VPR[reg_index]._u64[1], VPR[reg_index]._u64[0]);
|
||||
}
|
||||
if (reg == "CR") return wxString::Format("%08x", CR);
|
||||
if (reg == "CR") return wxString::Format("%08x", CR.CR);
|
||||
if (reg == "LR") return wxString::Format("%016llx", LR);
|
||||
if (reg == "CTR") return wxString::Format("%016llx", CTR);
|
||||
if (reg == "XER") return wxString::Format("%016llx", XER);
|
||||
if (reg == "FPSCR") return wxString::Format("%08x", FPSCR);
|
||||
if (reg == "XER") return wxString::Format("%016llx", XER.XER);
|
||||
if (reg == "FPSCR") return wxString::Format("%08x", FPSCR.FPSCR);
|
||||
|
||||
return wxEmptyString;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -251,7 +251,7 @@ u32 RawSPUThread::GetIndex() const
|
|||
|
||||
void RawSPUThread::Task()
|
||||
{
|
||||
ConLog.Write("%s enter", PPCThread::GetFName().mb_str());
|
||||
ConLog.Write("%s enter", PPCThread::GetFName().wx_str());
|
||||
|
||||
const Array<u64>& bp = Emu.GetBreakPoints();
|
||||
|
||||
|
|
@ -327,12 +327,12 @@ void RawSPUThread::Task()
|
|||
}
|
||||
catch(const wxString& e)
|
||||
{
|
||||
ConLog.Error("Exception: %s", e.mb_str());
|
||||
ConLog.Error("Exception: %s", e.wx_str());
|
||||
}
|
||||
catch(const char* e)
|
||||
{
|
||||
ConLog.Error("Exception: %s", e);
|
||||
}
|
||||
|
||||
ConLog.Write("%s leave", PPCThread::GetFName().mb_str());
|
||||
ConLog.Write("%s leave", PPCThread::GetFName().wx_str());
|
||||
}
|
||||
|
|
|
|||
|
|
@ -37,43 +37,43 @@ private:
|
|||
}
|
||||
void DisAsm(wxString op, u32 a1)
|
||||
{
|
||||
Write(wxString::Format("%s 0x%x", FixOp(op).mb_str(), a1));
|
||||
Write(wxString::Format("%s 0x%x", FixOp(op).wx_str(), a1));
|
||||
}
|
||||
void DisAsm(wxString op, const char* a1)
|
||||
{
|
||||
Write(wxString::Format("%s %s", FixOp(op).mb_str(), a1));
|
||||
Write(wxString::Format("%s %s", FixOp(op).wx_str(), a1));
|
||||
}
|
||||
void DisAsm(wxString op, const char* a1, const char* a2)
|
||||
{
|
||||
Write(wxString::Format("%s %s,%s", FixOp(op).mb_str(), a1, a2));
|
||||
Write(wxString::Format("%s %s,%s", FixOp(op).wx_str(), a1, a2));
|
||||
}
|
||||
void DisAsm(wxString op, int a1, const char* a2)
|
||||
{
|
||||
Write(wxString::Format("%s 0x%x,%s", FixOp(op).mb_str(), a1, a2));
|
||||
Write(wxString::Format("%s 0x%x,%s", FixOp(op).wx_str(), a1, a2));
|
||||
}
|
||||
void DisAsm(wxString op, const char* a1, int a2)
|
||||
{
|
||||
Write(wxString::Format("%s %s,0x%x", FixOp(op).mb_str(), a1, a2));
|
||||
Write(wxString::Format("%s %s,0x%x", FixOp(op).wx_str(), a1, a2));
|
||||
}
|
||||
void DisAsm(wxString op, int a1, int a2)
|
||||
{
|
||||
Write(wxString::Format("%s 0x%x,0x%x", FixOp(op).mb_str(), a1, a2));
|
||||
Write(wxString::Format("%s 0x%x,0x%x", FixOp(op).wx_str(), a1, a2));
|
||||
}
|
||||
void DisAsm(wxString op, const char* a1, const char* a2, const char* a3)
|
||||
{
|
||||
Write(wxString::Format("%s %s,%s,%s", FixOp(op).mb_str(), a1, a2, a3));
|
||||
Write(wxString::Format("%s %s,%s,%s", FixOp(op).wx_str(), a1, a2, a3));
|
||||
}
|
||||
void DisAsm(wxString op, const char* a1, int a2, const char* a3)
|
||||
{
|
||||
Write(wxString::Format("%s %s,0x%x(%s)", FixOp(op).mb_str(), a1, a2, a3));
|
||||
Write(wxString::Format("%s %s,0x%x(%s)", FixOp(op).wx_str(), a1, a2, a3));
|
||||
}
|
||||
void DisAsm(wxString op, const char* a1, const char* a2, int a3)
|
||||
{
|
||||
Write(wxString::Format("%s %s,%s,0x%x", FixOp(op).mb_str(), a1, a2, a3));
|
||||
Write(wxString::Format("%s %s,%s,0x%x", FixOp(op).wx_str(), a1, a2, a3));
|
||||
}
|
||||
void DisAsm(wxString op, const char* a1, const char* a2, const char* a3, const char* a4)
|
||||
{
|
||||
Write(wxString::Format("%s %s,%s,%s,%s", FixOp(op).mb_str(), a1, a2, a3, a4));
|
||||
Write(wxString::Format("%s %s,%s,%s,%s", FixOp(op).wx_str(), a1, a2, a3, a4));
|
||||
}
|
||||
//0 - 10
|
||||
void STOP(u32 code)
|
||||
|
|
|
|||
|
|
@ -1426,6 +1426,6 @@ private:
|
|||
{
|
||||
ConLog.Error(err + wxString::Format(" #pc: 0x%x", CPU.PC));
|
||||
Emu.Pause();
|
||||
for(uint i=0; i<128; ++i) ConLog.Write("r%d = 0x%s", i, CPU.GPR[i].ToString().mb_str());
|
||||
for(uint i=0; i<128; ++i) ConLog.Write("r%d = 0x%s", i, CPU.GPR[i].ToString().wx_str());
|
||||
}
|
||||
};
|
||||
|
|
|
|||
|
|
@ -755,7 +755,7 @@ public:
|
|||
{
|
||||
wxString ret = "Registers:\n=========\n";
|
||||
|
||||
for(uint i=0; i<128; ++i) ret += wxString::Format("GPR[%d] = 0x%s\n", i, GPR[i].ToString().mb_str());
|
||||
for(uint i=0; i<128; ++i) ret += wxString::Format("GPR[%d] = 0x%s\n", i, GPR[i].ToString().wx_str());
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@ struct _DbgBuffer : public MTPacketBuffer<DbgPacket>
|
|||
|
||||
memcpy(&m_buffer[c_put], &stext, sizeof(u32));
|
||||
c_put += sizeof(u32);
|
||||
memcpy(&m_buffer[c_put], data.m_text.c_str(), stext);
|
||||
memcpy(&m_buffer[c_put], static_cast<const char *>(data.m_text), stext);
|
||||
c_put += stext;
|
||||
|
||||
m_put = c_put;
|
||||
|
|
@ -58,7 +58,7 @@ struct _DbgBuffer : public MTPacketBuffer<DbgPacket>
|
|||
|
||||
const u32& stext = *(u32*)&m_buffer[c_get];
|
||||
c_get += sizeof(u32);
|
||||
if(stext) memcpy(wxStringBuffer(ret.m_text, stext), &m_buffer[c_get], stext);
|
||||
if (stext) ret.m_text = wxString(reinterpret_cast<const char*>(&m_buffer[c_get]), stext );
|
||||
c_get += stext;
|
||||
|
||||
m_get = c_get;
|
||||
|
|
|
|||
|
|
@ -53,19 +53,19 @@ bool vfsLocalFile::Open(const wxString& path, vfsOpenMode mode)
|
|||
|
||||
bool vfsLocalFile::Create(const wxString& path)
|
||||
{
|
||||
ConLog.Warning("vfsLocalFile::Create('%s')", path.c_str());
|
||||
for(uint p=1; path[p] != '\0'; p++)
|
||||
ConLog.Warning("vfsLocalFile::Create('%s')", path.wx_str());
|
||||
for(uint p=1; p < path.Len() && path[p] != '\0' ; p++)
|
||||
{
|
||||
for(; path[p] != '\0'; p++)
|
||||
for(; p < path.Len() && path[p] != '\0'; p++)
|
||||
if(path[p] == '\\') break;
|
||||
|
||||
if(path[p] == '\0')
|
||||
if(p == path.Len() || path[p] == '\0')
|
||||
break;
|
||||
|
||||
const wxString& dir = path(0, p);
|
||||
if(!wxDirExists(dir))
|
||||
{
|
||||
ConLog.Write("create dir: %s", dir.c_str());
|
||||
ConLog.Write("create dir: %s", dir.wx_str());
|
||||
wxMkdir(dir);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -39,10 +39,10 @@ GLGSFrame::GLGSFrame()
|
|||
canvas->Connect(wxEVT_LEFT_DCLICK, wxMouseEventHandler(GSFrame::OnLeftDclick), (wxObject*)0, this);
|
||||
}
|
||||
|
||||
void GLGSFrame::Flip()
|
||||
void GLGSFrame::Flip(wxGLContext *context)
|
||||
{
|
||||
if(!canvas) return;
|
||||
canvas->SetCurrent();
|
||||
canvas->SetCurrent(*context);
|
||||
|
||||
static Timer fps_t;
|
||||
canvas->SwapBuffers();
|
||||
|
|
@ -1068,7 +1068,7 @@ void GLGSRender::Flip()
|
|||
m_post_draw_objs[i].Draw();
|
||||
}
|
||||
|
||||
m_frame->Flip();
|
||||
m_frame->Flip(m_context);
|
||||
|
||||
if(m_fbo.IsCreated())
|
||||
m_fbo.Bind();
|
||||
|
|
|
|||
|
|
@ -8,7 +8,6 @@
|
|||
#include "GLProgramBuffer.h"
|
||||
|
||||
#pragma comment(lib, "opengl32.lib")
|
||||
#pragma comment(lib, "gl.lib")
|
||||
|
||||
#define RSX_DEBUG 1
|
||||
|
||||
|
|
@ -303,7 +302,7 @@ struct GLGSFrame : public GSFrame
|
|||
GLGSFrame();
|
||||
~GLGSFrame() {}
|
||||
|
||||
void Flip();
|
||||
void Flip(wxGLContext *context);
|
||||
|
||||
wxGLCanvas* GetCanvas() const { return canvas; }
|
||||
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ int GLProgram::GetLocation(const wxString& name)
|
|||
m_locations[pos].name = name;
|
||||
|
||||
m_locations[pos].loc = glGetUniformLocation(id, name);
|
||||
checkForGlError(wxString::Format("glGetUniformLocation(0x%x, %s)", id, name.mb_str()));
|
||||
checkForGlError(wxString::Format("glGetUniformLocation(0x%x, %s)", id, name.wx_str()));
|
||||
return m_locations[pos].loc;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -93,8 +93,9 @@ void GLProgramBuffer::Add(GLProgram& prog, GLShaderProgram& gl_fp, RSXShaderProg
|
|||
ConLog.Write("*** vp data size = %d", rsx_vp.data.GetCount() * 4);
|
||||
ConLog.Write("*** fp data size = %d", rsx_fp.size);
|
||||
|
||||
ConLog.Write("*** vp shader = \n%s", gl_vp.shader.c_str());
|
||||
ConLog.Write("*** fp shader = \n%s", gl_fp.shader.c_str());
|
||||
ConLog.Write("*** vp shader = \n%s", gl_vp.shader.wx_str());
|
||||
ConLog.Write("*** fp shader = \n%s", wxString(gl_fp.shader).wx_str());
|
||||
|
||||
|
||||
new_buf.prog_id = prog.id;
|
||||
new_buf.vp_id = gl_vp.id;
|
||||
|
|
|
|||
|
|
@ -187,7 +187,7 @@ void GLVertexDecompilerThread::AddCode(bool is_sca, wxString code, bool src_mask
|
|||
|
||||
swizzle = swizzle == "xyzw" ? "" : "." + swizzle;
|
||||
|
||||
cond = wxString::Format("if(all(%s(rc%s, vec4(0.0)%s))) ", cond_string_table[d0.cond], swizzle.c_str(), swizzle.c_str());
|
||||
cond = wxString::Format("if(all(%s(rc%s, vec4(0.0)%s))) ", cond_string_table[d0.cond], wxString(swizzle).wx_str(), wxString(swizzle).wx_str());
|
||||
}
|
||||
|
||||
wxString mask = GetMask(is_sca);
|
||||
|
|
@ -314,16 +314,16 @@ wxString GLVertexDecompilerThread::BuildCode()
|
|||
|
||||
for(int i=m_funcs.GetCount() - 1; i>0; --i)
|
||||
{
|
||||
fp += wxString::Format("void %s();\n", m_funcs[i].name.mb_str());
|
||||
fp += wxString::Format("void %s();\n", m_funcs[i].name.wx_str());
|
||||
}
|
||||
|
||||
wxString f = wxEmptyString;
|
||||
|
||||
f += wxString::Format("void %s()\n{\n\tgl_Position = vec4(0.0f, 0.0f, 0.0f, 1.0f);\n%s}\n", m_funcs[0].name.mb_str(), BuildFuncBody(m_funcs[0]).mb_str());
|
||||
f += wxString::Format("void %s()\n{\n\tgl_Position = vec4(0.0f, 0.0f, 0.0f, 1.0f);\n%s}\n", m_funcs[0].name.wx_str(), BuildFuncBody(m_funcs[0]).wx_str());
|
||||
|
||||
for(uint i=1; i<m_funcs.GetCount(); ++i)
|
||||
{
|
||||
f += wxString::Format("\nvoid %s()\n{\n%s}\n", m_funcs[i].name.mb_str(), BuildFuncBody(m_funcs[i]).mb_str());
|
||||
f += wxString::Format("\nvoid %s()\n{\n%s}\n", m_funcs[i].name.wx_str(), BuildFuncBody(m_funcs[i]).wx_str());
|
||||
}
|
||||
|
||||
static const wxString& prot =
|
||||
|
|
@ -333,7 +333,7 @@ wxString GLVertexDecompilerThread::BuildCode()
|
|||
"%s\n"
|
||||
"%s";
|
||||
|
||||
return wxString::Format(prot, p.mb_str(), fp.mb_str(), f.mb_str());
|
||||
return wxString::Format(prot, p.wx_str(), fp.wx_str(), f.wx_str());
|
||||
}
|
||||
|
||||
void GLVertexDecompilerThread::Task()
|
||||
|
|
@ -482,7 +482,7 @@ void GLVertexProgram::Compile()
|
|||
|
||||
id = glCreateShader(GL_VERTEX_SHADER);
|
||||
|
||||
const char* str = shader.c_str();
|
||||
const char* str = shader.mb_str();
|
||||
const int strlen = shader.Len();
|
||||
|
||||
glShaderSource(id, 1, &str, &strlen);
|
||||
|
|
@ -500,7 +500,7 @@ void GLVertexProgram::Compile()
|
|||
GLsizei len;
|
||||
memset(buf, 0, r+1);
|
||||
glGetShaderInfoLog(id, r, &len, buf);
|
||||
ConLog.Error("Failed to compile vertex shader: %s", buf);
|
||||
ConLog.Error("Failed to compile vertex shader: %s", wxString(buf).wx_str());
|
||||
delete[] buf;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -301,11 +301,9 @@ public:
|
|||
|
||||
wxString ReadString(const u64 addr, const u64 len)
|
||||
{
|
||||
wxString ret = wxEmptyString;
|
||||
wxString ret(GetMemFromAddr(addr), wxConvUTF8,len);
|
||||
|
||||
if(len) memcpy(wxStringBuffer(ret, len), GetMemFromAddr(addr), len);
|
||||
|
||||
return wxString(ret, wxConvUTF8);
|
||||
return ret;
|
||||
}
|
||||
|
||||
wxString ReadString(const u64 addr)
|
||||
|
|
|
|||
|
|
@ -412,7 +412,7 @@ void Module::Log(const u32 id, wxString fmt, ...)
|
|||
{
|
||||
va_list list;
|
||||
va_start(list, fmt);
|
||||
ConLog.Write(GetName() + wxString::Format("[%d]: ", id).mb_str() + wxString::FormatV(fmt, list).mb_str());
|
||||
ConLog.Write(GetName() + wxString::Format("[%d]: ", id).wx_str() + wxString::FormatV(fmt, list).wx_str());
|
||||
va_end(list);
|
||||
}
|
||||
}
|
||||
|
|
@ -423,7 +423,7 @@ void Module::Log(wxString fmt, ...)
|
|||
{
|
||||
va_list list;
|
||||
va_start(list, fmt);
|
||||
ConLog.Write(GetName() + ": " + wxString::FormatV(fmt, list).mb_str());
|
||||
ConLog.Write(GetName() + ": " + wxString::FormatV(fmt, list).wx_str());
|
||||
va_end(list);
|
||||
}
|
||||
}
|
||||
|
|
@ -432,7 +432,7 @@ void Module::Warning(const u32 id, wxString fmt, ...)
|
|||
{
|
||||
va_list list;
|
||||
va_start(list, fmt);
|
||||
ConLog.Warning(GetName() + wxString::Format("[%d] warning: ", id).mb_str() + wxString::FormatV(fmt, list).mb_str());
|
||||
ConLog.Warning(GetName() + wxString::Format("[%d] warning: ", id).wx_str() + wxString::FormatV(fmt, list).wx_str());
|
||||
va_end(list);
|
||||
}
|
||||
|
||||
|
|
@ -440,7 +440,7 @@ void Module::Warning(wxString fmt, ...)
|
|||
{
|
||||
va_list list;
|
||||
va_start(list, fmt);
|
||||
ConLog.Warning(GetName() + " warning: " + wxString::FormatV(fmt, list).mb_str());
|
||||
ConLog.Warning(GetName() + " warning: " + wxString::FormatV(fmt, list).wx_str());
|
||||
va_end(list);
|
||||
}
|
||||
|
||||
|
|
@ -448,7 +448,7 @@ void Module::Error(const u32 id, wxString fmt, ...)
|
|||
{
|
||||
va_list list;
|
||||
va_start(list, fmt);
|
||||
ConLog.Error(GetName() + wxString::Format("[%d] error: ", id).mb_str() + wxString::FormatV(fmt, list).mb_str());
|
||||
ConLog.Error(GetName() + wxString::Format("[%d] error: ", id).wx_str() + wxString::FormatV(fmt, list).wx_str());
|
||||
va_end(list);
|
||||
}
|
||||
|
||||
|
|
@ -456,7 +456,7 @@ void Module::Error(wxString fmt, ...)
|
|||
{
|
||||
va_list list;
|
||||
va_start(list, fmt);
|
||||
ConLog.Error(GetName() + " error: " + wxString::FormatV(fmt, list).mb_str());
|
||||
ConLog.Error(GetName() + " error: " + wxString::FormatV(fmt, list).wx_str());
|
||||
va_end(list);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -55,7 +55,7 @@ s64 sys_prx_exitspawn_with_level()
|
|||
s64 sys_strlen(u32 addr)
|
||||
{
|
||||
const wxString& str = Memory.ReadString(addr);
|
||||
sysPrxForUser.Log("sys_strlen(0x%x - \"%s\")", addr, str.mb_str());
|
||||
sysPrxForUser.Log("sys_strlen(0x%x - \"%s\")", addr, str.wx_str());
|
||||
return str.Len();
|
||||
}
|
||||
|
||||
|
|
@ -100,14 +100,14 @@ int sys_spu_image_close(mem_ptr_t<sys_spu_image> img)
|
|||
|
||||
int sys_raw_spu_load(int id, u32 path_addr, mem32_t entry)
|
||||
{
|
||||
const wxString path = Memory.ReadString(path_addr).mb_str();
|
||||
const wxString path = Memory.ReadString(path_addr).wx_str();
|
||||
sysPrxForUser.Warning("sys_raw_spu_load(id=0x%x, path=0x%x [%s], entry_addr=0x%x)",
|
||||
id, path_addr, path.c_str(), entry.GetAddr());
|
||||
id, path_addr, path.wx_str(), entry.GetAddr());
|
||||
|
||||
vfsFile f(path.c_str());
|
||||
vfsFile f(path);
|
||||
if(!f.IsOpened())
|
||||
{
|
||||
sysPrxForUser.Error("sys_raw_spu_load error: '%s' not found!", path.c_str());
|
||||
sysPrxForUser.Error("sys_raw_spu_load error: '%s' not found!", path.wx_str());
|
||||
return CELL_ENOENT;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ public:
|
|||
{
|
||||
va_list list;
|
||||
va_start(list, fmt);
|
||||
ConLog.Write(GetName() + wxString::Format("[%d]: ", id).mb_str() + wxString::FormatV(fmt, list).mb_str());
|
||||
ConLog.Write(GetName() + wxString::Format("[%d]: ", id).wx_str() + wxString::FormatV(fmt, list).wx_str());
|
||||
va_end(list);
|
||||
}
|
||||
}
|
||||
|
|
@ -47,7 +47,7 @@ public:
|
|||
{
|
||||
va_list list;
|
||||
va_start(list, fmt);
|
||||
ConLog.Write(GetName() + ": " + wxString::FormatV(fmt, list).mb_str());
|
||||
ConLog.Write(GetName() + ": " + wxString::FormatV(fmt, list).wx_str());
|
||||
va_end(list);
|
||||
}
|
||||
}
|
||||
|
|
@ -57,7 +57,7 @@ public:
|
|||
//#ifdef SYSCALLS_DEBUG
|
||||
va_list list;
|
||||
va_start(list, fmt);
|
||||
ConLog.Warning(GetName() + wxString::Format("[%d] warning: ", id).mb_str() + wxString::FormatV(fmt, list).mb_str());
|
||||
ConLog.Warning(GetName() + wxString::Format("[%d] warning: ", id).wx_str() + wxString::FormatV(fmt, list).wx_str());
|
||||
va_end(list);
|
||||
//#endif
|
||||
}
|
||||
|
|
@ -67,7 +67,7 @@ public:
|
|||
//#ifdef SYSCALLS_DEBUG
|
||||
va_list list;
|
||||
va_start(list, fmt);
|
||||
ConLog.Warning(GetName() + " warning: " + wxString::FormatV(fmt, list).mb_str());
|
||||
ConLog.Warning(GetName() + " warning: " + wxString::FormatV(fmt, list).wx_str());
|
||||
va_end(list);
|
||||
//#endif
|
||||
}
|
||||
|
|
@ -76,7 +76,7 @@ public:
|
|||
{
|
||||
va_list list;
|
||||
va_start(list, fmt);
|
||||
ConLog.Error(GetName() + wxString::Format("[%d] error: ", id).mb_str() + wxString::FormatV(fmt, list).mb_str());
|
||||
ConLog.Error(GetName() + wxString::Format("[%d] error: ", id).wx_str() + wxString::FormatV(fmt, list).wx_str());
|
||||
va_end(list);
|
||||
}
|
||||
|
||||
|
|
@ -84,7 +84,7 @@ public:
|
|||
{
|
||||
va_list list;
|
||||
va_start(list, fmt);
|
||||
ConLog.Error(GetName() + " error: " + wxString::FormatV(fmt, list).mb_str());
|
||||
ConLog.Error(GetName() + " error: " + wxString::FormatV(fmt, list).wx_str());
|
||||
va_end(list);
|
||||
}
|
||||
|
||||
|
|
@ -304,8 +304,8 @@ extern int cellMouseGetRawData(u32 port_no, mem_class_t data);
|
|||
extern int cellGcmCallback(u32 context_addr, u32 count);
|
||||
|
||||
//sys_tty
|
||||
extern int sys_tty_read(u32 ch, u64 buf_addr, u32 len, u64 preadlen_addr);
|
||||
extern int sys_tty_write(u32 ch, u64 buf_addr, u32 len, u64 pwritelen_addr);
|
||||
extern int sys_tty_read(s32 ch, u64 buf_addr, u32 len, u64 preadlen_addr);
|
||||
extern int sys_tty_write(s32 ch, u64 buf_addr, u32 len, u64 pwritelen_addr);
|
||||
|
||||
//sys_heap
|
||||
extern int sys_heap_create_heap(const u32 heap_addr, const u32 start_addr, const u32 size);
|
||||
|
|
|
|||
|
|
@ -134,7 +134,7 @@ int sys_ppu_thread_restart(u32 thread_id)
|
|||
int sys_ppu_thread_create(u32 thread_id_addr, u32 entry, u64 arg, int prio, u32 stacksize, u64 flags, u32 threadname_addr)
|
||||
{
|
||||
sysPrxForUser.Log("sys_ppu_thread_create(thread_id_addr=0x%x, entry=0x%x, arg=0x%x, prio=%d, stacksize=0x%x, flags=0x%llx, threadname_addr=0x%x('%s'))",
|
||||
thread_id_addr, entry, arg, prio, stacksize, flags, threadname_addr, Memory.ReadString(threadname_addr).mb_str());
|
||||
thread_id_addr, entry, arg, prio, stacksize, flags, threadname_addr, Memory.ReadString(threadname_addr).wx_str());
|
||||
|
||||
if(!Memory.IsGoodAddr(entry) || !Memory.IsGoodAddr(thread_id_addr) || !Memory.IsGoodAddr(threadname_addr))
|
||||
{
|
||||
|
|
@ -149,7 +149,7 @@ int sys_ppu_thread_create(u32 thread_id_addr, u32 entry, u64 arg, int prio, u32
|
|||
new_thread.SetPrio(prio);
|
||||
new_thread.SetStackSize(stacksize);
|
||||
//new_thread.flags = flags;
|
||||
new_thread.SetName(Memory.ReadString(threadname_addr).mb_str());
|
||||
new_thread.SetName(Memory.ReadString(threadname_addr).ToStdString());
|
||||
new_thread.Run();
|
||||
new_thread.Exec();
|
||||
|
||||
|
|
|
|||
|
|
@ -49,7 +49,7 @@ int sys_game_process_exitspawn( u32 path_addr, u32 argv_addr, u32 envp_addr,
|
|||
u32 data, u32 data_size, int prio, u64 flags )
|
||||
{
|
||||
sc_p.Log("sys_game_process_exitspawn: ");
|
||||
sc_p.Log("path: %s", Memory.ReadString(path_addr).mb_str());
|
||||
sc_p.Log("path: %s", Memory.ReadString(path_addr).wx_str());
|
||||
sc_p.Log("argv: 0x%x", Memory.Read32(argv_addr));
|
||||
sc_p.Log("envp: 0x%x", Memory.Read32(envp_addr));
|
||||
sc_p.Log("data: 0x%x", data);
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
#include "stdafx.h"
|
||||
#include "Emu/SysCalls/SysCalls.h"
|
||||
|
||||
int sys_tty_read(u32 ch, u64 buf_addr, u32 len, u64 preadlen_addr)
|
||||
int sys_tty_read(s32 ch, u64 buf_addr, u32 len, u64 preadlen_addr)
|
||||
{
|
||||
ConLog.Warning("sys_tty_read: ch: %d, buf addr: %llx, len: %d", ch, buf_addr, len);
|
||||
Memory.Write32NN(preadlen_addr, len);
|
||||
|
|
@ -9,7 +9,7 @@ int sys_tty_read(u32 ch, u64 buf_addr, u32 len, u64 preadlen_addr)
|
|||
return CELL_OK;
|
||||
}
|
||||
|
||||
int sys_tty_write(u32 ch, u64 buf_addr, u32 len, u64 pwritelen_addr)
|
||||
int sys_tty_write(s32 ch, u64 buf_addr, u32 len, u64 pwritelen_addr)
|
||||
{
|
||||
if(ch < 0 || ch > 15 || (s32)len <= 0) return CELL_EINVAL;
|
||||
if(!Memory.IsGoodAddr(buf_addr)) return CELL_EFAULT;
|
||||
|
|
|
|||
|
|
@ -110,7 +110,7 @@ bool Emulator::DecryptSelf(const std::string& elf, const std::string& self)
|
|||
|
||||
if(!f.IsOpened())
|
||||
{
|
||||
ConLog.Error("Could not open SELF file! (%s)", self.c_str());
|
||||
ConLog.Error("Could not open SELF file! (%s)", wxString(self).wx_str());
|
||||
return false;
|
||||
}
|
||||
|
||||
|
|
@ -135,7 +135,7 @@ bool Emulator::DecryptSelf(const std::string& elf, const std::string& self)
|
|||
|
||||
if(!out.IsOpened())
|
||||
{
|
||||
ConLog.Error("Could not create ELF file! (%s)", elf.c_str());
|
||||
ConLog.Error("Could not create ELF file! (%s)", wxString(elf).wx_str());
|
||||
return false;
|
||||
}
|
||||
|
||||
|
|
@ -188,7 +188,7 @@ void Emulator::Load()
|
|||
{
|
||||
if(!wxFileExists(m_path)) return;
|
||||
|
||||
if(IsSelf(m_path.c_str()))
|
||||
if(IsSelf(m_path.ToStdString()))
|
||||
{
|
||||
std::string self_path = m_path;
|
||||
std::string elf_path = wxFileName(m_path).GetPath().c_str();
|
||||
|
|
@ -208,7 +208,7 @@ void Emulator::Load()
|
|||
m_path = elf_path;
|
||||
}
|
||||
|
||||
ConLog.Write("Loading '%s'...", m_path.mb_str());
|
||||
ConLog.Write("Loading '%s'...", m_path.wx_str());
|
||||
GetInfo().Reset();
|
||||
m_vfs.Init(m_path);
|
||||
|
||||
|
|
@ -216,7 +216,7 @@ void Emulator::Load()
|
|||
ConLog.Write("Mount info:");
|
||||
for(uint i=0; i<m_vfs.m_devices.GetCount(); ++i)
|
||||
{
|
||||
ConLog.Write("%s -> %s", m_vfs.m_devices[i].GetPs3Path().mb_str(), m_vfs.m_devices[i].GetLocalPath().mb_str());
|
||||
ConLog.Write("%s -> %s", m_vfs.m_devices[i].GetPs3Path().wx_str(), m_vfs.m_devices[i].GetLocalPath().wx_str());
|
||||
}
|
||||
ConLog.SkipLn();
|
||||
|
||||
|
|
@ -229,7 +229,7 @@ void Emulator::Load()
|
|||
|
||||
if(!f.IsOpened())
|
||||
{
|
||||
ConLog.Error("Elf not found! (%s - %s)", m_path.mb_str(), m_elf_path.mb_str());
|
||||
ConLog.Error("Elf not found! (%s - %s)", m_path.wx_str(), m_elf_path.wx_str());
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -506,7 +506,7 @@ void Emulator::LoadPoints(const std::string& path)
|
|||
if(version != bpdb_version ||
|
||||
(sizeof(u16) + break_count * sizeof(u64) + sizeof(u32) + marked_count * sizeof(u64) + sizeof(u32)) != length)
|
||||
{
|
||||
ConLog.Error("'%s' is broken", path.c_str());
|
||||
ConLog.Error("'%s' is broken", wxString(path).wx_str());
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -67,7 +67,7 @@ AboutDialog::AboutDialog(wxWindow *parent)
|
|||
|
||||
s_panel_buttons->AddSpacer(12);
|
||||
s_panel_buttons->Add(new wxButton(this, wxID_OK), wxLEFT, 0, 5);
|
||||
s_panel_buttons->AddSpacer(256);
|
||||
s_panel_buttons->AddSpacer(218);
|
||||
s_panel_buttons->Add(b_website, wxLEFT, 0, 5);
|
||||
s_panel_buttons->AddSpacer(5);
|
||||
s_panel_buttons->Add(b_forum, wxLEFT, 0, 5);
|
||||
|
|
@ -77,9 +77,9 @@ AboutDialog::AboutDialog(wxWindow *parent)
|
|||
s_panel->Add(s_panel_logo);
|
||||
s_panel->Add(s_panel_credits);
|
||||
s_panel->Add(s_panel_buttons);
|
||||
s_panel->AddSpacer(12);
|
||||
|
||||
this->SetSizerAndFit(s_panel);
|
||||
this->SetSize(this->GetSize()-wxSize(0,220));
|
||||
SetSizerAndFit(s_panel);
|
||||
}
|
||||
|
||||
void AboutDialog::OpenWebsite(wxCommandEvent& WXUNUSED(event))
|
||||
|
|
|
|||
|
|
@ -123,7 +123,7 @@ void LogWriter::WriteToLog(std::string prefix, std::string value, std::string co
|
|||
}
|
||||
|
||||
if(m_logfile.IsOpened())
|
||||
m_logfile.Write((prefix.empty() ? "" : std::string("[" + prefix + "]: ") + value + "\n").c_str());
|
||||
m_logfile.Write(wxString(prefix.empty() ? "" : std::string("[" + prefix + "]: ") + value + "\n").wx_str());
|
||||
|
||||
if(!ConLogFrame) return;
|
||||
|
||||
|
|
@ -148,33 +148,17 @@ void LogWriter::WriteToLog(std::string prefix, std::string value, std::string co
|
|||
LogBuffer.Push(LogPacket(prefix, value, colour));
|
||||
}
|
||||
|
||||
wxString FormatV(const wxString fmt, va_list args)
|
||||
{
|
||||
int length = 256;
|
||||
wxString str;
|
||||
|
||||
for(;;)
|
||||
{
|
||||
str.Clear();
|
||||
wxStringBuffer buf(str, length+1);
|
||||
memset(buf, 0, length+1);
|
||||
if(vsnprintf(buf, length, fmt, args) != -1) break;
|
||||
length *= 2;
|
||||
}
|
||||
|
||||
return str;
|
||||
}
|
||||
|
||||
void LogWriter::Write(const wxString fmt, ...)
|
||||
{
|
||||
va_list list;
|
||||
va_start(list, fmt);
|
||||
|
||||
const wxString& frmt = FormatV(fmt, list);
|
||||
wxString frmt;
|
||||
frmt = wxString::FormatV(fmt, list);
|
||||
|
||||
va_end(list);
|
||||
|
||||
WriteToLog("!", frmt.mb_str(), "White");
|
||||
WriteToLog("!", (const char *)frmt.ToAscii(), "White");
|
||||
}
|
||||
|
||||
void LogWriter::Error(const wxString fmt, ...)
|
||||
|
|
@ -182,11 +166,12 @@ void LogWriter::Error(const wxString fmt, ...)
|
|||
va_list list;
|
||||
va_start(list, fmt);
|
||||
|
||||
const wxString& frmt = FormatV(fmt, list);
|
||||
wxString frmt;
|
||||
frmt = wxString::FormatV(fmt, list);
|
||||
|
||||
va_end(list);
|
||||
|
||||
WriteToLog("E", frmt.mb_str(), "Red");
|
||||
WriteToLog("E", static_cast<const char *>(frmt), "Red");
|
||||
}
|
||||
|
||||
void LogWriter::Warning(const wxString fmt, ...)
|
||||
|
|
@ -194,11 +179,12 @@ void LogWriter::Warning(const wxString fmt, ...)
|
|||
va_list list;
|
||||
va_start(list, fmt);
|
||||
|
||||
const wxString& frmt = FormatV(fmt, list);
|
||||
wxString frmt;
|
||||
frmt = wxString::FormatV(fmt, list);
|
||||
|
||||
va_end(list);
|
||||
|
||||
WriteToLog("W", frmt.mb_str(), "Yellow");
|
||||
WriteToLog("W", static_cast<const char *>(frmt), "Yellow");
|
||||
}
|
||||
|
||||
void LogWriter::Success(const wxString fmt, ...)
|
||||
|
|
@ -206,11 +192,12 @@ void LogWriter::Success(const wxString fmt, ...)
|
|||
va_list list;
|
||||
va_start(list, fmt);
|
||||
|
||||
const wxString& frmt = FormatV(fmt, list);
|
||||
wxString frmt;
|
||||
frmt = wxString::FormatV(fmt, list);
|
||||
|
||||
va_end(list);
|
||||
|
||||
WriteToLog("S", frmt.mb_str(), "Green");
|
||||
WriteToLog("S", static_cast<const char *>(frmt), "Green");
|
||||
}
|
||||
|
||||
void LogWriter::SkipLn()
|
||||
|
|
@ -275,9 +262,9 @@ void LogFrame::Task()
|
|||
|
||||
const int cur_item = m_log.GetItemCount();
|
||||
|
||||
m_log.InsertItem(cur_item, item.m_prefix.c_str());
|
||||
m_log.SetItem(cur_item, 1, item.m_text.c_str());
|
||||
m_log.SetItemTextColour(cur_item, item.m_colour.c_str());
|
||||
m_log.InsertItem(cur_item, wxString(item.m_prefix).wx_str());
|
||||
m_log.SetItem(cur_item, 1, wxString(item.m_text).wx_str());
|
||||
m_log.SetItemTextColour(cur_item, wxString(item.m_colour).wx_str());
|
||||
m_log.SetColumnWidth(0, -1);
|
||||
m_log.SetColumnWidth(1, -1);
|
||||
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ public:
|
|||
s_b_main.Add(new wxStaticLine(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL), 0, wxEXPAND);
|
||||
s_b_main.Add(m_btn_restart, wxSizerFlags().Border(wxALL, 5));
|
||||
|
||||
SetSizer(&s_b_main);
|
||||
SetSizerAndFit(&s_b_main);
|
||||
Layout();
|
||||
|
||||
UpdateUI();
|
||||
|
|
|
|||
|
|
@ -295,7 +295,7 @@ void DisAsmFrame::Dump(wxCommandEvent& WXUNUSED(event))
|
|||
if(ctrl.ShowModal() == wxID_CANCEL) return;
|
||||
|
||||
vfsStream& f_elf = *new vfsLocalFile(Emu.m_path);
|
||||
ConLog.Write("path: %s", Emu.m_path.mb_str());
|
||||
ConLog.Write("path: %s", Emu.m_path.wx_str());
|
||||
Elf_Ehdr ehdr;
|
||||
ehdr.Load(f_elf);
|
||||
|
||||
|
|
@ -384,8 +384,8 @@ void DisAsmFrame::Dump(wxCommandEvent& WXUNUSED(event))
|
|||
|
||||
const wxString name = sh < name_arr.GetCount() ? name_arr[sh] : "Unknown";
|
||||
|
||||
fd.Write(wxString::Format("Start of section header %s[%d] (instructions count: %d)\n", name.mb_str(), sh, sh_size));
|
||||
prog_dial.Update(0, vsize, wxString::Format("Disasm %s section", name.mb_str()));
|
||||
fd.Write(wxString::Format("Start of section header %s[%d] (instructions count: %d)\n", name.wx_str(), sh, sh_size));
|
||||
prog_dial.Update(0, vsize, wxString::Format("Disasm %s section", name.wx_str()));
|
||||
|
||||
if(Memory.IsGoodAddr(sh_addr))
|
||||
{
|
||||
|
|
@ -397,7 +397,7 @@ void DisAsmFrame::Dump(wxCommandEvent& WXUNUSED(event))
|
|||
fd.Write(disasm->last_opcode);
|
||||
}
|
||||
}
|
||||
fd.Write(wxString::Format("End of section header %s[%d]\n\n", name.mb_str(), sh));
|
||||
fd.Write(wxString::Format("End of section header %s[%d]\n\n", name.wx_str(), sh));
|
||||
}
|
||||
|
||||
prog_dial.Close();
|
||||
|
|
|
|||
|
|
@ -91,9 +91,9 @@ void GameViewer::DClick(wxListEvent& event)
|
|||
const wxString& path = m_path + m_game_data[i].root;
|
||||
|
||||
Emu.Stop();
|
||||
if(!Emu.BootGame(path.c_str()))
|
||||
if(!Emu.BootGame(path.ToStdString()))
|
||||
{
|
||||
ConLog.Error("Boot error: elf not found! [%s]", path.mb_str());
|
||||
ConLog.Error("Boot error: elf not found! [%s]", path.wx_str());
|
||||
return;
|
||||
}
|
||||
Emu.Run();
|
||||
|
|
|
|||
|
|
@ -192,13 +192,13 @@ void MainFrame::BootGame(wxCommandEvent& WXUNUSED(event))
|
|||
|
||||
Emu.Stop();
|
||||
|
||||
if(Emu.BootGame(ctrl.GetPath().c_str()))
|
||||
if(Emu.BootGame(ctrl.GetPath().ToStdString()))
|
||||
{
|
||||
ConLog.Success("Game: boot done.");
|
||||
}
|
||||
else
|
||||
{
|
||||
ConLog.Error("Ps3 executable not found in selected folder (%s)", ctrl.GetPath().mb_str());
|
||||
ConLog.Error("Ps3 executable not found in selected folder (%s)", ctrl.GetPath().wx_str());
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -226,7 +226,7 @@ void MainFrame::InstallPkg(wxCommandEvent& WXUNUSED(event))
|
|||
Emu.Stop();
|
||||
|
||||
wxString fileName = ctrl.GetPath();
|
||||
if (!pkg_unpack((const char *)fileName.mb_str()))
|
||||
if (!pkg_unpack(static_cast<const char*>(fileName)))
|
||||
ConLog.Error("Could not unpack PKG!");
|
||||
else ConLog.Success("PKG: extract done.");
|
||||
|
||||
|
|
@ -234,7 +234,7 @@ void MainFrame::InstallPkg(wxCommandEvent& WXUNUSED(event))
|
|||
ConLog.Warning("Could not delete the decoded DEC file");
|
||||
|
||||
pkg_header *header;
|
||||
pkg_info((const char *)fileName.mb_str(), &header);
|
||||
pkg_info(static_cast<const char*>(fileName), &header);
|
||||
|
||||
wxString titleID_full (header->title_id);
|
||||
wxString titleID = titleID_full.SubString(7, 15);
|
||||
|
|
@ -242,7 +242,7 @@ void MainFrame::InstallPkg(wxCommandEvent& WXUNUSED(event))
|
|||
wxString mainDir = wxGetCwd();
|
||||
wxString gamePath = "\\dev_hdd0\\game\\";
|
||||
|
||||
wxString pkgDir = wxT(mainDir + gamePath + titleID);
|
||||
wxString pkgDir = mainDir + gamePath + titleID;
|
||||
|
||||
// Save the title ID.
|
||||
Emu.SetTitleID(titleID);
|
||||
|
|
@ -250,13 +250,13 @@ void MainFrame::InstallPkg(wxCommandEvent& WXUNUSED(event))
|
|||
//Refresh game list
|
||||
m_game_viewer->Refresh();
|
||||
|
||||
if(Emu.BootGame(pkgDir.c_str()))
|
||||
if(Emu.BootGame(pkgDir.ToStdString()))
|
||||
{
|
||||
ConLog.Success("Game: boot done.");
|
||||
}
|
||||
else
|
||||
{
|
||||
ConLog.Error("Ps3 executable not found in folder (%s)", pkgDir.c_str());
|
||||
ConLog.Error("Ps3 executable not found in folder (%s)", pkgDir.wx_str());
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -770,13 +770,13 @@ void MainFrame::UpdateUI(wxCommandEvent& event)
|
|||
wxMenuItem& stop = *menubar.FindItem( id_sys_stop );
|
||||
wxMenuItem& send_exit = *menubar.FindItem( id_sys_send_exit );
|
||||
wxMenuItem& send_open_menu = *menubar.FindItem( id_sys_send_open_menu );
|
||||
pause.SetText(is_running ? "Pause\tCtrl + P" : is_ready ? "Start\tCtrl + C" : "Resume\tCtrl + C");
|
||||
pause.SetItemLabel(is_running ? "Pause\tCtrl + P" : is_ready ? "Start\tCtrl + C" : "Resume\tCtrl + C");
|
||||
pause.Enable(!is_stopped);
|
||||
stop.Enable(!is_stopped);
|
||||
//send_exit.Enable(false);
|
||||
bool enable_commands = !is_stopped && Emu.GetCallbackManager().m_exit_callback.m_callbacks.GetCount();
|
||||
|
||||
send_open_menu.SetText(wxString::Format("Send %s system menu cmd", m_sys_menu_opened ? "close" : "open"));
|
||||
send_open_menu.SetItemLabel(wxString::Format("Send %s system menu cmd", m_sys_menu_opened ? "close" : "open"));
|
||||
send_open_menu.Enable(enable_commands);
|
||||
send_exit.Enable(enable_commands);
|
||||
|
||||
|
|
|
|||
|
|
@ -713,7 +713,7 @@ wxString RSXDebugger::DisAsmCommand(u32 cmd, u32 count, u32 currentAddr, u32 ioA
|
|||
switch(cmd & 0x3ffff)
|
||||
{
|
||||
case 0x3fead:
|
||||
DISASM("Flip and change current buffer: %d", args[0]);
|
||||
DISASM("Flip and change current buffer: %d", (u32)args[0]);
|
||||
break;
|
||||
|
||||
case NV4097_NO_OPERATION:
|
||||
|
|
@ -721,11 +721,11 @@ wxString RSXDebugger::DisAsmCommand(u32 cmd, u32 count, u32 currentAddr, u32 ioA
|
|||
break;
|
||||
|
||||
case NV406E_SET_REFERENCE:
|
||||
DISASM("Set reference: 0x%x", args[0]);
|
||||
DISASM("Set reference: 0x%x", (u32)args[0]);
|
||||
break;
|
||||
|
||||
case_16(NV4097_SET_TEXTURE_OFFSET, 0x20):
|
||||
DISASM("Texture Offset[%d]: %08x", index, args[0]);
|
||||
DISASM("Texture Offset[%d]: %08x", index, (u32)args[0]);
|
||||
switch ((args[1] & 0x3) - 1)
|
||||
{
|
||||
case CELL_GCM_LOCATION_LOCAL: DISASM("(Local memory);"); break;
|
||||
|
|
@ -760,32 +760,32 @@ wxString RSXDebugger::DisAsmCommand(u32 cmd, u32 count, u32 currentAddr, u32 ioA
|
|||
break;
|
||||
|
||||
case NV4097_SET_CONTEXT_DMA_COLOR_A:
|
||||
DISASM("Context DMA Color A: 0x%x", args[0]);
|
||||
DISASM("Context DMA Color A: 0x%x", (u32)args[0]);
|
||||
break;
|
||||
|
||||
case NV4097_SET_CONTEXT_DMA_COLOR_B:
|
||||
DISASM("Context DMA Color B: 0x%x", args[0]);
|
||||
DISASM("Context DMA Color B: 0x%x", (u32)args[0]);
|
||||
break;
|
||||
|
||||
case NV4097_SET_CONTEXT_DMA_COLOR_C:
|
||||
DISASM("Context DMA Color C: 0x%x", args[0]);
|
||||
DISASM("Context DMA Color C: 0x%x", (u32)args[0]);
|
||||
if(count > 1)
|
||||
DISASM("0x%x", args[1]);
|
||||
DISASM("0x%x", (u32)args[1]);
|
||||
break;
|
||||
|
||||
case NV4097_SET_CONTEXT_DMA_ZETA:
|
||||
DISASM("Context DMA Zeta: 0x%x", args[0]);
|
||||
DISASM("Context DMA Zeta: 0x%x", (u32)args[0]);
|
||||
break;
|
||||
|
||||
case NV4097_SET_SURFACE_PITCH_C:
|
||||
DISASM("Surface Pitch C: 0x%x;", args[0]);
|
||||
DISASM("Surface Pitch D: 0x%x;", args[1]);
|
||||
DISASM("Surface Offset C: 0x%x;", args[2]);
|
||||
DISASM("Surface Offset D: 0x%x", args[3]);
|
||||
DISASM("Surface Pitch C: 0x%x;", (u32)args[0]);
|
||||
DISASM("Surface Pitch D: 0x%x;", (u32)args[1]);
|
||||
DISASM("Surface Offset C: 0x%x;", (u32)args[2]);
|
||||
DISASM("Surface Offset D: 0x%x", (u32)args[3]);
|
||||
break;
|
||||
|
||||
case NV4097_SET_SURFACE_PITCH_Z:
|
||||
DISASM("Surface Pitch Z: 0x%x;", args[0]);
|
||||
DISASM("Surface Pitch Z: 0x%x;", (u32)args[0]);
|
||||
break;
|
||||
|
||||
default:
|
||||
|
|
@ -802,7 +802,7 @@ wxString RSXDebugger::DisAsmCommand(u32 cmd, u32 count, u32 currentAddr, u32 ioA
|
|||
for(uint i=0; i<count; ++i)
|
||||
{
|
||||
if(i != 0) disasm += ", ";
|
||||
disasm += wxString::Format("0x%x", args[i]);
|
||||
disasm += wxString::Format("0x%x", (u32)args[i]);
|
||||
}
|
||||
|
||||
disasm += ")]";
|
||||
|
|
|
|||
|
|
@ -141,7 +141,7 @@ void VHDDExplorer::Export(const wxString& path, const wxString& to)
|
|||
{
|
||||
if(!m_hdd->Open(path))
|
||||
{
|
||||
wxMessageBox(wxString::Format("EXPORT ERROR: file open error. (%s)", path.mb_str()));
|
||||
wxMessageBox(wxString::Format("EXPORT ERROR: file open error. (%s)", path.wx_str()));
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -188,7 +188,7 @@ void VHDDExplorer::OnDropFiles(wxDropFilesEvent& event)
|
|||
|
||||
for(int i=0; i<count; ++i)
|
||||
{
|
||||
ConLog.Write("Importing '%s'", dropped[i].mb_str());
|
||||
ConLog.Write("Importing '%s'", dropped[i].wx_str());
|
||||
Import(dropped[i], wxFileName(dropped[i]).GetFullName());
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -336,14 +336,14 @@ bool ELF64Loader::LoadPhdrData(u64 offset)
|
|||
stub.s_text = re(stub.s_text);
|
||||
|
||||
const wxString& module_name = Memory.ReadString(stub.s_modulename);
|
||||
Module* module = GetModuleByName(module_name.mb_str());
|
||||
Module* module = GetModuleByName(module_name.ToStdString());
|
||||
if(module)
|
||||
{
|
||||
//module->SetLoaded();
|
||||
}
|
||||
else
|
||||
{
|
||||
ConLog.Warning("Unknown module '%s'", module_name.mb_str());
|
||||
ConLog.Warning("Unknown module '%s'", module_name.wx_str());
|
||||
}
|
||||
|
||||
#ifdef LOADER_DEBUG
|
||||
|
|
@ -353,7 +353,7 @@ bool ELF64Loader::LoadPhdrData(u64 offset)
|
|||
ConLog.Write("*** unk0: 0x%x", stub.s_unk0);
|
||||
ConLog.Write("*** unk1: 0x%x", stub.s_unk1);
|
||||
ConLog.Write("*** imports: %d", stub.s_imports);
|
||||
ConLog.Write("*** module name: %s [0x%x]", module_name.mb_str(), stub.s_modulename);
|
||||
ConLog.Write("*** module name: %s [0x%x]", module_name.wx_str(), stub.s_modulename);
|
||||
ConLog.Write("*** nid: 0x%x", stub.s_nid);
|
||||
ConLog.Write("*** text: 0x%x", stub.s_text);
|
||||
#endif
|
||||
|
|
@ -370,7 +370,7 @@ bool ELF64Loader::LoadPhdrData(u64 offset)
|
|||
{
|
||||
if(!module->Load(nid))
|
||||
{
|
||||
ConLog.Warning("Unknown function 0x%08x in '%s' module", nid, module_name.mb_str());
|
||||
ConLog.Warning("Unknown function 0x%08x in '%s' module", nid, module_name.wx_str());
|
||||
SysCalls::DoFunc(nid);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -72,7 +72,7 @@ const wxString Phdr_FlagsToString(u32 flags)
|
|||
flags &= ~spu << 0x14;
|
||||
flags &= ~rsx << 0x18;
|
||||
|
||||
if(flags != 0) return wxString::Format("Unknown %s PPU[%x] SPU[%x] RSX[%x]", ret.mb_str(), ppu, spu, rsx);
|
||||
if(flags != 0) return wxString::Format("Unknown %s PPU[%x] SPU[%x] RSX[%x]", ret.wx_str(), ppu, spu, rsx);
|
||||
|
||||
ret += "PPU[" + FLAGS_TO_STRING(ppu) + "] ";
|
||||
ret += "SPU[" + FLAGS_TO_STRING(spu) + "] ";
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@ struct PsfEntry
|
|||
return FormatString();
|
||||
|
||||
case 0x0404:
|
||||
return wxString::Format("0x%x", FormatInteger()).c_str();
|
||||
return wxString::Format("0x%x", FormatInteger()).ToStdString();
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -27,20 +27,20 @@
|
|||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
||||
<ConfigurationType>Application</ConfigurationType>
|
||||
<UseDebugLibraries>true</UseDebugLibraries>
|
||||
<CharacterSet>MultiByte</CharacterSet>
|
||||
<CharacterSet>Unicode</CharacterSet>
|
||||
<PlatformToolset>v110</PlatformToolset>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
|
||||
<ConfigurationType>Application</ConfigurationType>
|
||||
<UseDebugLibraries>true</UseDebugLibraries>
|
||||
<CharacterSet>MultiByte</CharacterSet>
|
||||
<CharacterSet>Unicode</CharacterSet>
|
||||
<PlatformToolset>v110</PlatformToolset>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
|
||||
<ConfigurationType>Application</ConfigurationType>
|
||||
<UseDebugLibraries>false</UseDebugLibraries>
|
||||
<WholeProgramOptimization>true</WholeProgramOptimization>
|
||||
<CharacterSet>MultiByte</CharacterSet>
|
||||
<CharacterSet>Unicode</CharacterSet>
|
||||
<PlatformToolset>v110</PlatformToolset>
|
||||
<CLRSupport>false</CLRSupport>
|
||||
</PropertyGroup>
|
||||
|
|
@ -48,7 +48,7 @@
|
|||
<ConfigurationType>Application</ConfigurationType>
|
||||
<UseDebugLibraries>false</UseDebugLibraries>
|
||||
<WholeProgramOptimization>true</WholeProgramOptimization>
|
||||
<CharacterSet>MultiByte</CharacterSet>
|
||||
<CharacterSet>Unicode</CharacterSet>
|
||||
<PlatformToolset>v110</PlatformToolset>
|
||||
<CLRSupport>false</CLRSupport>
|
||||
</PropertyGroup>
|
||||
|
|
@ -105,12 +105,14 @@
|
|||
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
|
||||
<PrecompiledHeader>Use</PrecompiledHeader>
|
||||
<BufferSecurityCheck>true</BufferSecurityCheck>
|
||||
<AdditionalIncludeDirectories>..\wxWidgets\include\msvc</AdditionalIncludeDirectories>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||
<AdditionalDependencies>adv.lib;base.lib;core.lib;aui.lib;wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;odbc32.lib;odbccp32.lib;comctl32.lib;ws2_32.lib;shlwapi.lib;winmm.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
<AdditionalDependencies>wxmsw31ud_adv.lib;wxbase31ud.lib;wxmsw31ud_core.lib;wxmsw31ud_aui.lib;wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;odbc32.lib;odbccp32.lib;comctl32.lib;ws2_32.lib;shlwapi.lib;winmm.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
<IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
|
||||
<DataExecutionPrevention>false</DataExecutionPrevention>
|
||||
<AdditionalLibraryDirectories>..\wxWidgets\lib\vc_lib</AdditionalLibraryDirectories>
|
||||
</Link>
|
||||
<PreBuildEvent>
|
||||
<Command>
|
||||
|
|
@ -123,12 +125,14 @@
|
|||
<Optimization>Disabled</Optimization>
|
||||
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
|
||||
<PrecompiledHeader>Use</PrecompiledHeader>
|
||||
<AdditionalIncludeDirectories>..\wxWidgets\include\msvc</AdditionalIncludeDirectories>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||
<AdditionalDependencies>adv.lib;base.lib;core.lib;aui.lib;wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;odbc32.lib;odbccp32.lib;comctl32.lib;ws2_32.lib;shlwapi.lib;winmm.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
<AdditionalDependencies>wxmsw31ud_adv.lib;wxbase31ud.lib;wxmsw31ud_core.lib;wxmsw31ud_aui.lib;wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;odbc32.lib;odbccp32.lib;comctl32.lib;ws2_32.lib;shlwapi.lib;winmm.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
<IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
|
||||
<DataExecutionPrevention>false</DataExecutionPrevention>
|
||||
<AdditionalLibraryDirectories>..\wxWidgets\lib\vc_x64_lib</AdditionalLibraryDirectories>
|
||||
</Link>
|
||||
<PreBuildEvent>
|
||||
<Command>"$(SolutionDir)\Utilities\git-version-gen.cmd"</Command>
|
||||
|
|
@ -140,8 +144,7 @@
|
|||
<Optimization>Full</Optimization>
|
||||
<FunctionLevelLinking>true</FunctionLevelLinking>
|
||||
<IntrinsicFunctions>true</IntrinsicFunctions>
|
||||
<AdditionalIncludeDirectories>
|
||||
</AdditionalIncludeDirectories>
|
||||
<AdditionalIncludeDirectories>..\wxWidgets\include\msvc</AdditionalIncludeDirectories>
|
||||
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
|
||||
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<DisableLanguageExtensions>false</DisableLanguageExtensions>
|
||||
|
|
@ -155,11 +158,12 @@
|
|||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
||||
<OptimizeReferences>true</OptimizeReferences>
|
||||
<AdditionalDependencies>adv.lib;base.lib;core.lib;aui.lib;odbc32.lib;odbccp32.lib;comctl32.lib;ws2_32.lib;shlwapi.lib;winmm.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregex.lib;wxexpat.lib;wsock32.lib;wininet.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
<AdditionalDependencies>wxmsw31u_adv.lib;wxbase31u.lib;wxmsw31u_core.lib;wxmsw31u_aui.lib;odbc32.lib;odbccp32.lib;comctl32.lib;ws2_32.lib;shlwapi.lib;winmm.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregexu.lib;wxexpat.lib;wsock32.lib;wininet.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
<IgnoreAllDefaultLibraries>
|
||||
</IgnoreAllDefaultLibraries>
|
||||
<IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
|
||||
<DataExecutionPrevention>false</DataExecutionPrevention>
|
||||
<AdditionalLibraryDirectories>..\wxWidgets\lib\vc_lib</AdditionalLibraryDirectories>
|
||||
</Link>
|
||||
<PreBuildEvent>
|
||||
<Command>
|
||||
|
|
@ -172,8 +176,7 @@
|
|||
<Optimization>Full</Optimization>
|
||||
<FunctionLevelLinking>true</FunctionLevelLinking>
|
||||
<IntrinsicFunctions>true</IntrinsicFunctions>
|
||||
<AdditionalIncludeDirectories>
|
||||
</AdditionalIncludeDirectories>
|
||||
<AdditionalIncludeDirectories>..\wxWidgets\include\msvc</AdditionalIncludeDirectories>
|
||||
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
|
||||
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<DisableLanguageExtensions>false</DisableLanguageExtensions>
|
||||
|
|
@ -187,11 +190,12 @@
|
|||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
||||
<OptimizeReferences>true</OptimizeReferences>
|
||||
<AdditionalDependencies>adv.lib;base.lib;core.lib;aui.lib;odbc32.lib;odbccp32.lib;comctl32.lib;ws2_32.lib;shlwapi.lib;winmm.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregex.lib;wxexpat.lib;wsock32.lib;wininet.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
<AdditionalDependencies>wxmsw31u_adv.lib;wxbase31u.lib;wxmsw31u_core.lib;wxmsw31u_aui.lib;odbc32.lib;odbccp32.lib;comctl32.lib;ws2_32.lib;shlwapi.lib;winmm.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregexu.lib;wxexpat.lib;wsock32.lib;wininet.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
<IgnoreAllDefaultLibraries>
|
||||
</IgnoreAllDefaultLibraries>
|
||||
<IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
|
||||
<DataExecutionPrevention>false</DataExecutionPrevention>
|
||||
<AdditionalLibraryDirectories>..\wxWidgets\lib\vc_x64_lib</AdditionalLibraryDirectories>
|
||||
</Link>
|
||||
<PreBuildEvent>
|
||||
<Command>
|
||||
|
|
|
|||
|
|
@ -3,19 +3,19 @@
|
|||
#define NOMINMAX
|
||||
|
||||
#ifndef QT_UI
|
||||
#include <wx/string.h>
|
||||
|
||||
#include <wx/msw/setup.h>
|
||||
#include <wx/wx.h>
|
||||
#include <wx/string.h>
|
||||
#include <wx/propdlg.h>
|
||||
#include <wx/stdpaths.h>
|
||||
#include <wx/filename.h>
|
||||
|
||||
#include <wx/wfstream.h>
|
||||
#include <wx/dir.h>
|
||||
#include <wx/generic/progdlgg.h>
|
||||
#include <wx/spinctrl.h>
|
||||
#include <wx/datetime.h>
|
||||
#include <wx/filepicker.h>
|
||||
#include <wx/menuitem.h>
|
||||
|
||||
#include <wx/wxprec.h>
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -17,6 +17,8 @@
|
|||
#include "ps3_common.h"
|
||||
#include "oddkeys.h"
|
||||
|
||||
#include <wx/progdlg.h> //in a *.c file ?
|
||||
|
||||
static void hash_tostring(char *str, u8 *hash, u32 len)
|
||||
{
|
||||
u8 *p;
|
||||
|
|
|
|||
|
|
@ -0,0 +1 @@
|
|||
Subproject commit eb5f4545297a32d04a35a360919e908dbea3dfca
|
||||
|
|
@ -1,24 +0,0 @@
|
|||
/* XPM */
|
||||
static const char * addbookm_xpm[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"16 15 3 1",
|
||||
". c Black",
|
||||
"X c #00C000",
|
||||
" c None",
|
||||
/* pixels */
|
||||
" ....... ",
|
||||
" .XXXXX. ",
|
||||
" .. .XXXXX. ",
|
||||
" .. .XXXXX. ",
|
||||
" ...... .XXXXX. ",
|
||||
" ...... .XXXXX. ",
|
||||
" .. .XXXXX. ",
|
||||
" .. .XXXXX. ",
|
||||
" .XXXXX. ",
|
||||
" .XXXXX. ",
|
||||
" .XXXXX. ",
|
||||
" .XXXXX. ",
|
||||
" .XX.XX. ",
|
||||
" .X. .X. ",
|
||||
" .. .. "
|
||||
};
|
||||
|
|
@ -1,21 +0,0 @@
|
|||
/* XPM */
|
||||
static const char * back_xpm[] = {
|
||||
"16 15 3 1",
|
||||
" c None",
|
||||
". c Black",
|
||||
"X c Gray100",
|
||||
" ",
|
||||
" ",
|
||||
" . ",
|
||||
" .. ",
|
||||
" .X. ",
|
||||
" .XX........ ",
|
||||
" .XXXXXXXXXX. ",
|
||||
" .XXXXXXXXXXX. ",
|
||||
" .XXXXXXXXXXX. ",
|
||||
" .XXXXXXXXXX. ",
|
||||
" .XX........ ",
|
||||
" .X. ",
|
||||
" .. ",
|
||||
" . ",
|
||||
" "};
|
||||
|
|
@ -1,57 +0,0 @@
|
|||
/* XPM */
|
||||
static const char * cdrom_xpm[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"16 15 36 1",
|
||||
"= c #9BACC2",
|
||||
"y c #547B99",
|
||||
"$ c #FFFFFF",
|
||||
"@ c #839CB5",
|
||||
"o c #547897",
|
||||
"4 c #4D7492",
|
||||
"% c #F1F4F7",
|
||||
"X c #5A809C",
|
||||
"< c #8497A5",
|
||||
"0 c #7898AD",
|
||||
"+ c #CAD2DC",
|
||||
"r c #ACAEB2",
|
||||
"2 c #BECAD9",
|
||||
"* c #65839D",
|
||||
"e c #DCE2EA",
|
||||
"- c #ADBED2",
|
||||
"t c #597B9A",
|
||||
" c None",
|
||||
"1 c #467291",
|
||||
"9 c #D6DFE7",
|
||||
"O c #7393AB",
|
||||
"u c #49708B",
|
||||
"5 c #A0BACB",
|
||||
"& c #AABFCD",
|
||||
"8 c #B9CBD5",
|
||||
"; c #B4C4D3",
|
||||
": c #6F90A6",
|
||||
"3 c #A8B6CA",
|
||||
"# c #ADBACE",
|
||||
"w c #E4E9ED",
|
||||
". c #8EA9BC",
|
||||
"> c #B3BFD1",
|
||||
", c #C2CBDB",
|
||||
"6 c #C0D1DC",
|
||||
"7 c #A2B3C5",
|
||||
"q c #5D7C93",
|
||||
/* pixels */
|
||||
" .XooOo+ ",
|
||||
" X@#$$$%o& ",
|
||||
" *=-;$$$$$o+ ",
|
||||
" +O#;-$$$$$$: ",
|
||||
" o=>,-<1<$2-o ",
|
||||
" o3>--1$122-* ",
|
||||
" o=--$<4<22-X ",
|
||||
" o5$$$$$26;7* ",
|
||||
" X%$$$$2;-X8 ",
|
||||
" 90*9$$$-7Xqo ",
|
||||
" wXwe@O44X4<r<o ",
|
||||
" X8628>22222<<*4",
|
||||
" ttyyyoo4441uuuo",
|
||||
" t>$$$$$$$$$$$>o",
|
||||
" XXXtyyyoo44411u"
|
||||
};
|
||||
|
|
@ -1,44 +0,0 @@
|
|||
/* XPM */
|
||||
static const char * copy_xpm[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"16 15 23 1",
|
||||
"o c #97C4E7",
|
||||
"* c #FFFFFF",
|
||||
"@ c #60A9DA",
|
||||
"= c #D1E5F5",
|
||||
"& c #C3DDF1",
|
||||
". c #7EA6C0",
|
||||
" c None",
|
||||
"X c #2F93CD",
|
||||
"O c #85BBE2",
|
||||
", c #EFF6FC",
|
||||
"; c #DEEDF8",
|
||||
"+ c #72B2DD",
|
||||
"3 c #F7FBFD",
|
||||
"4 c #FAFCFE",
|
||||
": c #DAEAF7",
|
||||
"< c #E9F3FA",
|
||||
"1 c #E2EFF8",
|
||||
"- c #FDFDFE",
|
||||
"% c #B6D5EE",
|
||||
"$ c #A5CCEA",
|
||||
"> c #E5F0F9",
|
||||
"# c #AFD1EC",
|
||||
"2 c #F4F9FD",
|
||||
/* pixels */
|
||||
" .....XX ",
|
||||
" .oO+@X#X ",
|
||||
" .$oO+X##X ",
|
||||
" .%$o........ ",
|
||||
" .&%$.*=&#o.-. ",
|
||||
" .=&%.*;=&#.--. ",
|
||||
" .:=&.*>;=&.... ",
|
||||
" .>:=.*,>;=&#o. ",
|
||||
" .<1:.*2,>:=&#. ",
|
||||
" .2<1.*32,>:=&. ",
|
||||
" .32<.*432,>:=. ",
|
||||
" .32<.*-432,>:. ",
|
||||
" .....**-432,>. ",
|
||||
" .***-432,. ",
|
||||
" .......... "
|
||||
};
|
||||
|
|
@ -1,17 +0,0 @@
|
|||
/* XPM */
|
||||
static const char * cross_xpm[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"10 10 2 1",
|
||||
" c Gray0",
|
||||
"# c None",
|
||||
/* pixels */
|
||||
" ######## ",
|
||||
" #### ",
|
||||
"# ## #",
|
||||
"## ##",
|
||||
"### ###",
|
||||
"### ###",
|
||||
"## ##",
|
||||
"# ## #",
|
||||
" #### ",
|
||||
" ###### "};
|
||||
|
|
@ -1,46 +0,0 @@
|
|||
/* XPM */
|
||||
static const char * cut_xpm[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"16 15 25 1",
|
||||
"6 c #D8BDC0",
|
||||
": c #C3C3C4",
|
||||
"- c #FFFFFF",
|
||||
". c #6C6D70",
|
||||
"2 c #AD3A45",
|
||||
"o c #DBDBDB",
|
||||
"# c #939495",
|
||||
"< c #E42234",
|
||||
"& c #C3C5C8",
|
||||
"; c #C6CCD3",
|
||||
"% c #B7B7B8",
|
||||
" c None",
|
||||
"* c #DFE0E2",
|
||||
"5 c #B69596",
|
||||
"3 c #9C2A35",
|
||||
"1 c #CFCFD0",
|
||||
", c #AB5C64",
|
||||
"+ c #D2D3D4",
|
||||
"$ c #BCBDBE",
|
||||
"@ c #C6C8CA",
|
||||
"> c #CDC0C1",
|
||||
"O c #826F72",
|
||||
"X c #979BA0",
|
||||
"4 c #9B8687",
|
||||
"= c #9FA0A0",
|
||||
/* pixels */
|
||||
" .X .o ",
|
||||
" O.+ @. ",
|
||||
" O. .. ",
|
||||
" O#$ %.& ",
|
||||
" O.*.. ",
|
||||
" #%#.. ",
|
||||
" O=-.. ",
|
||||
" #%#;. ",
|
||||
" OO:=O ",
|
||||
" >,,<, ,<,,1 ",
|
||||
" ><23<1 1<32<1 ",
|
||||
" ,2 4< <5 2, ",
|
||||
" <, ,2 2, ,< ",
|
||||
" 23,<5 5<,32 ",
|
||||
" 6225 522> "
|
||||
};
|
||||
|
|
@ -1,54 +0,0 @@
|
|||
/* XPM */
|
||||
static const char * deffile_xpm[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"16 16 32 1",
|
||||
"= c #97C4E7",
|
||||
": c #72A8D2",
|
||||
"1 c #FFFFFF",
|
||||
"w c #839CB5",
|
||||
"X c #6B98B8",
|
||||
". c #5A89A6",
|
||||
"@ c #3A749C",
|
||||
", c #D1E5F5",
|
||||
"< c #67A1CF",
|
||||
"> c #F1F4F7",
|
||||
"e c #85A7BC",
|
||||
"% c #C3DDF1",
|
||||
"0 c #749BB4",
|
||||
"2 c #7EA6C0",
|
||||
"; c #5F9BC8",
|
||||
" c None",
|
||||
"O c #538DB3",
|
||||
"- c #85BBE2",
|
||||
"$ c #D6DFE7",
|
||||
"9 c #EFF6FC",
|
||||
"o c #6591AE",
|
||||
"4 c #F7FBFD",
|
||||
"8 c #FAFCFE",
|
||||
"6 c #DAEAF7",
|
||||
"7 c #E9F3FA",
|
||||
"q c #FDFDFE",
|
||||
"3 c #E2EFF8",
|
||||
"# c #8EA9BC",
|
||||
"& c #B6D5EE",
|
||||
"* c #A5CCEA",
|
||||
"5 c #F4F9FD",
|
||||
"+ c #4581AA",
|
||||
/* pixels */
|
||||
" ..XooO+@#$ ",
|
||||
" .%%&*=-;:;> ",
|
||||
" .,,%&*=<1=X> ",
|
||||
" #%%%%&*211=X ",
|
||||
" #3-----<oXoO ",
|
||||
" #3456,%&*=-O ",
|
||||
" #3--------=O ",
|
||||
" #355736,%&*o ",
|
||||
" #3--------&o ",
|
||||
" #38459736,%X ",
|
||||
" #3--------,0 ",
|
||||
" #31q84597360 ",
|
||||
" #3--------3w ",
|
||||
" #3111q84597e ",
|
||||
" ##########e# ",
|
||||
" "
|
||||
};
|
||||
|
|
@ -1,24 +0,0 @@
|
|||
/* XPM */
|
||||
static const char * delbookm_xpm[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"16 15 3 1",
|
||||
". c Black",
|
||||
" c None",
|
||||
"X c #FF4040",
|
||||
/* pixels */
|
||||
" ....... ",
|
||||
" .XXXXX. ",
|
||||
" . . .XXXXX. ",
|
||||
" .. .. .XXXXX. ",
|
||||
" ... .XXXXX. ",
|
||||
" . .XXXXX. ",
|
||||
" ... .XXXXX. ",
|
||||
" .. .. .XXXXX. ",
|
||||
" . . .XXXXX. ",
|
||||
" .XXXXX. ",
|
||||
" .XXXXX. ",
|
||||
" .XXXXX. ",
|
||||
" .XX.XX. ",
|
||||
" .X. .X. ",
|
||||
" .. .. "
|
||||
};
|
||||
|
|
@ -1,42 +0,0 @@
|
|||
/* XPM */
|
||||
static const char * delete_xpm[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"16 15 21 1",
|
||||
"2 c #A5AEBD",
|
||||
"* c #5478B4",
|
||||
"< c #95A3BB",
|
||||
"O c #9AA7BC",
|
||||
"; c #758EB7",
|
||||
"$ c #6986B6",
|
||||
"# c #4971B2",
|
||||
"& c #8A9CBA",
|
||||
"X c #8598B9",
|
||||
" c None",
|
||||
"o c #ABB2BE",
|
||||
"- c #7F95B9",
|
||||
"= c #4E74B3",
|
||||
"1 c #A0ABBC",
|
||||
"+ c #6F8AB7",
|
||||
". c #B5B9BF",
|
||||
"@ c #3E69B1",
|
||||
", c #90A0BA",
|
||||
": c #6483B5",
|
||||
"> c #5A7BB4",
|
||||
"% c #5F7FB5",
|
||||
/* pixels */
|
||||
" ",
|
||||
" .Xo OO ",
|
||||
" +@#. $@% ",
|
||||
" &@@X .*@*o ",
|
||||
" =@= .*@*. ",
|
||||
" -@@X*@*. ",
|
||||
" .#@@@$. ",
|
||||
" ;@@: ",
|
||||
" ;@@@+ ",
|
||||
" .>@#%@@. ",
|
||||
" o*@*oO@@, ",
|
||||
" <#@*. .@@= ",
|
||||
"&@@$ :@@1 ",
|
||||
";#& 2#>. ",
|
||||
" "
|
||||
};
|
||||
|
|
@ -1,52 +0,0 @@
|
|||
/* XPM */
|
||||
static const char * dir_up_xpm[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"16 15 31 1",
|
||||
"6 c #9BACC2",
|
||||
"o c #9AEA53",
|
||||
"7 c #94A5BD",
|
||||
"8 c #547897",
|
||||
"5 c #839CB5",
|
||||
"@ c #376485",
|
||||
"$ c #5A809C",
|
||||
"# c #7F99B4",
|
||||
": c #D1D9E5",
|
||||
"< c #EAEDF3",
|
||||
"& c #446A8C",
|
||||
"q c #65839D",
|
||||
"> c #DCE2EA",
|
||||
", c #E1E6EE",
|
||||
"2 c #F5F6F7",
|
||||
"O c #8DA0B9",
|
||||
" c None",
|
||||
"% c #467291",
|
||||
". c #305F81",
|
||||
"X c #7393AB",
|
||||
"+ c #6A89A2",
|
||||
"4 c #A8B6CA",
|
||||
"1 c #EEF1F3",
|
||||
"3 c #F8F9FA",
|
||||
"0 c #215579",
|
||||
"9 c #7F97B0",
|
||||
"* c #B3BFD1",
|
||||
"w c #7A90AC",
|
||||
"- c #C2CBDB",
|
||||
"; c #CAD6E1",
|
||||
"= c #BBC4D6",
|
||||
/* pixels */
|
||||
" .. ",
|
||||
" X.o. ",
|
||||
".... X.ooo. ",
|
||||
".OO+....ooooo. ",
|
||||
".OOOOOO@@ooo.. ",
|
||||
".OOOO#OO@ooo.$ ",
|
||||
".OOOOOOO@ooo.$ ",
|
||||
".O%............&",
|
||||
".O&*=-;:>,<1231.",
|
||||
".+.4*=-;:>,<12$.",
|
||||
"..564*=-;:>,<1. ",
|
||||
".@O764*=-;:>,<. ",
|
||||
".89O764*=-;:>$$ ",
|
||||
"0qw9O764*=-;:. ",
|
||||
"0............. "
|
||||
};
|
||||
|
|
@ -1,21 +0,0 @@
|
|||
/* XPM */
|
||||
static const char * down_xpm[] = {
|
||||
"16 15 3 1",
|
||||
" c None",
|
||||
". c Black",
|
||||
"X c Gray100",
|
||||
" ",
|
||||
" ...... ",
|
||||
" .XXXX. ",
|
||||
" .XXXX. ",
|
||||
" .XXXX. ",
|
||||
" .XXXX. ",
|
||||
" .XXXX. ",
|
||||
" .XXXX. ",
|
||||
" ....XXXX.... ",
|
||||
" .XXXXXXXX. ",
|
||||
" .XXXXXX. ",
|
||||
" .XXXX. ",
|
||||
" .XX. ",
|
||||
" .. ",
|
||||
" "};
|
||||
|
|
@ -1,73 +0,0 @@
|
|||
/* XPM */
|
||||
static const char * exefile_xpm[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"16 16 51 1",
|
||||
"% c #E8E8EC",
|
||||
"= c #E8E8ED",
|
||||
"z c #CACAD4",
|
||||
"8 c #D9D9E1",
|
||||
"p c #D2D2DA",
|
||||
"u c #E1E1E7",
|
||||
"a c #D2D2DB",
|
||||
"< c #E9E9ED",
|
||||
"q c #DADAE1",
|
||||
"+ c #F1F1F4",
|
||||
"g c #D3D3DB",
|
||||
"1 c #E2E2E8",
|
||||
"x c #D3D3DC",
|
||||
"5 c #00A5FF",
|
||||
"$ c #EAEAEE",
|
||||
"4 c #DBDBE2",
|
||||
"h c #CCCCD6",
|
||||
"y c #D4D4DC",
|
||||
"r c #E3E3E9",
|
||||
"d c #D4D4DD",
|
||||
"7 c #DCDCE2",
|
||||
": c #EBEBEF",
|
||||
"0 c #DCDCE3",
|
||||
" c None",
|
||||
"O c #F3F3F5",
|
||||
"> c #E4E4E9",
|
||||
"& c #F3F3F6",
|
||||
"j c #D5D5DD",
|
||||
"6 c #E4E4EA",
|
||||
". c #C6C6D5",
|
||||
"# c #ECECF0",
|
||||
"f c #CECED7",
|
||||
"l c #CECED8",
|
||||
"e c #D6D6DE",
|
||||
"; c #EDEDF0",
|
||||
"3 c #DEDEE4",
|
||||
", c #EDEDF1",
|
||||
"c c #CFCFD8",
|
||||
"o c #F5F5F7",
|
||||
"- c #E6E6EB",
|
||||
"w c #D7D7DF",
|
||||
"v c #C8C8D3",
|
||||
"i c #DFDFE5",
|
||||
"@ c #EEEEF2",
|
||||
"s c #D0D0D9",
|
||||
"X c #9494AD",
|
||||
"9 c #D8D8DF",
|
||||
"t c #D8D8E0",
|
||||
"* c #EFEFF2",
|
||||
"2 c #E0E0E6",
|
||||
"k c #D1D1DA",
|
||||
/* pixels */
|
||||
" ........X ",
|
||||
" .oO+@#$%XX ",
|
||||
" .&+*#$=-XXX ",
|
||||
" .+*;:=->XXXX ",
|
||||
" .*,:<->1234X ",
|
||||
" .,5:5612378X ",
|
||||
" 5,5559530qwX ",
|
||||
" 55555550q9eX ",
|
||||
" 5555r5555teyX ",
|
||||
" 55rui559eypX ",
|
||||
" 5555i5555yasX ",
|
||||
" 5555555dasfX ",
|
||||
" 5355595gsfhX ",
|
||||
" .3595jgklhzX ",
|
||||
" .0qwjxkchzvX ",
|
||||
" XXXXXXXXXXXX "
|
||||
};
|
||||
|
|
@ -1,57 +0,0 @@
|
|||
/* XPM */
|
||||
static const char * fileopen_xpm[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"16 15 36 1",
|
||||
"6 c #9BACC2",
|
||||
"< c #9AEA53",
|
||||
"9 c #94A5BD",
|
||||
"5 c #839CB5",
|
||||
"; c #4D7492",
|
||||
". c #376485",
|
||||
"$ c #7F99B4",
|
||||
"r c #D1D9E5",
|
||||
"7 c #EAEDF3",
|
||||
"@ c #CAD2DC",
|
||||
"% c #718BA7",
|
||||
"t c #BECAD9",
|
||||
"& c #65839D",
|
||||
"0 c #DCE2EA",
|
||||
"4 c #F5F6F7",
|
||||
"w c #597B9A",
|
||||
"O c #8DA0B9",
|
||||
" c None",
|
||||
"+ c #467291",
|
||||
"u c #305F81",
|
||||
"= c #B4C4D3",
|
||||
"# c #CAE2AA",
|
||||
"1 c #FAFCFE",
|
||||
"3 c #A8B6CA",
|
||||
"q c #E4E9ED",
|
||||
"8 c #EEF1F3",
|
||||
"X c #215579",
|
||||
"2 c #7F97B0",
|
||||
": c #B3BFD1",
|
||||
"y c #7A90AC",
|
||||
", c #C2CBDB",
|
||||
"- c #ADD668",
|
||||
"* c #B6D791",
|
||||
"e c #CAD6E1",
|
||||
"o c #DFF0D0",
|
||||
"> c #BBC4D6",
|
||||
/* pixels */
|
||||
" ",
|
||||
" .... ",
|
||||
"XXXXX .oo. ",
|
||||
"XOOOO+@.#o. ",
|
||||
"XOOOO$%&.*oXXX ",
|
||||
"XOOOOOOO.*oX=X ",
|
||||
"XOXXXX...-oXXXX;",
|
||||
"XOX:>,.<<<<<oX1;",
|
||||
"X2X3:>,.<<<oX4=;",
|
||||
"XX563:>>.<oX78; ",
|
||||
"XXO963:>>.X0q7; ",
|
||||
"Xw2O963:>>er0t; ",
|
||||
"X&y2O963:>,er; ",
|
||||
"uXXXXXXXXXXXX; ",
|
||||
" "
|
||||
};
|
||||
|
|
@ -1,42 +0,0 @@
|
|||
/* XPM */
|
||||
static const char * filesave_xpm[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"16 15 21 1",
|
||||
"O c #FFFFFF",
|
||||
"> c #D5D6D8",
|
||||
"; c #446A8C",
|
||||
"1 c #CAD2DC",
|
||||
": c #C0C7D1",
|
||||
" c #5F666D",
|
||||
"% c #A5B0BA",
|
||||
"o c #65839D",
|
||||
", c #DCE2EA",
|
||||
"< c #C3C5C8",
|
||||
"- c #E1E6EE",
|
||||
"* c #C6CCD3",
|
||||
". c None",
|
||||
"$ c #305F81",
|
||||
"2 c #D6DFE7",
|
||||
"= c #D2D9E0",
|
||||
"& c #B7BFC7",
|
||||
"X c #1B4467",
|
||||
"# c #BCBDBE",
|
||||
"@ c #7A90AC",
|
||||
"+ c #5D7C93",
|
||||
/* pixels */
|
||||
" .",
|
||||
" XoOOOOOOOOO+X .",
|
||||
" @oO#######O+@ .",
|
||||
" @oOOOOOOOOO+@ .",
|
||||
" @oO#######O+@ .",
|
||||
" @oOOOOOOOOO+@ .",
|
||||
" @@+++++++++@@ .",
|
||||
" @@@@@@@@@@@@@ .",
|
||||
" @@@$$$$$$$$@@ .",
|
||||
" @@$%%%&*=-O$@ .",
|
||||
" @@$%X;;*=-O$@ .",
|
||||
" @@$%X;;:>,O$@ .",
|
||||
" @@$%X;;<12O$@ .",
|
||||
" @@$<<2OOOOO$@ .",
|
||||
". .."
|
||||
};
|
||||
|
|
@ -1,44 +0,0 @@
|
|||
/* XPM */
|
||||
static const char * filesaveas_xpm[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"16 15 23 1",
|
||||
"X c Black",
|
||||
"+ c #FFFFFF",
|
||||
"< c #D5D6D8",
|
||||
"> c #446A8C",
|
||||
"3 c #CAD2DC",
|
||||
", c #C0C7D1",
|
||||
" c #5F666D",
|
||||
"* c #A5B0BA",
|
||||
"O c #65839D",
|
||||
"1 c #DCE2EA",
|
||||
"2 c #C3C5C8",
|
||||
": c #E1E6EE",
|
||||
". c #FFFF00",
|
||||
"- c #C6CCD3",
|
||||
"@ c None",
|
||||
"& c #305F81",
|
||||
"4 c #D6DFE7",
|
||||
"; c #D2D9E0",
|
||||
"= c #B7BFC7",
|
||||
"o c #1B4467",
|
||||
"$ c #BCBDBE",
|
||||
"# c #7A90AC",
|
||||
"% c #5D7C93",
|
||||
/* pixels */
|
||||
" .X .XX.",
|
||||
" oO+++++++.X.X.@",
|
||||
" #O+$$$$$XX...XX",
|
||||
" #O++++++.......",
|
||||
" #O+$$$$$XX...XX",
|
||||
" #O+++++++.X.X.@",
|
||||
" ##%%%%%%.X%.X .",
|
||||
" ############# @",
|
||||
" ###&&&&&&&&## @",
|
||||
" ##&***=-;:+&# @",
|
||||
" ##&*o>>-;:+&# @",
|
||||
" ##&*o>>,<1+&# @",
|
||||
" ##&*o>>234+&# @",
|
||||
" ##&224+++++&# @",
|
||||
"@ @@"
|
||||
};
|
||||
|
|
@ -1,62 +0,0 @@
|
|||
/* XPM */
|
||||
static const char * find_xpm[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"16 15 41 1",
|
||||
"y c #A06959",
|
||||
"9 c #A7DAF2",
|
||||
"$ c #B5CAD7",
|
||||
"> c #35B4E1",
|
||||
"t c #6B98B8",
|
||||
"w c #B6E0F4",
|
||||
"q c #AEC9D7",
|
||||
"1 c #5A89A6",
|
||||
"+ c #98B3C6",
|
||||
"4 c #EAF6FC",
|
||||
"3 c #DEF1FA",
|
||||
"= c #4CBCE3",
|
||||
"d c #DB916B",
|
||||
"X c #85A7BC",
|
||||
"s c #D8BCA4",
|
||||
"o c #749BB4",
|
||||
"e c #BCD9EF",
|
||||
"* c #62B4DD",
|
||||
"< c #91D2EF",
|
||||
"a c #E6DED2",
|
||||
"0 c #E9F4FB",
|
||||
" c None",
|
||||
"@ c #A0BACB",
|
||||
"O c #AABFCD",
|
||||
"i c #6591AE",
|
||||
": c #B9CBD5",
|
||||
"- c #71C5E7",
|
||||
"5 c #D3ECF8",
|
||||
"% c #81A3B9",
|
||||
"6 c #8AD0EE",
|
||||
"8 c #FDFDFE",
|
||||
"p c #8EA9BC",
|
||||
"r c #B6D5EE",
|
||||
", c #81CCEB",
|
||||
". c #ACC4D3",
|
||||
"; c #AFD1DE",
|
||||
"7 c #EFF8FC",
|
||||
"u c #C2CBDB",
|
||||
"# c #C0D1DC",
|
||||
"2 c #CAD6E1",
|
||||
"& c #8FB0C3",
|
||||
/* pixels */
|
||||
" .XooXO ",
|
||||
" +@###$+% ",
|
||||
" .&#*==-;@@ ",
|
||||
" o:*>,<--:X ",
|
||||
" 12>-345-#% ",
|
||||
" 12>678392% ",
|
||||
" %$*,3059q& ",
|
||||
" @Oq,wwer@@ ",
|
||||
" t@q22q&+ ",
|
||||
" yyui+%o%p ",
|
||||
" yasy ",
|
||||
" yasdy ",
|
||||
" yasdy ",
|
||||
" ysdy ",
|
||||
" yy "
|
||||
};
|
||||
|
|
@ -1,63 +0,0 @@
|
|||
/* XPM */
|
||||
static const char * findrepl_xpm[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"16 15 42 1",
|
||||
"y c #A06959",
|
||||
"9 c #A7DAF2",
|
||||
"$ c #B5CAD7",
|
||||
"> c #35B4E1",
|
||||
"t c #6B98B8",
|
||||
"w c #B6E0F4",
|
||||
"q c #AEC9D7",
|
||||
"1 c #5A89A6",
|
||||
"+ c #98B3C6",
|
||||
"4 c #EAF6FC",
|
||||
"d c #008000",
|
||||
"3 c #DEF1FA",
|
||||
"= c #4CBCE3",
|
||||
"f c #DB916B",
|
||||
"X c #85A7BC",
|
||||
"s c #D8BCA4",
|
||||
"o c #749BB4",
|
||||
"e c #BCD9EF",
|
||||
"* c #62B4DD",
|
||||
"< c #91D2EF",
|
||||
"a c #E6DED2",
|
||||
"0 c #E9F4FB",
|
||||
" c None",
|
||||
"@ c #A0BACB",
|
||||
"O c #AABFCD",
|
||||
"i c #6591AE",
|
||||
": c #B9CBD5",
|
||||
"- c #71C5E7",
|
||||
"5 c #D3ECF8",
|
||||
"% c #81A3B9",
|
||||
"6 c #8AD0EE",
|
||||
"8 c #FDFDFE",
|
||||
"p c #8EA9BC",
|
||||
"r c #B6D5EE",
|
||||
", c #81CCEB",
|
||||
". c #ACC4D3",
|
||||
"; c #AFD1DE",
|
||||
"7 c #EFF8FC",
|
||||
"u c #C2CBDB",
|
||||
"# c #C0D1DC",
|
||||
"2 c #CAD6E1",
|
||||
"& c #8FB0C3",
|
||||
/* pixels */
|
||||
" .XooXO ",
|
||||
" +@###$+% ",
|
||||
" .&#*==-;@@ ",
|
||||
" o:*>,<--:X ",
|
||||
" 12>-345-#% ",
|
||||
" 12>678392% ",
|
||||
" %$*,3059q& ",
|
||||
" @Oq,wwer@@ ",
|
||||
" t@q22q&+ ",
|
||||
" yyui+%o%p ",
|
||||
" yasy d d ",
|
||||
" yasfy dd dd ",
|
||||
"yasfy ddddddddd",
|
||||
"ysfy dd dd ",
|
||||
" yy d d "
|
||||
};
|
||||
|
|
@ -1,39 +0,0 @@
|
|||
/* XPM */
|
||||
static const char * floppy_xpm[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"16 15 18 1",
|
||||
"& c #E3E4E6",
|
||||
"+ c #FFFFFF",
|
||||
". c #446A8C",
|
||||
"o c #697787",
|
||||
"> c #5F666D",
|
||||
"* c #B2B3B3",
|
||||
" c None",
|
||||
", c #4B4C4D",
|
||||
"= c #DCDBDA",
|
||||
"$ c #1B4467",
|
||||
": c #E4E9ED",
|
||||
"@ c #979BA0",
|
||||
"X c #203646",
|
||||
"O c #215579",
|
||||
"- c #545B63",
|
||||
"; c #636465",
|
||||
"# c #CAD6E1",
|
||||
"% c #7F8286",
|
||||
/* pixels */
|
||||
" .XoooooooXO ",
|
||||
" .o+++++++.O ",
|
||||
" .o+OOOOO+.O ",
|
||||
" .o+++++++.O ",
|
||||
" .o@@@@@@@.O ",
|
||||
" ..........O ",
|
||||
" ..#+++++#.O ",
|
||||
" ..+$O+++#.O ",
|
||||
" ..+$O+++#.O ",
|
||||
" %&.........*% ",
|
||||
"%=+++++++++++&% ",
|
||||
"--------------; ",
|
||||
"-:::::::::::::- ",
|
||||
"-:X:XXXXXXXXX:> ",
|
||||
"-*************, "
|
||||
};
|
||||
|
|
@ -1,43 +0,0 @@
|
|||
/* XPM */
|
||||
static const char * folder_xpm[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"16 15 22 1",
|
||||
"> c #9BACC2",
|
||||
". c #547897",
|
||||
"1 c #7F99B4",
|
||||
"X c #D1D9E5",
|
||||
"< c #EAEDF3",
|
||||
"+ c #CAD2DC",
|
||||
"3 c #718BA7",
|
||||
"O c #BECAD9",
|
||||
"$ c #E1E6EE",
|
||||
"* c #F5F6F7",
|
||||
", c #8DA0B9",
|
||||
" c None",
|
||||
"# c #D6DFE7",
|
||||
"@ c #D2D9E0",
|
||||
"- c #FAFCFE",
|
||||
"; c #ADBACE",
|
||||
"& c #EEF1F3",
|
||||
"= c #F8F9FA",
|
||||
"o c #B3BFD1",
|
||||
"2 c #7A90AC",
|
||||
": c #A2B3C5",
|
||||
"% c #E5EAF1",
|
||||
/* pixels */
|
||||
" ",
|
||||
" ..... ",
|
||||
" .XXXX. ",
|
||||
" ............. ",
|
||||
" .oO+@#$%&*=-. ",
|
||||
" .oO+@#$%&*=-. ",
|
||||
" .;oO+X#$%&*=. ",
|
||||
" .:;oO+X#$%&*. ",
|
||||
" .>:;oO+X#$%&. ",
|
||||
" .,>:;oO+X#$<. ",
|
||||
" .1,>:;oO+X#$. ",
|
||||
" .21,>:;oO+X#. ",
|
||||
" .321,>:;oO+X. ",
|
||||
" ............. ",
|
||||
" "
|
||||
};
|
||||
|
|
@ -1,52 +0,0 @@
|
|||
/* XPM */
|
||||
static const char * folder_open_xpm[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"16 15 31 1",
|
||||
"6 c #9BACC2",
|
||||
"w c #547B99",
|
||||
"5 c #94A5BD",
|
||||
". c #376485",
|
||||
"; c #F1F4F7",
|
||||
"o c #7F99B4",
|
||||
"2 c #D1D9E5",
|
||||
"- c #EAEDF3",
|
||||
"O c #718BA7",
|
||||
"0 c #65839D",
|
||||
"* c #DCE2EA",
|
||||
": c #F5F6F7",
|
||||
"7 c #597B9A",
|
||||
"X c #8DA0B9",
|
||||
" c None",
|
||||
"+ c #467291",
|
||||
"q c #305F81",
|
||||
"& c #D6DFE7",
|
||||
"3 c #6A89A2",
|
||||
"1 c #A8B6CA",
|
||||
"= c #E4E9ED",
|
||||
"> c #F8F9FA",
|
||||
", c #FDFDFE",
|
||||
"9 c #215579",
|
||||
"8 c #7F97B0",
|
||||
"@ c #B3BFD1",
|
||||
"< c #7A90AC",
|
||||
"$ c #C2CBDB",
|
||||
"4 c #A2B3C5",
|
||||
"% c #CAD6E1",
|
||||
"# c #BBC4D6",
|
||||
/* pixels */
|
||||
" ",
|
||||
"..... ",
|
||||
".XXXo. ",
|
||||
".XXXXO........ ",
|
||||
".XXXXXXXXXXXX. ",
|
||||
".XXXXXXXXXXXX. ",
|
||||
".X++++++++++++++",
|
||||
".X+@#$%&*=-;:>,+",
|
||||
".<.1@#$%2*=-;:23",
|
||||
"..X41@#$%2*=-;3 ",
|
||||
"..X561@#$%2*=-3 ",
|
||||
".78X561@#$%2*%3 ",
|
||||
"90<8X561@#$%23 ",
|
||||
"q++++++++++++w ",
|
||||
" "
|
||||
};
|
||||
|
|
@ -1,21 +0,0 @@
|
|||
/* XPM */
|
||||
static const char * forward_xpm[] = {
|
||||
"16 15 3 1",
|
||||
" c None",
|
||||
". c Black",
|
||||
"X c Gray100",
|
||||
" ",
|
||||
" ",
|
||||
" . ",
|
||||
" .. ",
|
||||
" .X. ",
|
||||
" ........XX. ",
|
||||
" .XXXXXXXXXX. ",
|
||||
" .XXXXXXXXXXX. ",
|
||||
" .XXXXXXXXXXX. ",
|
||||
" .XXXXXXXXXX. ",
|
||||
" ........XX. ",
|
||||
" .X. ",
|
||||
" .. ",
|
||||
" . ",
|
||||
" "};
|
||||
|
|
@ -1,60 +0,0 @@
|
|||
/* XPM */
|
||||
static const char * harddisk_xpm[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"16 15 39 1",
|
||||
"7 c #E3E4E6",
|
||||
"4 c #FFFFFF",
|
||||
"5 c #839CB5",
|
||||
". c #547897",
|
||||
"1 c #4D7492",
|
||||
"@ c #376485",
|
||||
"o c #7A92A3",
|
||||
"u c #D1D9E5",
|
||||
"y c #446A8C",
|
||||
"i c #51B03D",
|
||||
"> c #CAD2DC",
|
||||
"O c #718BA7",
|
||||
"2 c #65839D",
|
||||
"6 c #DCE2EA",
|
||||
"0 c #C3C5C8",
|
||||
"9 c #F5F6F7",
|
||||
": c #EBEBEC",
|
||||
"< c #597B9A",
|
||||
"t c #C6CCD3",
|
||||
" c None",
|
||||
"* c #DFE0E2",
|
||||
"e c #467291",
|
||||
"a c #526E8B",
|
||||
", c #7393AB",
|
||||
"p c #130A0B",
|
||||
"# c #AABFCD",
|
||||
"r c #B4C4D3",
|
||||
"; c #CFCFD0",
|
||||
"X c #6F90A6",
|
||||
"+ c #6A89A2",
|
||||
"- c #D2D3D4",
|
||||
"= c #DCDBDA",
|
||||
"w c #E4E9ED",
|
||||
"q c #C6C8CA",
|
||||
"% c #215579",
|
||||
"$ c #E7E7E7",
|
||||
"3 c #7F97B0",
|
||||
"8 c #C0D1DC",
|
||||
"& c #5D7C93",
|
||||
/* pixels */
|
||||
" ",
|
||||
" .XoooXO+@ ",
|
||||
" #$$%%%%$$$X ",
|
||||
" &$*==-;$$$& ",
|
||||
" &:>+,<1234o5 ",
|
||||
" ###+67;;78242 ",
|
||||
" &4,49*0q*9we4. ",
|
||||
" &4+49*,,*9wo4. ",
|
||||
"&4%r,67;;782t%4.",
|
||||
"&44468rrrr84444,",
|
||||
"y11111111111111e",
|
||||
"1uu1:::::::::::1",
|
||||
"1uu1::::::::ip:1",
|
||||
"auu&:::::::::::1",
|
||||
"1111111111111111"
|
||||
};
|
||||
|
|
@ -1,44 +0,0 @@
|
|||
/* XPM */
|
||||
static const char * helpicon_xpm[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"32 32 6 1",
|
||||
" c Gray0",
|
||||
". c Blue",
|
||||
"X c #808080808080",
|
||||
"o c #c0c0c0c0c0c0",
|
||||
"O c Gray100",
|
||||
"+ c None",
|
||||
/* pixels */
|
||||
"+++++++++++XXXXXXXX+++++++++++++",
|
||||
"++++++++XXXoOOOOOOoXXX++++++++++",
|
||||
"++++++XXoOOOOOOOOOOOOoXX++++++++",
|
||||
"+++++XoOOOOOOOOOOOOOOOOoX+++++++",
|
||||
"++++XOOOOOOOOOOOOOOOOOOOO ++++++",
|
||||
"+++XOOOOOOOo......oOOOOOOO +++++",
|
||||
"++XOOOOOOOo.oOO....oOOOOOOO ++++",
|
||||
"+XoOOOOOOO..OOOO....OOOOOOOo +++",
|
||||
"+XOOOOOOOO....OO....OOOOOOOO X++",
|
||||
"XoOOOOOOOO....Oo....OOOOOOOOo X+",
|
||||
"XOOOOOOOOOo..oO....OOOOOOOOOO X+",
|
||||
"XOOOOOOOOOOOOOo...OOOOOOOOOOO XX",
|
||||
"XOOOOOOOOOOOOO...OOOOOOOOOOOO XX",
|
||||
"XOOOOOOOOOOOOO..oOOOOOOOOOOOO XX",
|
||||
"XOOOOOOOOOOOOO..OOOOOOOOOOOOO XX",
|
||||
"XoOOOOOOOOOOOOOOOOOOOOOOOOOOo XX",
|
||||
"+XOOOOOOOOOOOo..oOOOOOOOOOOO XXX",
|
||||
"+XoOOOOOOOOOO....OOOOOOOOOOo XXX",
|
||||
"++XOOOOOOOOOO....OOOOOOOOOO XXX+",
|
||||
"+++ OOOOOOOOOo..oOOOOOOOOO XXXX+",
|
||||
"++++ OOOOOOOOOOOOOOOOOOOO XXXX++",
|
||||
"+++++ oOOOOOOOOOOOOOOOOo XXXX+++",
|
||||
"++++++ oOOOOOOOOOOOOo XXXX++++",
|
||||
"+++++++X oOOOOOOo XXXXX+++++",
|
||||
"++++++++XXX oOOO XXXXXXX++++++",
|
||||
"++++++++++XXXX OOO XXXXX++++++++",
|
||||
"+++++++++++++X OOO XX+++++++++++",
|
||||
"+++++++++++++++ OO XX+++++++++++",
|
||||
"++++++++++++++++ O XX+++++++++++",
|
||||
"+++++++++++++++++ XX+++++++++++",
|
||||
"++++++++++++++++++XXX+++++++++++",
|
||||
"+++++++++++++++++++XX+++++++++++"
|
||||
};
|
||||
|
|
@ -1,24 +0,0 @@
|
|||
/* XPM */
|
||||
static const char * home_xpm[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"16 15 3 1",
|
||||
". c Black",
|
||||
"X c #FFFFFF",
|
||||
" c None",
|
||||
/* pixels */
|
||||
" .... ",
|
||||
" .XXXX. ",
|
||||
" .XXXXXX. ",
|
||||
" .XXXXXXXX. ",
|
||||
" .XXXXXXXXXX. ",
|
||||
" .............. ",
|
||||
" .XXXXXXXXXXXX. ",
|
||||
" .XXXXXXXXXXXX. ",
|
||||
" .XXXXXXXXXXXX. ",
|
||||
" .X.....X....X. ",
|
||||
" .X. .X. .X. ",
|
||||
" .X. .X. .X. ",
|
||||
" .X.....X. .X. ",
|
||||
" .XXXXXXX. .X. ",
|
||||
" ......... ... "
|
||||
};
|
||||
|
|
@ -1,25 +0,0 @@
|
|||
/* XPM */
|
||||
static const char * htmbook_xpm[] = {
|
||||
"16 16 6 1",
|
||||
" c None",
|
||||
". c Black",
|
||||
"X c #000080",
|
||||
"o c #c0c0c0",
|
||||
"O c #808080",
|
||||
"+ c Gray100",
|
||||
" ",
|
||||
" .. ",
|
||||
" ..XX. ",
|
||||
" ..XXXXX. ",
|
||||
" ..XXXXXXXX. ",
|
||||
".oXXXXXXXXXX. ",
|
||||
".XoXXXXXXXXXX. ",
|
||||
".XXoXXXXXXXXXX. ",
|
||||
".XXXoXXXXXXXXX..",
|
||||
".XXXXoXXXXXX..O ",
|
||||
" .XXXXoXXX..O+O ",
|
||||
" .XXXXo..O++o..",
|
||||
" .XXX.O+++o.. ",
|
||||
" .XX.o+o.. ",
|
||||
" .X.o.. ",
|
||||
" ... "};
|
||||
|
|
@ -1,25 +0,0 @@
|
|||
/* XPM */
|
||||
static const char * htmfoldr_xpm[] = {
|
||||
"16 16 6 1",
|
||||
" c None",
|
||||
". c Black",
|
||||
"X c #000080",
|
||||
"o c #c0c0c0",
|
||||
"O c #808080",
|
||||
"+ c Gray100",
|
||||
" ",
|
||||
" .. ",
|
||||
" ..XX. ",
|
||||
" ..XXXXX. ",
|
||||
" ..XXXXXXXX. ",
|
||||
".oXXXXXXXXXX. ",
|
||||
".XoXXXXXXXXXX. ",
|
||||
".XXoXXXXXXXXXX. ",
|
||||
".XXXoXXXXXXXXX..",
|
||||
".XXXXoXXXXXX..O ",
|
||||
" .XXXXoXXX..O+O ",
|
||||
" .XXXXo..O++o..",
|
||||
" .XXX.O+++o.. ",
|
||||
" .XX.o+o.. ",
|
||||
" .X.o.. ",
|
||||
" ... "};
|
||||
|
|
@ -1,20 +0,0 @@
|
|||
/* XPM */
|
||||
static const char * htmoptns_xpm[] = {
|
||||
"16 15 2 1",
|
||||
" c None",
|
||||
". c #000000",
|
||||
" ",
|
||||
" .. ",
|
||||
" ... ",
|
||||
" .... ",
|
||||
" . ... ",
|
||||
" .. ... ",
|
||||
" . .. ",
|
||||
" .. ... ",
|
||||
" . .. ",
|
||||
" ......... ",
|
||||
" .. ... ",
|
||||
" . ... ",
|
||||
" .. ... ",
|
||||
" .... ....... ",
|
||||
" "};
|
||||
|
|
@ -1,23 +0,0 @@
|
|||
/* XPM */
|
||||
static const char * htmpage_xpm[] = {
|
||||
"16 16 4 1",
|
||||
" c None",
|
||||
". c #808080",
|
||||
"X c Gray100",
|
||||
"o c Black",
|
||||
" ",
|
||||
" .......... ",
|
||||
" .XXXXXXXX.. ",
|
||||
" .XXXXXXXXooo ",
|
||||
" .X......XXXo ",
|
||||
" .XXXXXXXXXXo ",
|
||||
" .X........Xo ",
|
||||
" .XXXXXXXXXXo ",
|
||||
" .X........Xo ",
|
||||
" .XXXXXXXXXXo ",
|
||||
" .X........Xo ",
|
||||
" .XXXXXXXXXXo ",
|
||||
" .X........Xo ",
|
||||
" .XXXXXXXXXXo ",
|
||||
" .XXXXXXXXXXo ",
|
||||
" oooooooooooo "};
|
||||
|
|
@ -1,27 +0,0 @@
|
|||
/* XPM */
|
||||
static const char * htmsidep_xpm[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"16 15 6 1",
|
||||
". c Black",
|
||||
"X c #FFFFFF",
|
||||
"+ c #808080",
|
||||
" c None",
|
||||
"O c #0000C0",
|
||||
"o c #C0C0C0",
|
||||
/* pixels */
|
||||
" ",
|
||||
" .............. ",
|
||||
" .XXXX.ooooooo. ",
|
||||
" .XOXX.oo...oo. ",
|
||||
" .XXOX.ooooooo. ",
|
||||
" .OOOO.o...+.o. ",
|
||||
" .XXOX.ooooooo. ",
|
||||
" .XOXX.ooooooo. ",
|
||||
" .XXXX.o..+ooo. ",
|
||||
" .XXOX.ooooooo. ",
|
||||
" .XOXX.o...+.o. ",
|
||||
" .OOOO.ooooooo. ",
|
||||
" .XOXX.o.+...o. ",
|
||||
" .XXOX.ooooooo. ",
|
||||
" .............. "
|
||||
};
|
||||
|
|
@ -1,25 +0,0 @@
|
|||
/* XPM */
|
||||
static const char * listview_xpm[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"16 15 4 1",
|
||||
" c Black",
|
||||
". c #FFFFFF",
|
||||
"X c #000084",
|
||||
"o c #848484",
|
||||
/* pixels */
|
||||
" ",
|
||||
" .............. ",
|
||||
" .XXX.......... ",
|
||||
" .XXX. o o . ",
|
||||
" .XXX.......... ",
|
||||
" .............. ",
|
||||
" .XXX.......... ",
|
||||
" .XXX. o . ",
|
||||
" .XXX.......... ",
|
||||
" .............. ",
|
||||
" .XXX.......... ",
|
||||
" .XXX. o o . ",
|
||||
" .XXX.......... ",
|
||||
" .............. ",
|
||||
" "
|
||||
};
|
||||
|
|
@ -1,43 +0,0 @@
|
|||
/* XPM */
|
||||
static const char * missimg_xpm[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"32 32 5 1",
|
||||
"X c Black",
|
||||
"o c #FFFFFF",
|
||||
" c None",
|
||||
". c #C0C0C0",
|
||||
"O c #E0E0E0",
|
||||
/* pixels */
|
||||
" .............................X ",
|
||||
" .ooooooooooooooooooooooooooooX ",
|
||||
" .ooooooooooooooooooooooooooooX ",
|
||||
" .ooOOOOOOOOOOOOOOOOOOOOOOOOooX ",
|
||||
" .ooOOOOOOOOOOOOOOOOOOOOOOOOooX ",
|
||||
" .ooOOOOOOOOOOOOOOOOOOOOOOOOooX ",
|
||||
" .ooOOOOOOOOOOOOOOOOOOOOOOOOooX ",
|
||||
" .ooOOOOOOOOOOOOOOOOOOOOOOOOooX ",
|
||||
" .ooOOOOOOOOOOOOOOOOOOOOOOOOooX ",
|
||||
" .ooOOOOOOOXOOOOOOOOOOOOOOOOooX ",
|
||||
" XXXOOOOOXX XOOOOOOOOOOOOOOOooX ",
|
||||
" XXXXX XOOOOOOOOOOOOOOooX ",
|
||||
" XOOOXXXOOOOOOOooX ",
|
||||
" XXX XXOOOOOooX ",
|
||||
" XOOOOooX ",
|
||||
" . XOOOooX ",
|
||||
" .. XXOooX ",
|
||||
" .o.. XooX ",
|
||||
" .ooO... XXX ",
|
||||
" .ooOOOO.......... ",
|
||||
" .ooOOOOOOOOOOOOOO.. ",
|
||||
" .ooOOOOOOOOOOOOOOOO.. ",
|
||||
" .ooOOOOOOOOOOOOOOOOOO......... ",
|
||||
" .ooOOOOOOOOOOOOOOOOOOOOOOOOooX ",
|
||||
" .ooOOOOOOOOOOOOOOOOOOOOOOOOooX ",
|
||||
" .ooOOOOOOOOOOOOOOOOOOOOOOOOooX ",
|
||||
" .ooOOOOOOOOOOOOOOOOOOOOOOOOooX ",
|
||||
" .ooOOOOOOOOOOOOOOOOOOOOOOOOooX ",
|
||||
" .ooOOOOOOOOOOOOOOOOOOOOOOOOooX ",
|
||||
" .ooooooooooooooooooooooooooooX ",
|
||||
" .ooooooooooooooooooooooooooooX ",
|
||||
" XXXXXXXXXXXXXXXXXXXXXXXXXXXXXX "
|
||||
};
|
||||
|
|
@ -1,50 +0,0 @@
|
|||
/* XPM */
|
||||
static const char * new_xpm[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"16 15 29 1",
|
||||
"* c #97C4E7",
|
||||
"- c #72A8D2",
|
||||
": c #FFFFFF",
|
||||
"9 c #839CB5",
|
||||
"o c #6B98B8",
|
||||
"X c #5A89A6",
|
||||
"# c #3A749C",
|
||||
", c #D1E5F5",
|
||||
"0 c #85A7BC",
|
||||
"$ c #C3DDF1",
|
||||
"8 c #749BB4",
|
||||
"; c #5F9BC8",
|
||||
" c None",
|
||||
"+ c #538DB3",
|
||||
"= c #85BBE2",
|
||||
"3 c #EFF6FC",
|
||||
"O c #6591AE",
|
||||
"5 c #F7FBFD",
|
||||
"7 c #FAFCFE",
|
||||
"< c #DAEAF7",
|
||||
"4 c #E9F3FA",
|
||||
"6 c #FDFDFE",
|
||||
"1 c #E2EFF8",
|
||||
". c #8EA9BC",
|
||||
"% c #B6D5EE",
|
||||
"& c #A5CCEA",
|
||||
"> c #ACE95B",
|
||||
"2 c #F4F9FD",
|
||||
"@ c #4581AA",
|
||||
/* pixels */
|
||||
" .XoOO+@#. ",
|
||||
" .$$%&*=O-; ",
|
||||
" @@@@$%&*O:*o ",
|
||||
" @>>@$$%&O::*o ",
|
||||
"@@@>>@@@$%OOoO+ ",
|
||||
"@>>>>>>@,$%&*=+ ",
|
||||
"@>>>>>>@<,$%&*+ ",
|
||||
"@@@>>@@@1<,$%&O ",
|
||||
" @>>@2341<,$%O ",
|
||||
" @@@@52341<,$o ",
|
||||
" .:6752341<,8 ",
|
||||
" .::6752341<8 ",
|
||||
" .:::67523419 ",
|
||||
" .::::6752340 ",
|
||||
" ............ "
|
||||
};
|
||||
|
|
@ -1,43 +0,0 @@
|
|||
/* XPM */
|
||||
static const char * new_dir_xpm[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"16 15 22 1",
|
||||
"X c Black",
|
||||
"> c #9BACC2",
|
||||
"o c #547897",
|
||||
"1 c #7F99B4",
|
||||
"O c #D1D9E5",
|
||||
"< c #EAEDF3",
|
||||
"# c #CAD2DC",
|
||||
"3 c #718BA7",
|
||||
"@ c #BECAD9",
|
||||
"& c #E1E6EE",
|
||||
"; c #F5F6F7",
|
||||
". c #FFFF00",
|
||||
", c #8DA0B9",
|
||||
" c None",
|
||||
"% c #D6DFE7",
|
||||
"$ c #D2D9E0",
|
||||
"- c #ADBACE",
|
||||
"= c #EEF1F3",
|
||||
"+ c #B3BFD1",
|
||||
"2 c #7A90AC",
|
||||
": c #A2B3C5",
|
||||
"* c #E5EAF1",
|
||||
/* pixels */
|
||||
" .X .XX.",
|
||||
" ooooo .X.X. ",
|
||||
" oOOOOo XX...XX",
|
||||
" oooooooo.......",
|
||||
" o+@#$%&*XX...XX",
|
||||
" o+@#$%&*=.X.X. ",
|
||||
" o-+@#O%&.X;.X .",
|
||||
" o:-+@#O%&*=;o ",
|
||||
" o>:-+@#O%&*=o ",
|
||||
" o,>:-+@#O%&<o ",
|
||||
" o1,>:-+@#O%&o ",
|
||||
" o21,>:-+@#O%o ",
|
||||
" o321,>:-+@#Oo ",
|
||||
" ooooooooooooo ",
|
||||
" "
|
||||
};
|
||||
|
|
@ -1,46 +0,0 @@
|
|||
/* XPM */
|
||||
static const char * paste_xpm[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"16 15 25 1",
|
||||
"< c #FEECE4",
|
||||
"> c #FEE3D7",
|
||||
"O c #FFFFFF",
|
||||
"o c #7B767D",
|
||||
"% c #F79586",
|
||||
"& c #CAE1F3",
|
||||
"@ c #F08B62",
|
||||
"# c #FCCBB8",
|
||||
"- c #FDD8C9",
|
||||
"4 c #FFF8F4",
|
||||
"5 c #FFF5F0",
|
||||
" c None",
|
||||
"$ c #F8AA8F",
|
||||
", c #EFF6FC",
|
||||
"1 c #F7FBFD",
|
||||
"2 c #FAFCFE",
|
||||
"; c #DAEAF7",
|
||||
": c #E9F3FA",
|
||||
"6 c #FFFAF8",
|
||||
". c #3C78A6",
|
||||
"3 c #FFF1ED",
|
||||
"X c #9B8687",
|
||||
"+ c #FBBCA4",
|
||||
"* c #B6D5EE",
|
||||
"= c #F4F9FD",
|
||||
/* pixels */
|
||||
" ...... ",
|
||||
" .XoOOOOoo. ",
|
||||
".+XOOOOOOX@. ",
|
||||
".+XXXXXXXX@. ",
|
||||
".#++$$%@..... ",
|
||||
".##++$$%.&*.=. ",
|
||||
".-##++$$.;&.==. ",
|
||||
".--##++$.:;.... ",
|
||||
".>--##++.,:;&*. ",
|
||||
".<>--##+.1,:;&. ",
|
||||
".<<>--##.21,:;. ",
|
||||
".3<<>--#.O21=:. ",
|
||||
".45<<>--....... ",
|
||||
".6453<>----. ",
|
||||
"............ "
|
||||
};
|
||||
|
|
@ -1,60 +0,0 @@
|
|||
/* XPM */
|
||||
static const char * print_xpm[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"16 15 39 1",
|
||||
"< c #E3E4E6",
|
||||
"+ c #C3C3C4",
|
||||
"i c #FFFFFF",
|
||||
": c #74879B",
|
||||
"# c #5A89A6",
|
||||
"a c #F1F4F7",
|
||||
"r c #5A809C",
|
||||
"@ c #BDCCD9",
|
||||
"e c #7A92A4",
|
||||
"% c #3F6F93",
|
||||
"t c #9FA2A6",
|
||||
"3 c #939495",
|
||||
"w c #5F666D",
|
||||
"9 c #65839E",
|
||||
"5 c #4A7291",
|
||||
"$ c #4B7F9E",
|
||||
" c None",
|
||||
"O c #DFE0E2",
|
||||
"o c #F3F3F3",
|
||||
"; c #84A5BB",
|
||||
"& c #467291",
|
||||
". c #7897AD",
|
||||
"* c #407598",
|
||||
"4 c #CFCFD0",
|
||||
"7 c #6F90A6",
|
||||
"y c #6A89A2",
|
||||
"0 c #AAADB2",
|
||||
"1 c #D2D3D4",
|
||||
"u c #4F7592",
|
||||
", c #BCBDBE",
|
||||
"p c #57778E",
|
||||
"q c #979BA0",
|
||||
"2 c #ABABAC",
|
||||
"- c #E7E7E7",
|
||||
"= c #D6DEE6",
|
||||
"> c #9FA0A0",
|
||||
"8 c #829EB5",
|
||||
"X c #8FB0C3",
|
||||
"6 c #5D7C93",
|
||||
/* pixels */
|
||||
" .XXXXXXXX ",
|
||||
" .oooooooX ",
|
||||
" .OOOOOOOX ",
|
||||
" .+++++++X ",
|
||||
"@##$%&&&&&%*##@ ",
|
||||
"$=-;:>,<123$-=$ ",
|
||||
".44.5678.96$44. ",
|
||||
"7,,,,,,,,,,,,,7 ",
|
||||
"900qwwwwwwwe009 ",
|
||||
"rtt9ryyyyyyuttr ",
|
||||
"6qq6iiiiiii%qq6 ",
|
||||
"633paiiiiii%336 ",
|
||||
"XXX*iiiiiii%XXX ",
|
||||
" 6iiiiiii% ",
|
||||
" $XXXXXXX# "
|
||||
};
|
||||
|
|
@ -1,90 +0,0 @@
|
|||
/* XPM */
|
||||
static const char * quit_xpm[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"16 15 69 1",
|
||||
"@ c Black",
|
||||
"i c #9AEA53",
|
||||
"D c #7E9BB1",
|
||||
"H c #839FB4",
|
||||
", c #B7C7D3",
|
||||
"8 c #BCCBD6",
|
||||
"7 c #C1CFDA",
|
||||
"v c #92ABBD",
|
||||
"- c #D0DBE2",
|
||||
"O c #547897",
|
||||
"+ c #376485",
|
||||
"L c #7090A8",
|
||||
"t c #AEC0CE",
|
||||
"g c #B3C4D1",
|
||||
"S c #84A0B4",
|
||||
"G c #89A4B8",
|
||||
"> c #BDCCD7",
|
||||
"F c #5A809C",
|
||||
"2 c #C2D0DA",
|
||||
"k c #93ACBE",
|
||||
"= c #D6E0E6",
|
||||
"* c #446A8C",
|
||||
"z c #A5B9C8",
|
||||
"# c #DEE5EB",
|
||||
"0 c #AFC1CE",
|
||||
"r c #B4C5D2",
|
||||
"p c #B9C9D5",
|
||||
"A c #8AA5B8",
|
||||
"M c #92AABD",
|
||||
"j c #A6BAC9",
|
||||
"K c #7796AC",
|
||||
"l c #ABBECC",
|
||||
"o c #E4EAEF",
|
||||
"9 c #B5C6D2",
|
||||
" c None",
|
||||
"; c #C9D6DF",
|
||||
"X c #305F81",
|
||||
"m c #98AFC0",
|
||||
"V c #9DB3C3",
|
||||
"% c #D1DBE3",
|
||||
"u c #A2B7C6",
|
||||
"y c #A7BBCA",
|
||||
"h c #ACBFCD",
|
||||
"4 c #B6C7D3",
|
||||
"w c #C0CFD9",
|
||||
"d c #982106",
|
||||
"B c #85A0B5",
|
||||
"6 c #C8D4DE",
|
||||
"c c #99B0C1",
|
||||
"x c #9EB4C4",
|
||||
"$ c #D7E0E7",
|
||||
"q c #A8BCCA",
|
||||
"s c #ADC0CD",
|
||||
"3 c #BCCCD7",
|
||||
"N c #8BA5B9",
|
||||
": c #C4D1DB",
|
||||
"1 c #C9D5DE",
|
||||
"f c #9AB1C2",
|
||||
"n c #A4B9C8",
|
||||
"a c #B3C5D1",
|
||||
". c #215579",
|
||||
"J c #7D9AB0",
|
||||
"& c #829EB5",
|
||||
"e c #BBCAD6",
|
||||
"b c #8CA6B9",
|
||||
"Z c #91AABC",
|
||||
"C c #96AEC0",
|
||||
"< c #CFDAE2",
|
||||
"5 c #AFC2CF",
|
||||
/* pixels */
|
||||
" ..XXXXXXXXXX ",
|
||||
" XoO+X@@@@@@X ",
|
||||
" X#$%&X*@@@@X ",
|
||||
" X=-;:>,X@@@X ",
|
||||
" X<12345X@@@X ",
|
||||
" X67890qX@XXX ",
|
||||
" XwertyuX@XiX ",
|
||||
" XpasddfX++iiX ",
|
||||
" XghjddkXiiiiiX ",
|
||||
" XlzxcvbXiiiiiiX",
|
||||
" XnxmMNBXiiiiiX ",
|
||||
" XVCZASDXXXiiX ",
|
||||
" XXFGHJKX XiX ",
|
||||
" FXXFLX XX ",
|
||||
" XX* "
|
||||
};
|
||||
|
|
@ -1,58 +0,0 @@
|
|||
/* XPM */
|
||||
static const char * redo_xpm[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"16 15 37 1",
|
||||
"4 c #9BACC2",
|
||||
"; c #4C7398",
|
||||
"3 c #547B99",
|
||||
"* c #547897",
|
||||
"# c #5A89A6",
|
||||
"8 c #3A749C",
|
||||
"5 c #5A809C",
|
||||
", c #7F99B4",
|
||||
"& c #3F6F93",
|
||||
"9 c #85A7BC",
|
||||
"+ c #749BB4",
|
||||
"> c #718BA7",
|
||||
"e c #A5B3C8",
|
||||
"w c #BECAD9",
|
||||
": c #65839D",
|
||||
"u c #E1E6EE",
|
||||
"o c #236289",
|
||||
"r c #ADBED2",
|
||||
"= c #597B9A",
|
||||
"2 c #8DA0B9",
|
||||
" c None",
|
||||
"% c #467291",
|
||||
"1 c #7393AB",
|
||||
"i c #4C809F",
|
||||
"- c #A0BACB",
|
||||
"O c #6591AE",
|
||||
"X c #407598",
|
||||
"6 c #6F90A6",
|
||||
"t c #D2D9E0",
|
||||
"7 c #ADBACE",
|
||||
"@ c #326A8F",
|
||||
"0 c #467A9C",
|
||||
". c #ACC4D3",
|
||||
"< c #7F97B0",
|
||||
"y c #B3BFD1",
|
||||
"q c #A2B3C5",
|
||||
"$ c #8FB0C3",
|
||||
/* pixels */
|
||||
" .XoooO ",
|
||||
" +o@@@@@o# +",
|
||||
" $@%%&@&%%&@ +o",
|
||||
" X*=@+-+@*=;@#&@",
|
||||
" @:=+ @=:=*:@",
|
||||
" &>:$ @:>>>@",
|
||||
" &,<X X>,,,&",
|
||||
" +123 @<2222&",
|
||||
" X44X #@56<44X",
|
||||
" O1748 .9#&o",
|
||||
" 0qwe8 ",
|
||||
" 8rty8 ",
|
||||
" 8wu+ ",
|
||||
" i## ",
|
||||
" "
|
||||
};
|
||||
|
|
@ -1,44 +0,0 @@
|
|||
/* XPM */
|
||||
static const char * removable_xpm[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"16 15 23 1",
|
||||
"@ c #C3C3C4",
|
||||
"4 c #FFFFFF",
|
||||
"o c #D5D6D8",
|
||||
"> c #7A92A3",
|
||||
". c #8497A5",
|
||||
"% c #ACAEB2",
|
||||
"2 c #4A7898",
|
||||
": c #DCE2EA",
|
||||
", c #F5F6F7",
|
||||
"= c #EBEBEC",
|
||||
"$ c #B7B7B8",
|
||||
" c None",
|
||||
"X c #DFE0E2",
|
||||
"* c #A6A8AD",
|
||||
"1 c #4C809F",
|
||||
"3 c #407598",
|
||||
"O c #CFCFD0",
|
||||
"; c #9EA2A8",
|
||||
"# c #BCBDBE",
|
||||
"+ c #C6C8CA",
|
||||
"- c #979BA0",
|
||||
"& c #E7E7E7",
|
||||
"< c #8FB0C3",
|
||||
/* pixels */
|
||||
" ......... ",
|
||||
" .XoO+@#$%. ",
|
||||
" .XoO+@#$%. ",
|
||||
" .&XoO+@#$%*. ",
|
||||
" .&XoO+@#$%*. ",
|
||||
" .=&XoO+@#$%*-. ",
|
||||
" .=&XoO+@#$%*;. ",
|
||||
".:=&XoO+@#$%*;>.",
|
||||
".,=&XoO+@#$%*;-.",
|
||||
"<..............<",
|
||||
"<,=&XoO+@#$%%%%.",
|
||||
"<O1111122233*4*.",
|
||||
"<OOOOOOOOOOO***.",
|
||||
" <<<<<<<<<<<<<< ",
|
||||
" "
|
||||
};
|
||||
|
|
@ -1,24 +0,0 @@
|
|||
/* XPM */
|
||||
static const char * repview_xpm[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"16 15 3 1",
|
||||
" c Black",
|
||||
"X c #FFFFFF",
|
||||
". c #C0C0C0",
|
||||
/* pixels */
|
||||
" ",
|
||||
" .............. ",
|
||||
" . . . . ",
|
||||
" .............. ",
|
||||
" .............. ",
|
||||
" XXXXXXXXXXXXXX ",
|
||||
" X X X X ",
|
||||
" XXXXXXXXXXXXXX ",
|
||||
" X X X X ",
|
||||
" XXXXXXXXXXXXXX ",
|
||||
" X X X X ",
|
||||
" XXXXXXXXXXXXXX ",
|
||||
" X X X X ",
|
||||
" XXXXXXXXXXXXXX ",
|
||||
" "
|
||||
};
|
||||
|
|
@ -1,17 +0,0 @@
|
|||
/* XPM */
|
||||
static const char * tick_xpm[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"10 10 2 1",
|
||||
". c Gray0",
|
||||
" c None",
|
||||
/* pixels */
|
||||
" ",
|
||||
" ..",
|
||||
" ...",
|
||||
" ... ",
|
||||
".. ... ",
|
||||
"... ... ",
|
||||
" ..... ",
|
||||
" ... ",
|
||||
" . ",
|
||||
" "};
|
||||
|
|
@ -1,47 +0,0 @@
|
|||
/* XPM */
|
||||
static const char * tipicon_xpm[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"32 32 9 1",
|
||||
"$ c Black",
|
||||
"O c #FFFFFF",
|
||||
"@ c #808080",
|
||||
"+ c #000080",
|
||||
"o c #E8EB01",
|
||||
" c None",
|
||||
"X c #FFFF40",
|
||||
"# c #C0C0C0",
|
||||
". c #ABAD01",
|
||||
/* pixels */
|
||||
" ",
|
||||
" ..... ",
|
||||
" ..XXXXX.. ",
|
||||
" ..XXXXXXXXo.. ",
|
||||
" .XXXOXXXXXXXoo. ",
|
||||
" .XOOXXX+XXXXXo. ",
|
||||
" .XOOOXX+++XXXXoo. ",
|
||||
" .XOOXXX+++XXXXXo. ",
|
||||
" .XOOOXXX+++XXXXXXo. ",
|
||||
" .XOOXXXX+++XXXXXXo. ",
|
||||
" .XXXXXXX+++XXXXXXX. ",
|
||||
" .XXXXXXX+++XXXXXXo. ",
|
||||
" .XXXXXXX+++XXXXXoo. ",
|
||||
" .XXXXXX+++XXXXXo. ",
|
||||
" .XXXXXXX+XXXXXXo. ",
|
||||
" .XXXXXXXXXXXXo. ",
|
||||
" .XXXXX+++XXXoo. ",
|
||||
" .XXXX+++XXoo. ",
|
||||
" .XXXXXXXXo. ",
|
||||
" ..XXXXXXo.. ",
|
||||
" .XXXXXo.. ",
|
||||
" @#######@ ",
|
||||
" @@@@@@@@@ ",
|
||||
" @#######@ ",
|
||||
" @@@@@@@@@ ",
|
||||
" @#######@ ",
|
||||
" @@@@@@@ ",
|
||||
" ### ",
|
||||
" $$$ ",
|
||||
" ",
|
||||
" ",
|
||||
" "
|
||||
};
|
||||
|
|
@ -1,21 +0,0 @@
|
|||
/* XPM */
|
||||
static const char * toparent_xpm[] = {
|
||||
"16 15 3 1",
|
||||
" c None",
|
||||
". c Black",
|
||||
"X c Gray100",
|
||||
" ",
|
||||
" .. ",
|
||||
" .XX. ",
|
||||
" .XXXX. ",
|
||||
" .XXXXXX. ",
|
||||
" .XXXXXXXX. ",
|
||||
" ....XXXX.... ",
|
||||
" .XXXX. ",
|
||||
" .XXXX..... ",
|
||||
" .XXXXXXXX. ",
|
||||
" .XXXXXXXX. ",
|
||||
" .XXXXXXXX. ",
|
||||
" .XXXXXXXX. ",
|
||||
" .......... ",
|
||||
" "};
|
||||
|
|
@ -1,58 +0,0 @@
|
|||
/* XPM */
|
||||
static const char * undo_xpm[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"16 15 37 1",
|
||||
"4 c #9BACC2",
|
||||
"* c #4C7398",
|
||||
"2 c #547B99",
|
||||
"- c #547897",
|
||||
"@ c #5A89A6",
|
||||
"8 c #3A749C",
|
||||
"6 c #5A809C",
|
||||
", c #7F99B4",
|
||||
"$ c #3F6F93",
|
||||
"7 c #85A7BC",
|
||||
"+ c #749BB4",
|
||||
"> c #718BA7",
|
||||
"0 c #A5B3C8",
|
||||
"q c #BECAD9",
|
||||
": c #65839D",
|
||||
"u c #E1E6EE",
|
||||
"X c #236289",
|
||||
"y c #ADBED2",
|
||||
"= c #597B9A",
|
||||
"1 c #8DA0B9",
|
||||
" c None",
|
||||
"% c #467291",
|
||||
"3 c #7393AB",
|
||||
"i c #4C809F",
|
||||
"; c #A0BACB",
|
||||
". c #6591AE",
|
||||
"o c #407598",
|
||||
"5 c #6F90A6",
|
||||
"t c #D2D9E0",
|
||||
"9 c #ADBACE",
|
||||
"# c #326A8F",
|
||||
"e c #467A9C",
|
||||
"O c #ACC4D3",
|
||||
"< c #7F97B0",
|
||||
"r c #B3BFD1",
|
||||
"w c #A2B3C5",
|
||||
"& c #8FB0C3",
|
||||
/* pixels */
|
||||
" .XXXoO ",
|
||||
"+ @X#####X+ ",
|
||||
"X+ #$%%$#$%%#& ",
|
||||
"#$@#*=-#+;+#=-o ",
|
||||
"#:-=:=# +=:# ",
|
||||
"#>>>:# &:>$ ",
|
||||
"$,,,>o o<,$ ",
|
||||
"$1111<# 213+ ",
|
||||
"o44<56#@ o44o ",
|
||||
"X$@7O 8493. ",
|
||||
" 80qwe ",
|
||||
" 8rty8 ",
|
||||
" +uq8 ",
|
||||
" @@i ",
|
||||
" "
|
||||
};
|
||||
|
|
@ -1,21 +0,0 @@
|
|||
/* XPM */
|
||||
static const char * up_xpm[] = {
|
||||
"16 15 3 1",
|
||||
" c None",
|
||||
". c Black",
|
||||
"X c Gray100",
|
||||
" ",
|
||||
" .. ",
|
||||
" .XX. ",
|
||||
" .XXXX. ",
|
||||
" .XXXXXX. ",
|
||||
" .XXXXXXXX. ",
|
||||
" ....XXXX.... ",
|
||||
" .XXXX. ",
|
||||
" .XXXX. ",
|
||||
" .XXXX. ",
|
||||
" .XXXX. ",
|
||||
" .XXXX. ",
|
||||
" .XXXX. ",
|
||||
" ...... ",
|
||||
" "};
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 1.1 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.2 KiB |
|
|
@ -1,25 +0,0 @@
|
|||
/* XPM */
|
||||
static const char * wxwin16x16_xpm[] = {
|
||||
"16 16 6 1",
|
||||
" c None",
|
||||
". c #000000",
|
||||
"X c #000084",
|
||||
"o c #FFFFFF",
|
||||
"O c #FFFF00",
|
||||
"+ c #FF0000",
|
||||
" ",
|
||||
" ",
|
||||
" ....... ",
|
||||
" .XXXXX. ",
|
||||
" .oXXXX. ",
|
||||
" .oXXX.......",
|
||||
".....oXXX.OOOOO.",
|
||||
".+++.XXXX.oOOOO.",
|
||||
".o++......oOOOO.",
|
||||
".o++++. .oOOOO.",
|
||||
".o++++. .OOOOO.",
|
||||
".+++++. .......",
|
||||
"....... ",
|
||||
" ",
|
||||
" ",
|
||||
" "};
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 1.2 KiB |
|
|
@ -1,41 +0,0 @@
|
|||
/* XPM */
|
||||
static const char * wxwin32x32_xpm[] = {
|
||||
"32 32 6 1",
|
||||
" c None",
|
||||
". c #000000",
|
||||
"X c #000084",
|
||||
"o c #FFFFFF",
|
||||
"O c #FFFF00",
|
||||
"+ c #FF0000",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" .............. ",
|
||||
" .XXXXXXXXXXXX. ",
|
||||
" .XXXXXXXXXXXX. ",
|
||||
" .XooXXXXXXXXX. ",
|
||||
" .XooXXXXXXXXX. ",
|
||||
" .XooXXXXXXXXX. ",
|
||||
" .XooXXXXXX..............",
|
||||
" .XooXXXXXX.OOOOOOOOOOOO.",
|
||||
".........XooXXXXXX.OOOOOOOOOOOO.",
|
||||
".+++++++.XooXXXXXX.OooOOOOOOOOO.",
|
||||
".+++++++.XooXXXXXX.OooOOOOOOOOO.",
|
||||
".+oo++++.XXXXXXXXX.OooOOOOOOOOO.",
|
||||
".+oo++++.XXXXXXXXX.OooOOOOOOOOO.",
|
||||
".+oo++++...........OooOOOOOOOOO.",
|
||||
".+oo+++++++++. .OooOOOOOOOOO.",
|
||||
".+oo+++++++++. .OooOOOOOOOOO.",
|
||||
".+oo+++++++++. .OooOOOOOOOOO.",
|
||||
".+oo+++++++++. .OOOOOOOOOOOO.",
|
||||
".+oo+++++++++. .OOOOOOOOOOOO.",
|
||||
".++++++++++++. ..............",
|
||||
".++++++++++++. ",
|
||||
".............. ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" "};
|
||||
File diff suppressed because it is too large
Load Diff
|
|
@ -1,250 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<ItemGroup>
|
||||
<Filter Include="Common Sources">
|
||||
<UniqueIdentifier>{6826e769-5784-453f-ac2d-103dd2f914e0}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="MSW Sources">
|
||||
<UniqueIdentifier>{14c72ea6-534f-4a4b-a2b9-8c03fcbcc8ed}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="Generic Sources">
|
||||
<UniqueIdentifier>{e7f2ee27-1be7-4506-80d3-4220641ade46}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="Setup Headers">
|
||||
<UniqueIdentifier>{cbb52b26-4d02-437b-bc8e-cd8f883624a0}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="MSW Headers">
|
||||
<UniqueIdentifier>{982c2c65-a317-4cfa-bc70-a109372bdc9d}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="Generic Headers">
|
||||
<UniqueIdentifier>{6a83b727-2d93-4155-9044-f3b76e14ab79}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="Common Headers">
|
||||
<UniqueIdentifier>{0e3f2ed8-62c0-4d64-ab73-40db7b43758c}</UniqueIdentifier>
|
||||
</Filter>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClCompile Include="..\..\src\common\animatecmn.cpp">
|
||||
<Filter>Common Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\common\datavcmn.cpp">
|
||||
<Filter>Common Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\common\dummy.cpp">
|
||||
<Filter>Common Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\common\taskbarcmn.cpp">
|
||||
<Filter>Common Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\msw\aboutdlg.cpp">
|
||||
<Filter>MSW Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\msw\datectrl.cpp">
|
||||
<Filter>MSW Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\msw\joystick.cpp">
|
||||
<Filter>MSW Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\msw\sound.cpp">
|
||||
<Filter>MSW Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\msw\taskbar.cpp">
|
||||
<Filter>MSW Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\generic\aboutdlgg.cpp">
|
||||
<Filter>Generic Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\generic\animateg.cpp">
|
||||
<Filter>Generic Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\generic\bmpcboxg.cpp">
|
||||
<Filter>Generic Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\generic\calctrl.cpp">
|
||||
<Filter>Generic Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\generic\datavgen.cpp">
|
||||
<Filter>Generic Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\generic\datectlg.cpp">
|
||||
<Filter>Generic Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\generic\grid.cpp">
|
||||
<Filter>Generic Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\generic\gridctrl.cpp">
|
||||
<Filter>Generic Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\generic\gridsel.cpp">
|
||||
<Filter>Generic Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\generic\helpext.cpp">
|
||||
<Filter>Generic Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\generic\hyperlink.cpp">
|
||||
<Filter>Generic Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\generic\laywin.cpp">
|
||||
<Filter>Generic Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\generic\odcombo.cpp">
|
||||
<Filter>Generic Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\generic\propdlg.cpp">
|
||||
<Filter>Generic Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\generic\sashwin.cpp">
|
||||
<Filter>Generic Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\generic\splash.cpp">
|
||||
<Filter>Generic Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\generic\tipdlg.cpp">
|
||||
<Filter>Generic Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\generic\wizard.cpp">
|
||||
<Filter>Generic Sources</Filter>
|
||||
</ClCompile>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ResourceCompile Include="..\..\src\msw\version.rc">
|
||||
<Filter>MSW Sources</Filter>
|
||||
</ResourceCompile>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClInclude Include="..\..\include\wx\msw\datectrl.h">
|
||||
<Filter>MSW Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\msw\joystick.h">
|
||||
<Filter>MSW Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\msw\sound.h">
|
||||
<Filter>MSW Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\msw\taskbar.h">
|
||||
<Filter>MSW Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\generic\aboutdlgg.h">
|
||||
<Filter>Generic Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\generic\animate.h">
|
||||
<Filter>Generic Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\generic\bmpcbox.h">
|
||||
<Filter>Generic Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\generic\calctrl.h">
|
||||
<Filter>Generic Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\generic\dataview.h">
|
||||
<Filter>Generic Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\generic\datectrl.h">
|
||||
<Filter>Generic Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\generic\grid.h">
|
||||
<Filter>Generic Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\generic\gridctrl.h">
|
||||
<Filter>Generic Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\generic\gridsel.h">
|
||||
<Filter>Generic Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\generic\helpext.h">
|
||||
<Filter>Generic Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\generic\laywin.h">
|
||||
<Filter>Generic Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\generic\propdlg.h">
|
||||
<Filter>Generic Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\generic\sashwin.h">
|
||||
<Filter>Generic Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\generic\splash.h">
|
||||
<Filter>Generic Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\generic\wizard.h">
|
||||
<Filter>Generic Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\aboutdlg.h">
|
||||
<Filter>Common Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\animate.h">
|
||||
<Filter>Common Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\animdecod.h">
|
||||
<Filter>Common Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\bmpcbox.h">
|
||||
<Filter>Common Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\calctrl.h">
|
||||
<Filter>Common Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\dataview.h">
|
||||
<Filter>Common Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\datectrl.h">
|
||||
<Filter>Common Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\dateevt.h">
|
||||
<Filter>Common Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\dcbuffer.h">
|
||||
<Filter>Common Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\grid.h">
|
||||
<Filter>Common Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\hyperlink.h">
|
||||
<Filter>Common Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\joystick.h">
|
||||
<Filter>Common Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\laywin.h">
|
||||
<Filter>Common Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\odcombo.h">
|
||||
<Filter>Common Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\propdlg.h">
|
||||
<Filter>Common Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\sashwin.h">
|
||||
<Filter>Common Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\sound.h">
|
||||
<Filter>Common Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\splash.h">
|
||||
<Filter>Common Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\taskbar.h">
|
||||
<Filter>Common Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\tipdlg.h">
|
||||
<Filter>Common Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\wave.h">
|
||||
<Filter>Common Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\wx\wizard.h">
|
||||
<Filter>Common Headers</Filter>
|
||||
</ClInclude>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<CustomBuild Include="..\..\include\wx\msw\setup.h">
|
||||
<Filter>Setup Headers</Filter>
|
||||
</CustomBuild>
|
||||
<CustomBuild Include="..\..\include\wx\univ\setup.h">
|
||||
<Filter>Setup Headers</Filter>
|
||||
</CustomBuild>
|
||||
<CustomBuild Include="..\..\include\wx\msw\genrcdefs.h">
|
||||
<Filter>MSW Headers</Filter>
|
||||
</CustomBuild>
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
File diff suppressed because it is too large
Load Diff
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue