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.

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

Fix compiler errors on MSVC with ENABLE_TOUCH=TRUE #13625

Merged
merged 1 commit into from
Jun 24, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/gui/touchscreengui.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,14 @@ with this program; if not, write to the Free Software Foundation, Inc.,

using namespace irr::core;

const char **button_imagenames = (const char *[]) {
const char *button_imagenames[] = {
"jump_btn.png",
"down.png",
"zoom.png",
"aux1_btn.png"
};

const char **joystick_imagenames = (const char *[]) {
const char *joystick_imagenames[] = {
"joystick_off.png",
"joystick_bg.png",
"joystick_center.png"
Expand Down
4 changes: 2 additions & 2 deletions src/gui/touchscreengui.h
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,8 @@ typedef enum
// Very slow button repeat frequency
#define SLOW_BUTTON_REPEAT 1.0f

extern const char **button_imagenames;
extern const char **joystick_imagenames;
extern const char *button_imagenames[];
extern const char *joystick_imagenames[];

struct button_info
{
Expand Down