berkus
/
essence-os
mirror of https://gitlab.com/nakst/essence
1
0
Fork 0
Code Releases Activity

strip symbols from gl test

This commit is contained in:
nakst 2021-09-20 22:14:14 +01:00
parent 93c55a8145
commit 923e4b72d7
2 changed files with 42 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
apps/file_manager/ui.cpp
View File

@ -831,22 +831,6 @@ int ListCallback(EsElement *element, EsMessage *message) {
} else if (message->type == ES_MSG_MOUSE_RIGHT_CLICK) {
EsMenu *menu = EsMenuCreate(element, ES_MENU_AT_CURSOR);
#define ADD_SORT_COLUMN_MENU_ITEM(_column, _string) \
EsMenuAddItem(menu, instance->viewSettings.sortColumn == (_column) ? ES_MENU_ITEM_CHECKED : ES_FLAGS_DEFAULT, \
INTERFACE_STRING(_string), InstanceChangeSortColumn, _column)
EsMenuAddItem(menu, ES_MENU_ITEM_HEADER, INTERFACE_STRING(CommonSortAscending));
ADD_SORT_COLUMN_MENU_ITEM(COLUMN_NAME, FileManagerColumnName);
ADD_SORT_COLUMN_MENU_ITEM(COLUMN_TYPE, FileManagerColumnType);
ADD_SORT_COLUMN_MENU_ITEM(COLUMN_SIZE, FileManagerColumnSize);
EsMenuAddSeparator(menu);
EsMenuAddItem(menu, ES_MENU_ITEM_HEADER, INTERFACE_STRING(CommonSortDescending));
ADD_SORT_COLUMN_MENU_ITEM(COLUMN_NAME | (1 << 8), FileManagerColumnName);
ADD_SORT_COLUMN_MENU_ITEM(COLUMN_TYPE | (1 << 8), FileManagerColumnType);
ADD_SORT_COLUMN_MENU_ITEM(COLUMN_SIZE | (1 << 8), FileManagerColumnSize);
#undef ADD_SORT_COLUMN_MENU_ITEM
EsMenuNextColumn(menu);
EsMenuAddItem(menu, ES_MENU_ITEM_HEADER, INTERFACE_STRING(FileManagerListContextActions));
EsMenuAddCommand(menu, ES_FLAGS_DEFAULT, INTERFACE_STRING(CommonClipboardPaste), EsCommandByID(instance, ES_COMMAND_PASTE));
EsMenuAddCommand(menu, ES_FLAGS_DEFAULT, INTERFACE_STRING(CommonSelectionSelectAll), EsCommandByID(instance, ES_COMMAND_SELECT_ALL));
@ -863,6 +847,22 @@ int ListCallback(EsElement *element, EsMessage *message) {
ADD_VIEW_TYPE_MENU_ITEM(&instance->commandViewDetails, CommonListViewTypeDetails);
#undef ADD_VIEW_TYPE_MENU_ITEM
EsMenuNextColumn(menu);
#define ADD_SORT_COLUMN_MENU_ITEM(_column, _string) \
EsMenuAddItem(menu, instance->viewSettings.sortColumn == (_column) ? ES_MENU_ITEM_CHECKED : ES_FLAGS_DEFAULT, \
INTERFACE_STRING(_string), InstanceChangeSortColumn, _column)
EsMenuAddItem(menu, ES_MENU_ITEM_HEADER, INTERFACE_STRING(CommonSortAscending));
ADD_SORT_COLUMN_MENU_ITEM(COLUMN_NAME, FileManagerColumnName);
ADD_SORT_COLUMN_MENU_ITEM(COLUMN_TYPE, FileManagerColumnType);
ADD_SORT_COLUMN_MENU_ITEM(COLUMN_SIZE, FileManagerColumnSize);
EsMenuAddSeparator(menu);
EsMenuAddItem(menu, ES_MENU_ITEM_HEADER, INTERFACE_STRING(CommonSortDescending));
ADD_SORT_COLUMN_MENU_ITEM(COLUMN_NAME | (1 << 8), FileManagerColumnName);
ADD_SORT_COLUMN_MENU_ITEM(COLUMN_TYPE | (1 << 8), FileManagerColumnType);
ADD_SORT_COLUMN_MENU_ITEM(COLUMN_SIZE | (1 << 8), FileManagerColumnSize);
#undef ADD_SORT_COLUMN_MENU_ITEM
EsMenuShow(menu);
} else {
return 0;

15
util/build_core.c
View File

@ -578,13 +578,6 @@ void BuildDesktop(Application *application) {
}
void BuildApplication(Application *application) {
if (application->customCompileCommand) {
#ifdef OS_ESSENCE
// TODO.
#else
application->error = system(application->customCompileCommand);
#endif
} else {
char symbolFile[256];
char objectFiles[4096];
char strippedFile[256];
@ -610,6 +603,14 @@ void BuildApplication(Application *application) {
snprintf(executable, sizeof(executable), "bin/%s.esx", application->name);
}
if (application->customCompileCommand) {
#ifdef OS_ESSENCE
// TODO.
#else
application->error = system(application->customCompileCommand);
ExecuteForApp(application, toolchainStrip, "--strip-all", executable);
#endif
} else {
for (uintptr_t i = 0; i < arrlenu(application->sources); i++) {
const char *source = application->sources[i];
size_t sourceBytes = strlen(source);