tobid7/palladium
1
0
Fork 0
Code Issues 7 Pull Requests Actions Packages Projects Releases Wiki Activity

Fix MSVC dll building

Browse Source
This commit is contained in:
tobid7
2026-01-29 20:17:04 +01:00
parent 1ec06a26cc
commit 683c226ce0
7 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@@ -70,6 +70,7 @@ if(${PD_BUILD_SHARED})
target_compile_definitions(palladium PRIVATE -DPD_BUILD_SHARED) target_compile_definitions(palladium PRIVATE -DPD_BUILD_SHARED)
else() else()
add_library(palladium STATIC ${PD_SOURCES}) add_library(palladium STATIC ${PD_SOURCES})
target_compile_definitions(palladium PUBLIC -DPD_BUILD_STATIC)
endif() endif()
target_include_directories(palladium PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include) target_include_directories(palladium PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include)
@@ -82,12 +83,10 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "Nintendo3DS")
) )
endif() endif()
if(${CMAKE_BUILD_TYPE} STREQUAL "Release")
target_compile_options(palladium PRIVATE target_compile_options(palladium PRIVATE
$<$<CONFIG:Debug>:-O0 -g> $<$<CONFIG:Debug>:-O0 -g>
$<$<CONFIG:Release>:-O3> $<$<CONFIG:Release>:-O3>
) )
endif()
install(DIRECTORY include DESTINATION ".") install(DIRECTORY include DESTINATION ".")
install(TARGETS palladium) install(TARGETS palladium)

3
include/pd/drivers/hid.hpp
View File

@@ -83,7 +83,8 @@ constexpr static KbKey Kb_F11 = KbKey::Flag(47);
constexpr static KbKey Kb_F12 = KbKey::Flag(48); constexpr static KbKey Kb_F12 = KbKey::Flag(48);
constexpr static KbKey Kb_MouseLeft = KbKey::Flag(120); constexpr static KbKey Kb_MouseLeft = KbKey::Flag(120);
} // namespace HidKb } // namespace HidKb
class HidDriver {
class PD_API HidDriver {
public: public:
enum Flags : u32 { enum Flags : u32 {
Flags_None = 0, Flags_None = 0,

2
include/pd/lithium/drawlist.hpp
View File

@@ -91,7 +91,7 @@ class PD_API DrawList {
void SetFontScale(float scale) { pFontScale = scale; } void SetFontScale(float scale) { pFontScale = scale; }
void DrawSolid(); void DrawSolid();
void DrawTexture(Texture::Ref tex) { CurrentTex = tex; } void DrawTexture(Texture::Ref tex);
// SECTION: Draw API // // SECTION: Draw API //

5
include/pd/pd_p_api.hpp
View File

@@ -24,7 +24,7 @@ SOFTWARE.
*/ */
/** Generated with ppam */ /** Generated with ppam */
#ifndef PD_BUILD_STATIC
#ifdef _WIN32 // Windows (MSVC Tested) #ifdef _WIN32 // Windows (MSVC Tested)
#ifdef PD_BUILD_SHARED #ifdef PD_BUILD_SHARED
#define PD_API __declspec(dllexport) #define PD_API __declspec(dllexport)
@@ -49,3 +49,6 @@ SOFTWARE.
#else #else
#define PD_API #define PD_API
#endif #endif
#else
#define PD_API
#endif

3
include/pd/ui7/layout.hpp
View File

@@ -34,6 +34,7 @@ SOFTWARE.
namespace PD { namespace PD {
namespace UI7 { namespace UI7 {
class Context;
class PD_API Layout { class PD_API Layout {
public: public:
Layout(const ID& id, IO::Ref io) : ID(id) { Layout(const ID& id, IO::Ref io) : ID(id) {
@@ -172,7 +173,7 @@ class PD_API Layout {
private: private:
friend class Menu; friend class Menu;
friend class Context; friend class PD::UI7::Context;
friend class ReMenu; friend class ReMenu;
// Base Components // Base Components
UI7::ID ID; UI7::ID ID;

8
source/drivers/hid.cpp
View File

@@ -24,13 +24,13 @@ SOFTWARE.
#include <pd/drivers/hid.hpp> #include <pd/drivers/hid.hpp>
namespace PD { namespace PD {
bool HidDriver::IsEvent(Event e, Key keys) { return KeyEvents[0][e] & keys; } PD_API bool HidDriver::IsEvent(Event e, Key keys) { return KeyEvents[0][e] & keys; }
bool HidDriver::IsEvent(Event e, KbKey keys) { PD_API bool HidDriver::IsEvent(Event e, KbKey keys) {
return KbKeyEvents[0][e].Has(keys); return KbKeyEvents[0][e].Has(keys);
} }
void HidDriver::SwapTab() { PD_API void HidDriver::SwapTab() {
auto tkd = KeyEvents[1][Event_Down]; auto tkd = KeyEvents[1][Event_Down];
auto tkh = KeyEvents[1][Event_Held]; auto tkh = KeyEvents[1][Event_Held];
auto tku = KeyEvents[1][Event_Up]; auto tku = KeyEvents[1][Event_Up];
@@ -46,7 +46,7 @@ void HidDriver::SwapTab() {
* If this func has no verride, still clear the stats * If this func has no verride, still clear the stats
* cause if they are empty this leads to a crash * cause if they are empty this leads to a crash
*/ */
void HidDriver::Update() { PD_API void HidDriver::Update() {
// Clear States // Clear States
for (int i = 0; i < 2; i++) { for (int i = 0; i < 2; i++) {
KeyEvents[i][Event_Down] = 0; KeyEvents[i][Event_Down] = 0;

2
source/lithium/drawlist.cpp
View File

@@ -306,5 +306,7 @@ PD_API void DrawList::DrawLine(const fvec2& a, const fvec2& b, u32 color,
PathAdd(b); PathAdd(b);
PathStroke(color, t); PathStroke(color, t);
} }
PD_API void DrawList::DrawTexture(Texture::Ref tex) { CurrentTex = tex; }
} // namespace Li } // namespace Li
} // namespace PD } // namespace PD