Skip to content

Commit aed812a

Browse files
Totto16Totto16
committed
windows: support dll library for oopertis-graphics, part2
add export or import declarations, to be able to build libraries as dll
1 parent 5fc5558 commit aed812a

32 files changed

+177
-144
lines changed

‎src/executables/game/parser.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ helper::expected<CommandLineArguments, std::string> helper::parse_args(const std
4242
}
4343
}
4444
#if defined(__SERENITY__)
45-
// serenity OS can#t handle vsync very well (Since it's inside qemu), so setting the target_fps value to 60 per default
45+
// serenity OS can't handle vsync very well (Since it's inside qemu), so setting the target_fps value to 60 per default
4646
if (not result.target_fps.has_value()) {
4747
result.target_fps = 60;
4848
}

‎src/scenes/about_page/about_page.hpp‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,12 @@ namespace scenes {
2020
};
2121

2222
public:
23-
explicit AboutPage(ServiceProvider* service_provider, const ui::Layout& layout);
23+
OOPETRIS_GRAPHICS_EXPORTED explicit AboutPage(ServiceProvider* service_provider, const ui::Layout& layout);
2424

25-
[[nodiscard]] UpdateResult update() override;
26-
void render(const ServiceProvider& service_provider) override;
27-
bool handle_event(const std::shared_ptr<input::InputManager>& input_manager, const SDL_Event& event) override;
25+
OOPETRIS_GRAPHICS_EXPORTED [[nodiscard]] UpdateResult update() override;
26+
OOPETRIS_GRAPHICS_EXPORTED void render(const ServiceProvider& service_provider) override;
27+
OOPETRIS_GRAPHICS_EXPORTED bool
28+
handle_event(const std::shared_ptr<input::InputManager>& input_manager, const SDL_Event& event) override;
2829
};
2930

3031
} // namespace scenes

‎src/scenes/loading_screen/loading_screen.hpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ namespace scenes {
2020
shapes::UPoint m_start_offset;
2121

2222
public:
23-
explicit LoadingScreen(ServiceProvider* service_provider);
23+
OOPETRIS_GRAPHICS_EXPORTED explicit LoadingScreen(ServiceProvider* service_provider);
2424

25-
void update();
25+
OOPETRIS_GRAPHICS_EXPORTED void update();
2626

27-
void render(const ServiceProvider& service_provider) const;
27+
OOPETRIS_GRAPHICS_EXPORTED void render(const ServiceProvider& service_provider) const;
2828

2929
private:
3030
[[nodiscard]] shapes::UPoint to_screen_coords(const Mino::GridPoint& point, u32 tile_size) const;

‎src/scenes/logo/logo.hpp‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ namespace logo {
99
constexpr const auto width = 33;
1010
constexpr const auto height = 5;
1111

12-
[[nodiscard]] Texture get_logo(const ServiceProvider* service_provider, double scale = 1.0);
12+
OOPETRIS_GRAPHICS_EXPORTED [[nodiscard]] Texture
13+
get_logo(const ServiceProvider* service_provider, double scale = 1.0);
1314

1415
} // namespace logo

‎src/scenes/main_menu/main_menu.hpp‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,12 @@ namespace scenes {
2121
std::optional<Command> m_next_command;
2222

2323
public:
24-
explicit MainMenu(ServiceProvider* service_provider, const ui::Layout& layout);
24+
OOPETRIS_GRAPHICS_EXPORTED explicit MainMenu(ServiceProvider* service_provider, const ui::Layout& layout);
2525

26-
[[nodiscard]] UpdateResult update() override;
27-
void render(const ServiceProvider& service_provider) override;
28-
bool handle_event(const std::shared_ptr<input::InputManager>& input_manager, const SDL_Event& event) override;
26+
OOPETRIS_GRAPHICS_EXPORTED [[nodiscard]] UpdateResult update() override;
27+
OOPETRIS_GRAPHICS_EXPORTED void render(const ServiceProvider& service_provider) override;
28+
OOPETRIS_GRAPHICS_EXPORTED bool
29+
handle_event(const std::shared_ptr<input::InputManager>& input_manager, const SDL_Event& event) override;
2930
};
3031

3132
} // namespace scenes

‎src/scenes/multiplayer_menu/multiplayer_menu.hpp‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,15 @@ namespace scenes {
1515
std::optional<Command> m_next_command;
1616

1717
public:
18-
explicit MultiPlayerMenu(ServiceProvider* service_provider, const ui::Layout& layout);
18+
OOPETRIS_GRAPHICS_EXPORTED explicit MultiPlayerMenu(
19+
ServiceProvider* service_provider,
20+
const ui::Layout& layout
21+
);
1922

20-
[[nodiscard]] UpdateResult update() override;
21-
void render(const ServiceProvider& service_provider) override;
22-
bool handle_event(const std::shared_ptr<input::InputManager>& input_manager, const SDL_Event& event) override;
23+
OOPETRIS_GRAPHICS_EXPORTED [[nodiscard]] UpdateResult update() override;
24+
OOPETRIS_GRAPHICS_EXPORTED void render(const ServiceProvider& service_provider) override;
25+
OOPETRIS_GRAPHICS_EXPORTED bool
26+
handle_event(const std::shared_ptr<input::InputManager>& input_manager, const SDL_Event& event) override;
2327
};
2428

