openboe/oboe
2
0
Fork 0
Code Issues 146 Pull Requests 4 Actions Packages Projects Releases Wiki Activity

Merge branch 'linux' into merge_linux

Browse Source
This commit is contained in:
Michael Bonfils
2018-02-08 20:36:46 +01:00
parent cb9f0eda53 75c3fd55ea
commit d940f2c39d
128 changed files with 1618 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/pcedit/SConscript
View File

@@ -20,8 +20,12 @@ elif str(platform) == "win32":
pc.menus.win.cpp
"""))
pced_sources.append(env.RES('#rsrc/menus/CharEditor.rc'))
elif str(platform) == "posix":
pced_sources.extend(Split("""
pc.menus.linux.cpp
"""))
pced = env.Program("#build/bin/BoE Character Editor", common_sources + party_classes + pced_sources)
pced = env.Program("#build/bin/BoE Character Editor", pced_sources + common_sources + party_classes)
if str(platform) == "darwin":
pced_info = {
@@ -30,7 +34,7 @@ if str(platform) == "darwin":
'creator': 'blxe',
'icons': 'BoECharEd',
}
elif str(platform) == "win32":
else:
pced_info = {}
env.Package(pced, install_dir, pced_info)

42
src/pcedit/pc.menus.linux.cpp Normal file
View File

@@ -0,0 +1,42 @@
#include "pc.menus.hpp"
#include <map>
#include <SFML/Graphics/RenderWindow.hpp>
#include "universe.hpp"
#include "winutil.hpp"
// This is the index of each menu on the menubar
enum {
FILE_MENU_POS = 0,
PARTY_MENU_POS = 1,
SCEN_MENU_POS = 2,
ITEMS_MENU_POS = 3,
HELP_MENU_POS = 7,
};
extern sf::RenderWindow mainPtr;
extern cUniverse univ;
extern bool scen_items_loaded, party_in_scen;
extern fs::path file_in_mem;
std::map<int,eMenu> menuChoices;
void init_menubar() {
}
void update_item_menu() {
}
void menu_activate() {
}
#include "cursors.hpp"
#include "fileio.hpp"
#include "pc.fileio.hpp"
extern bool party_in_scen, scen_items_loaded;
extern fs::path file_in_mem;
void set_up_apple_events(int argc, char* argv[]) {
}