Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
godot
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
community
godot
Commits
a68d15d5
Unverified
Commit
a68d15d5
authored
Dec 16, 2017
by
Rémi Verschelde
Committed by
GitHub
Dec 16, 2017
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #14597 from NathanWarden/linux_extensions
Updated Linux template extensions to match architecture.
parents
a9ddc8f7
f89d78a7
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
29 additions
and
16 deletions
+29
-16
editor_export.cpp
editor/editor_export.cpp
+14
-4
editor_export.h
editor/editor_export.h
+4
-4
project_export.cpp
editor/project_export.cpp
+3
-1
export.cpp
platform/android/export/export.cpp
+1
-1
export.cpp
platform/iphone/export/export.cpp
+1
-1
export.cpp
platform/javascript/export/export.cpp
+2
-2
export.cpp
platform/osx/export/export.cpp
+1
-1
export.cpp
platform/uwp/export/export.cpp
+1
-1
export.cpp
platform/x11/export/export.cpp
+2
-1
No files found.
editor/editor_export.cpp
View file @
a68d15d5
...
...
@@ -1288,8 +1288,18 @@ bool EditorExportPlatformPC::can_export(const Ref<EditorExportPreset> &p_preset,
return
valid
;
}
String
EditorExportPlatformPC
::
get_binary_extension
()
const
{
return
extension
;
String
EditorExportPlatformPC
::
get_binary_extension
(
const
Ref
<
EditorExportPreset
>
&
p_preset
)
const
{
for
(
Map
<
String
,
String
>::
Element
*
E
=
extensions
.
front
();
E
;
E
=
E
->
next
())
{
if
(
p_preset
->
get
(
E
->
key
()))
{
return
extensions
[
E
->
key
()];
}
}
if
(
extensions
.
has
(
"default"
))
{
return
extensions
[
"default"
];
}
return
""
;
}
Error
EditorExportPlatformPC
::
export_project
(
const
Ref
<
EditorExportPreset
>
&
p_preset
,
bool
p_debug
,
const
String
&
p_path
,
int
p_flags
)
{
...
...
@@ -1337,8 +1347,8 @@ Error EditorExportPlatformPC::export_project(const Ref<EditorExportPreset> &p_pr
return
save_pack
(
p_preset
,
pck_path
);
}
void
EditorExportPlatformPC
::
set_extension
(
const
String
&
p_extension
)
{
extension
=
p_extension
;
void
EditorExportPlatformPC
::
set_extension
(
const
String
&
p_extension
,
const
String
&
p_feature_key
)
{
extension
s
[
p_feature_key
]
=
p_extension
;
}
void
EditorExportPlatformPC
::
set_name
(
const
String
&
p_name
)
{
...
...
editor/editor_export.h
View file @
a68d15d5
...
...
@@ -240,7 +240,7 @@ public:
virtual
bool
can_export
(
const
Ref
<
EditorExportPreset
>
&
p_preset
,
String
&
r_error
,
bool
&
r_missing_templates
)
const
=
0
;
virtual
String
get_binary_extension
()
const
=
0
;
virtual
String
get_binary_extension
(
const
Ref
<
EditorExportPreset
>
&
p_preset
)
const
=
0
;
virtual
Error
export_project
(
const
Ref
<
EditorExportPreset
>
&
p_preset
,
bool
p_debug
,
const
String
&
p_path
,
int
p_flags
=
0
)
=
0
;
virtual
void
get_platform_features
(
List
<
String
>
*
r_features
)
=
0
;
...
...
@@ -363,7 +363,7 @@ class EditorExportPlatformPC : public EditorExportPlatform {
Ref
<
ImageTexture
>
logo
;
String
name
;
String
os_name
;
String
extension
;
Map
<
String
,
String
>
extensions
;
String
release_file_32
;
String
release_file_64
;
...
...
@@ -385,10 +385,10 @@ public:
virtual
Ref
<
Texture
>
get_logo
()
const
;
virtual
bool
can_export
(
const
Ref
<
EditorExportPreset
>
&
p_preset
,
String
&
r_error
,
bool
&
r_missing_templates
)
const
;
virtual
String
get_binary_extension
()
const
;
virtual
String
get_binary_extension
(
const
Ref
<
EditorExportPreset
>
&
p_preset
)
const
;
virtual
Error
export_project
(
const
Ref
<
EditorExportPreset
>
&
p_preset
,
bool
p_debug
,
const
String
&
p_path
,
int
p_flags
=
0
);
void
set_extension
(
const
String
&
p_extension
);
void
set_extension
(
const
String
&
p_extension
,
const
String
&
p_feature_key
=
"default"
);
void
set_name
(
const
String
&
p_name
);
void
set_os_name
(
const
String
&
p_name
);
...
...
editor/project_export.cpp
View file @
a68d15d5
...
...
@@ -718,7 +718,9 @@ void ProjectExportDialog::_export_project() {
export_project
->
set_access
(
FileDialog
::
ACCESS_FILESYSTEM
);
export_project
->
clear_filters
();
export_project
->
set_current_file
(
default_filename
);
String
extension
=
platform
->
get_binary_extension
();
String
extension
=
platform
->
get_binary_extension
(
current
);
if
(
extension
!=
String
())
{
export_project
->
add_filter
(
"*."
+
extension
+
" ; "
+
platform
->
get_name
()
+
" Export"
);
}
...
...
platform/android/export/export.cpp
View file @
a68d15d5
...
...
@@ -1305,7 +1305,7 @@ public:
return
valid
;
}
virtual
String
get_binary_extension
()
const
{
virtual
String
get_binary_extension
(
const
Ref
<
EditorExportPreset
>
&
p_preset
)
const
{
return
"apk"
;
}
...
...
platform/iphone/export/export.cpp
View file @
a68d15d5
...
...
@@ -108,7 +108,7 @@ public:
virtual
String
get_os_name
()
const
{
return
"iOS"
;
}
virtual
Ref
<
Texture
>
get_logo
()
const
{
return
logo
;
}
virtual
String
get_binary_extension
()
const
{
return
"ipa"
;
}
virtual
String
get_binary_extension
(
const
Ref
<
EditorExportPreset
>
&
p_preset
)
const
{
return
"ipa"
;
}
virtual
Error
export_project
(
const
Ref
<
EditorExportPreset
>
&
p_preset
,
bool
p_debug
,
const
String
&
p_path
,
int
p_flags
=
0
);
virtual
bool
can_export
(
const
Ref
<
EditorExportPreset
>
&
p_preset
,
String
&
r_error
,
bool
&
r_missing_templates
)
const
;
...
...
platform/javascript/export/export.cpp
View file @
a68d15d5
...
...
@@ -57,7 +57,7 @@ public:
virtual
Ref
<
Texture
>
get_logo
()
const
;
virtual
bool
can_export
(
const
Ref
<
EditorExportPreset
>
&
p_preset
,
String
&
r_error
,
bool
&
r_missing_templates
)
const
;
virtual
String
get_binary_extension
()
const
;
virtual
String
get_binary_extension
(
const
Ref
<
EditorExportPreset
>
&
p_preset
)
const
;
virtual
Error
export_project
(
const
Ref
<
EditorExportPreset
>
&
p_preset
,
bool
p_debug
,
const
String
&
p_path
,
int
p_flags
=
0
);
virtual
bool
poll_devices
();
...
...
@@ -149,7 +149,7 @@ bool EditorExportPlatformJavaScript::can_export(const Ref<EditorExportPreset> &p
return
!
r_missing_templates
;
}
String
EditorExportPlatformJavaScript
::
get_binary_extension
()
const
{
String
EditorExportPlatformJavaScript
::
get_binary_extension
(
const
Ref
<
EditorExportPreset
>
&
p_preset
)
const
{
return
"html"
;
}
...
...
platform/osx/export/export.cpp
View file @
a68d15d5
...
...
@@ -74,7 +74,7 @@ public:
virtual
String
get_os_name
()
const
{
return
"OSX"
;
}
virtual
Ref
<
Texture
>
get_logo
()
const
{
return
logo
;
}
virtual
String
get_binary_extension
()
const
{
return
use_dmg
()
?
"dmg"
:
"zip"
;
}
virtual
String
get_binary_extension
(
const
Ref
<
EditorExportPreset
>
&
p_preset
)
const
{
return
use_dmg
()
?
"dmg"
:
"zip"
;
}
virtual
Error
export_project
(
const
Ref
<
EditorExportPreset
>
&
p_preset
,
bool
p_debug
,
const
String
&
p_path
,
int
p_flags
=
0
);
virtual
bool
can_export
(
const
Ref
<
EditorExportPreset
>
&
p_preset
,
String
&
r_error
,
bool
&
r_missing_templates
)
const
;
...
...
platform/uwp/export/export.cpp
View file @
a68d15d5
...
...
@@ -1013,7 +1013,7 @@ public:
return
"UWP"
;
}
virtual
String
get_binary_extension
()
const
{
virtual
String
get_binary_extension
(
const
Ref
<
EditorExportPreset
>
&
p_preset
)
const
{
return
"appx"
;
}
...
...
platform/x11/export/export.cpp
View file @
a68d15d5
...
...
@@ -44,7 +44,8 @@ void register_x11_exporter() {
logo
->
create_from_image
(
img
);
platform
->
set_logo
(
logo
);
platform
->
set_name
(
"Linux/X11"
);
platform
->
set_extension
(
"bin"
);
platform
->
set_extension
(
"x86"
);
platform
->
set_extension
(
"x86_64"
,
"binary_format/64_bits"
);
platform
->
set_release_32
(
"linux_x11_32_release"
);
platform
->
set_debug_32
(
"linux_x11_32_debug"
);
platform
->
set_release_64
(
"linux_x11_64_release"
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment