Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Added patch to fix wx linux compiling #3

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Added patch to fix wx linux compiling #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e1c33ce
pouar patch - this patch allows r1206 and up to compile (at least for…
sergiobenrocha2 Mar 17, 2014
d83382c
changed copyright year to 2014 (VBA-M development team)
sergiobenrocha2 Mar 17, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions trunk/po/wxvbam/cs.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -371,8 +371,8 @@ msgstr "Nintendo GameBoy (+Color+Advance) emulátor."
msgid ""
"Copyright (C) 1999-2003 Forgotten\n"
"Copyright (C) 2004-2006 VBA development team\n"
"Copyright (C) 2007-2011 VBA-M development team"
msgstr "Copyright (C) 1999-2003 Forgotten\nCopyright (C) 2004-2006 VBA development team\nCopyright (C) 2007-2011 VBA-M development team"
"Copyright (C) 2007-2014 VBA-M development team"
msgstr "Copyright (C) 1999-2003 Forgotten\nCopyright (C) 2004-2006 VBA development team\nCopyright (C) 2007-2014 VBA-M development team"

#: ../src/wx/cmdevents.cpp:2180
msgid ""
Expand Down
4 changes: 2 additions & 2 deletions trunk/po/wxvbam/en.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1196,11 +1196,11 @@ msgstr "Connecting to %s\n"
msgid ""
"Copyright (C) 1999-2003 Forgotten\n"
"Copyright (C) 2004-2006 VBA development team\n"
"Copyright (C) 2007-2011 VBA-M development team"
"Copyright (C) 2007-2014 VBA-M development team"
msgstr ""
"Copyright (C) 1999-2003 Forgotten\n"
"Copyright (C) 2004-2006 VBA development team\n"
"Copyright (C) 2007-2011 VBA-M development team"
"Copyright (C) 2007-2014 VBA-M development team"

#: ../src/wx/wxvbam.cpp:208
msgid "Could not create main window"
Expand Down
2 changes: 1 addition & 1 deletion trunk/po/wxvbam/nl.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,7 +370,7 @@ msgstr ""
msgid ""
"Copyright (C) 1999-2003 Forgotten\n"
"Copyright (C) 2004-2006 VBA development team\n"
"Copyright (C) 2007-2011 VBA-M development team"
"Copyright (C) 2007-2014 VBA-M development team"
msgstr ""

#: ../src/wx/cmdevents.cpp:2180
Expand Down
2 changes: 1 addition & 1 deletion trunk/po/wxvbam/wxvbam.pot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -368,7 +368,7 @@ msgstr ""
msgid ""
"Copyright (C) 1999-2003 Forgotten\n"
"Copyright (C) 2004-2006 VBA development team\n"
"Copyright (C) 2007-2011 VBA-M development team"
"Copyright (C) 2007-2014 VBA-M development team"
msgstr ""

#: ../src/wx/cmdevents.cpp:2180
Expand Down
4 changes: 2 additions & 2 deletions trunk/po/wxvbam/zh_TW.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,8 +370,8 @@ msgstr "Nintendo GameBoy (+Color+Advance) emulator."
msgid ""
"Copyright (C) 1999-2003 Forgotten\n"
"Copyright (C) 2004-2006 VBA development team\n"
"Copyright (C) 2007-2011 VBA-M development team"
msgstr "Copyright (C) 1999-2003 Forgotten\nCopyright (C) 2004-2006 VBA development team\nCopyright (C) 2007-2011 VBA-M development team"
"Copyright (C) 2007-2014 VBA-M development team"
msgstr "Copyright (C) 1999-2003 Forgotten\nCopyright (C) 2004-2006 VBA development team\nCopyright (C) 2007-2014 VBA-M development team"

#: ../src/wx/cmdevents.cpp:2180
msgid ""
Expand Down
1 change: 0 additions & 1 deletion trunk/src/Util.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -439,7 +439,6 @@ static bool utilIsImage(const char *file)
#include <Windows.h>
#endif

IMAGE_TYPE utilFindType(const char *file, char (&buffer)[2048]);

IMAGE_TYPE utilFindType(const char *file)
{
Expand Down
1 change: 1 addition & 0 deletions trunk/src/Util.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ bool utilIsGzipFile(const char *);
bool utilIsZipFile(const char *);
void utilStripDoubleExtension(const char *, char *);
IMAGE_TYPE utilFindType(const char *);
IMAGE_TYPE utilFindType(const char *file, char (&buffer)[2048]);
uint8_t *utilLoad(const char *, bool (*)(const char*), uint8_t *, int &);

void utilPutDword(uint8_t *, uint32_t);
Expand Down
2 changes: 1 addition & 1 deletion trunk/src/gtk/windowcallbacks.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -500,7 +500,7 @@ void Window::vOnHelpAbout()
"along with this program. If not, see <http://www.gnu.org/licenses/>.";
const char csCopyright[] = "Copyright (C) 1999-2003 Forgotten\n"
"Copyright (C) 2004-2006 VBA development team\n"
"Copyright (C) 2007-2011 VBA-M development team";
"Copyright (C) 2007-2014 VBA-M development team";

oAboutDialog.set_transient_for(*this);

Expand Down
2 changes: 1 addition & 1 deletion trunk/src/wx/cmdevents.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2176,7 +2176,7 @@ EVT_HANDLER(wxID_ABOUT, "About...")
ai.SetWebSite(wxT("http://www.vba-m.com/"));
ai.SetIcon(GetIcon());
ai.SetDescription(_("Nintendo GameBoy (+Color+Advance) emulator."));
ai.SetCopyright(_("Copyright (C) 1999-2003 Forgotten\nCopyright (C) 2004-2006 VBA development team\nCopyright (C) 2007-2011 VBA-M development team"));
ai.SetCopyright(_("Copyright (C) 1999-2003 Forgotten\nCopyright (C) 2004-2006 VBA development team\nCopyright (C) 2007-2014 VBA-M development team"));
ai.SetLicense(_("This program is free software: you can redistribute it and/or modify\n"
"it under the terms of the GNU General Public License as published by\n"
"the Free Software Foundation, either version 2 of the License, or\n"
Expand Down