change pe_bliss parent directory from /drivers to /tools
This commit is contained in:
parent
24f3f43457
commit
55b8c3ee48
@ -39,7 +39,6 @@ if (env["opus"]=="yes"):
|
||||
SConscript('opus/SCsub');
|
||||
if (env["tools"]=="yes"):
|
||||
SConscript("convex_decomp/SCsub");
|
||||
SConscript('pe_bliss/SCsub');
|
||||
|
||||
#if env["theora"]=="yes":
|
||||
# SConscript("theoraplayer/SCsub")
|
||||
|
@ -1,5 +0,0 @@
|
||||
Import('env')
|
||||
|
||||
env.add_source_files(env.drivers_sources,"*.cpp")
|
||||
|
||||
Export('env')
|
@ -252,10 +252,6 @@ void register_driver_types() {
|
||||
_register_etc1_compress_func();
|
||||
#endif
|
||||
|
||||
#ifdef TOOLS_ENABLED
|
||||
EditorExportPlatformWindows::_add_resrc_func=pe_bliss_add_resrc;
|
||||
#endif
|
||||
|
||||
initialize_chibi();
|
||||
}
|
||||
|
||||
|
@ -32,13 +32,12 @@
|
||||
#include "os/os.h"
|
||||
#include "globals.h"
|
||||
#include "tools/editor/editor_node.h"
|
||||
#include "tools/pe_bliss/pe_bliss_godot.h"
|
||||
|
||||
/**
|
||||
@author Masoud BaniHashemian <masoudbh3@gmail.com>
|
||||
*/
|
||||
|
||||
String (*EditorExportPlatformWindows::_add_resrc_func)(const char* ,int ,int ,String& ,
|
||||
String& ,String& ,String& , String& ,String& , DVector<uint8_t>& )=NULL;
|
||||
|
||||
void EditorExportPlatformWindows::store_16(DVector<uint8_t>& vector, uint16_t value) {
|
||||
const uint8_t* bytes = reinterpret_cast<const uint8_t*>(&value);
|
||||
@ -205,9 +204,6 @@ Error EditorExportPlatformWindows::export_project(const String& p_path, bool p_d
|
||||
{
|
||||
return err;
|
||||
}
|
||||
if(!_add_resrc_func) {
|
||||
return err;
|
||||
} else {
|
||||
EditorProgress ep("editexe","Edit EXE File",102);
|
||||
ep.step("Create ico file..",0);
|
||||
|
||||
@ -311,7 +307,7 @@ Error EditorExportPlatformWindows::export_project(const String& p_path, bool p_d
|
||||
product_name=product_name.replace("$genname",basename);
|
||||
String godot_version;
|
||||
if(set_godot_version) godot_version = String( VERSION_MKSTRING );
|
||||
String ret = EditorExportPlatformWindows::_add_resrc_func(p_path.utf8(), version_major, version_minor,
|
||||
String ret = pe_bliss_add_resrc(p_path.utf8(), version_major, version_minor,
|
||||
company_name, file_description, legal_copyright, version_text,
|
||||
product_name, godot_version, icon_content);
|
||||
if (ret.empty()) {
|
||||
@ -320,8 +316,6 @@ Error EditorExportPlatformWindows::export_project(const String& p_path, bool p_d
|
||||
EditorNode::add_io_error(ret);
|
||||
return ERR_FILE_CANT_WRITE;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
EditorExportPlatformWindows::EditorExportPlatformWindows() {
|
||||
|
@ -29,7 +29,6 @@ protected:
|
||||
void _get_property_list( List<PropertyInfo> *p_list) const;
|
||||
|
||||
public:
|
||||
static String (*_add_resrc_func)(const char*,int,int,String&,String&,String&,String&,String&,String&,DVector<uint8_t>&);
|
||||
Error export_project(const String& p_path, bool p_debug, bool p_dumb=false, bool p_remote_debug=false);
|
||||
EditorExportPlatformWindows();
|
||||
};
|
||||
|
@ -11,6 +11,7 @@ if (env["tools"]!="no"):
|
||||
SConscript('collada/SCsub');
|
||||
SConscript('docdump/SCsub');
|
||||
SConscript('freetype/SCsub');
|
||||
SConscript('pe_bliss/SCsub');
|
||||
SConscript('doc/SCsub')
|
||||
SConscript('pck/SCsub')
|
||||
|
||||
|
5
tools/pe_bliss/SCsub
Normal file
5
tools/pe_bliss/SCsub
Normal file
@ -0,0 +1,5 @@
|
||||
Import('env')
|
||||
|
||||
env.add_source_files(env.tool_sources,"*.cpp")
|
||||
|
||||
Export('env')
|
Loading…
Reference in New Issue
Block a user