godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-14 13:41:12 +00:00
Code Releases Wiki Activity

Fixes Visual Studio 2015 compile error C3688 (invalid literal suffix)

Browse Source 
tools\editor\editor_node.cpp(3037): error C3688: invalid literal suffix 'VERSION_FULL_NAME'; literal operator or literal operator template 'operator ""VERSION_FULL_NAME' not found
This commit is contained in:
ZuBsPaCe
2015-10-29 14:27:19 +01:00
parent bd736e5af2
commit 3886ed08ac
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/editor/editor_node.cpp
View File

@@ -3034,7 +3034,7 @@ Error EditorNode::save_translatable_strings(const String& p_to_file) {
OS::Time time = OS::get_singleton()->get_time(); OS::Time time = OS::get_singleton()->get_time();
f->store_line("# Translation Strings Dump."); f->store_line("# Translation Strings Dump.");
f->store_line("# Created By."); f->store_line("# Created By.");
f->store_line("# \t"VERSION_FULL_NAME" (c) 2008-2015 Juan Linietsky, Ariel Manzur."); f->store_line("# \t" VERSION_FULL_NAME " (c) 2008-2015 Juan Linietsky, Ariel Manzur.");
f->store_line("# From Scene: "); f->store_line("# From Scene: ");
f->store_line("# \t"+get_edited_scene()->get_filename()); f->store_line("# \t"+get_edited_scene()->get_filename());
f->store_line(""); f->store_line("");

4
tools/editor/project_manager.cpp
View File

@@ -144,7 +144,7 @@ class NewProjectDialog : public ConfirmationDialog {
fdialog->set_mode(FileDialog::MODE_OPEN_FILE); fdialog->set_mode(FileDialog::MODE_OPEN_FILE);
fdialog->clear_filters(); fdialog->clear_filters();
fdialog->add_filter("engine.cfg ; "_MKSTR(VERSION_NAME)" Project"); fdialog->add_filter("engine.cfg ; " _MKSTR(VERSION_NAME) " Project");
} else { } else {
fdialog->set_mode(FileDialog::MODE_OPEN_DIR); fdialog->set_mode(FileDialog::MODE_OPEN_DIR);
} }
@@ -839,7 +839,7 @@ ProjectManager::ProjectManager() {
l->set_align(Label::ALIGN_CENTER); l->set_align(Label::ALIGN_CENTER);
vb->add_child(l); vb->add_child(l);
l = memnew( Label ); l = memnew( Label );
l->set_text("v"VERSION_MKSTRING); l->set_text("v" VERSION_MKSTRING);
//l->add_font_override("font",get_font("bold","Fonts")); //l->add_font_override("font",get_font("bold","Fonts"));
l->set_align(Label::ALIGN_CENTER); l->set_align(Label::ALIGN_CENTER);
vb->add_child(l); vb->add_child(l);