2529
} // namespace scenes

‎src/scenes/online_lobby/online_lobby.hpp‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,12 @@ namespace scenes {
2020
std::unique_ptr<lobby::Client> m_client{ nullptr };
2121

2222
public:
23-
explicit OnlineLobby(ServiceProvider* service_provider, const ui::Layout& layout);
23+
OOPETRIS_GRAPHICS_EXPORTED explicit OnlineLobby(ServiceProvider* service_provider, const ui::Layout& layout);
2424

25-
[[nodiscard]] UpdateResult update() override;
26-
void render(const ServiceProvider& service_provider) override;
27-
bool handle_event(const std::shared_ptr<input::InputManager>& input_manager, const SDL_Event& event) override;
25+
OOPETRIS_GRAPHICS_EXPORTED [[nodiscard]] UpdateResult update() override;
26+
OOPETRIS_GRAPHICS_EXPORTED void render(const ServiceProvider& service_provider) override;
27+
OOPETRIS_GRAPHICS_EXPORTED bool
28+
handle_event(const std::shared_ptr<input::InputManager>& input_manager, const SDL_Event& event) override;
2829
};
2930

3031
} // namespace scenes

‎src/scenes/play_select_menu/play_select_menu.hpp‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,12 @@ namespace scenes {
1515
std::optional<Command> m_next_command;
1616

1717
public:
18-
explicit PlaySelectMenu(ServiceProvider* service_provider, const ui::Layout& layout);
18+
OOPETRIS_GRAPHICS_EXPORTED explicit PlaySelectMenu(ServiceProvider* service_provider, const ui::Layout& layout);
1919

20-
[[nodiscard]] UpdateResult update() override;
21-
void render(const ServiceProvider& service_provider) override;
22-
bool handle_event(const std::shared_ptr<input::InputManager>& input_manager, const SDL_Event& event) override;
20+
OOPETRIS_GRAPHICS_EXPORTED [[nodiscard]] UpdateResult update() override;
21+
OOPETRIS_GRAPHICS_EXPORTED void render(const ServiceProvider& service_provider) override;
22+
OOPETRIS_GRAPHICS_EXPORTED bool
23+
handle_event(const std::shared_ptr<input::InputManager>& input_manager, const SDL_Event& event) override;
2324
};
2425

2526
} // namespace scenes

‎src/scenes/recording_selector/recording_chooser.hpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,19 @@ namespace custom_ui {
1919
std::vector<std::filesystem::path> currently_chosen_files{};
2020

2121
public:
22-
explicit RecordingFileChooser(
22+
OOPETRIS_GRAPHICS_EXPORTED explicit RecordingFileChooser(
2323
ServiceProvider* service_provider,
2424
ui::FocusHelper& focus_helper,
2525
const ui::Layout& layout,
2626
bool is_top_level
2727
);
2828

29-
void render(const ServiceProvider& service_provider) const override;
29+
OOPETRIS_GRAPHICS_EXPORTED void render(const ServiceProvider& service_provider) const override;
3030

31-
[[nodiscard]] Widget::EventHandleResult
31+
OOPETRIS_GRAPHICS_EXPORTED [[nodiscard]] Widget::EventHandleResult
3232
handle_event(const std::shared_ptr<input::InputManager>& input_manager, const SDL_Event& event) override;
3333

34-
[[nodiscard]] const std::vector<std::filesystem::path>& get_currently_chosen_files() const;
34+
OOPETRIS_GRAPHICS_EXPORTED [[nodiscard]] const std::vector<std::filesystem::path>& get_currently_chosen_files() const;
3535

3636
private:
3737
[[nodiscard]] std::tuple<ui::Label*, ui::Label*, ui::Label*, ui::Label*> get_texts();

‎src/scenes/recording_selector/recording_component.hpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,20 +37,20 @@ namespace custom_ui {
3737
data::RecordingMetadata m_metadata;
3838

3939
public:
40-
explicit RecordingComponent(
40+
OOPETRIS_GRAPHICS_EXPORTED explicit RecordingComponent(
4141
ServiceProvider* service_provider,
4242
ui::FocusHelper& focus_helper,
4343
data::RecordingMetadata metadata,
4444
const ui::Layout& layout,
4545
bool is_top_level
4646
);
4747

48-
void render(const ServiceProvider& service_provider) const override;
48+
OOPETRIS_GRAPHICS_EXPORTED void render(const ServiceProvider& service_provider) const override;
4949

50-
[[nodiscard]] Widget::EventHandleResult
50+
OOPETRIS_GRAPHICS_EXPORTED [[nodiscard]] Widget::EventHandleResult
5151
handle_event(const std::shared_ptr<input::InputManager>& input_manager, const SDL_Event& event) override;
5252

53-
[[nodiscard]] data::RecordingMetadata metadata() const;
53+
OOPETRIS_GRAPHICS_EXPORTED [[nodiscard]] data::RecordingMetadata metadata() const;
5454

5555
private:
5656
[[nodiscard]] std::tuple<ui::Label*, ui::Label*, ui::Label*, ui::Label*> get_texts();

0 commit comments

Comments
 (0)