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

Compare commits

base: berkus:6276f65be4f07c80bf3e2f2adafe2dd426f52d52
Branches Tags
berkus:master
..
compare: berkus:1104a2f2efcf5ec4d8204e65ce3cdbf547c5b401
Branches Tags
berkus:master

No commits in common. "6276f65be4f07c80bf3e2f2adafe2dd426f52d52" and "1104a2f2efcf5ec4d8204e65ce3cdbf547c5b401" have entirely different histories.
6276f65be4 ... 1104a2f2ef

2 changed files with 3 additions and 10 deletions
Show Stats Expand all files Collapse all files

9
util/build.c
View File

@ -653,7 +653,7 @@ void Run(int emulator, int log, int debug) {
case EMULATOR_VIRTUALBOX: {
// TODO Automatically setup the Essence VM if it doesn't exist.
CallSystem("VBoxManage storageattach Essence --storagectl SATA --port 0 --device 0 --type hdd --medium none");
CallSystem("VBoxManage storageattach Essence --storagectl AHCI --port 0 --device 0 --type hdd --medium none");
CallSystem("VBoxManage closemedium disk bin/vbox.vdi --delete");
if (IsOptionEnabled("Emulator.VBoxEFI")) {
@ -665,7 +665,7 @@ void Run(int emulator, int log, int debug) {
CallSystem("VBoxManage modifyvm Essence --firmware bios");
}
CallSystem("VBoxManage storageattach Essence --storagectl SATA --port 0 --device 0 --type hdd --medium bin/vbox.vdi");
CallSystem("VBoxManage storageattach Essence --storagectl AHCI --port 0 --device 0 --type hdd --medium bin/vbox.vdi");
CallSystem("VBoxManage startvm --putenv VBOX_GUI_DBG_ENABLED=true Essence");
} break;
@ -1145,11 +1145,8 @@ void DoCommand(const char *l) {
BUILD_UTILITY("font_editor", "-lX11 -Wno-unused-parameter", "");
CallSystem("bin/font_editor res/Fonts/Bitmap\\ Sans\\ Regular\\ 9.font");
} else if (0 == strcmp(l, "config")) {
#ifdef __MSYS__
BUILD_UTILITY("config_editor", "-Wl,-subsystem,windows -Wno-unused-parameter -mwindows", "");
#else
BUILD_UTILITY("config_editor", "-lX11 -Wno-unused-parameter", "");
#endif
if (CallSystem("bin/config_editor")) {
printf("The config editor could not be opened.\n"
"This likely means your system does not have X11 setup.\n"

4
util/config_editor.c
View File

@ -7,11 +7,7 @@
#include <stdio.h>
#ifdef __MSYS__
#define UI_WINDOWS
#else
#define UI_LINUX
#endif
#define UI_IMPLEMENTATION
#include "luigi.h"