Let's just use 1 PD_API header

This commit is contained in:
2026-01-25 20:57:14 +01:00
parent 337c016824
commit fb46f4d36a
63 changed files with 289 additions and 459 deletions

View File

@@ -35,7 +35,7 @@ namespace UI7 {
* This only means that InPressed is responding the info in
* the next frame
*/
class PD_UI7_API Button : public Container {
class PD_API Button : public Container {
public:
/**
* Button Object constructor

View File

@@ -33,7 +33,7 @@ namespace UI7 {
* Context::Update while the visual update is done
* during the Update
*/
class PD_UI7_API Checkbox : public Container {
class PD_API Checkbox : public Container {
public:
/**
* Constructor for Checkbox Object

View File

@@ -32,7 +32,7 @@ namespace UI7 {
/**
* Color Editor (Creating a PopUP when clicking)
*/
class PD_UI7_API ColorEdit : public Container {
class PD_API ColorEdit : public Container {
public:
/**
* Constructor

4
include/pd/ui7/container/container.hpp Executable file → Normal file
View File

@@ -24,8 +24,8 @@ SOFTWARE.
*/
#include <pd/core/core.hpp>
#include <pd/pd_p_api.hpp>
#include <pd/ui7/io.hpp>
#include <pd/ui7/pd_p_api.hpp>
namespace PD {
namespace UI7 {
@@ -33,7 +33,7 @@ namespace UI7 {
* Container base class all Objects are based on
* @note this class can be used to create custom Objects as well
*/
class PD_UI7_API Container {
class PD_API Container {
public:
Container() = default;
/**

View File

@@ -33,7 +33,7 @@ namespace UI7 {
* and modifys these by moving left or right when dragging
*/
template <typename T>
class PD_UI7_API DragData : public Container {
class PD_API DragData : public Container {
public:
/**
* Constructor

View File

@@ -36,7 +36,7 @@ namespace UI7 {
* This only means that InPressed is responding the info in
* the next frame
*/
class PD_UI7_API DynObj : public Container {
class PD_API DynObj : public Container {
public:
/**
* Button Object constructor

View File

@@ -30,7 +30,7 @@ namespace UI7 {
/**
* Image Object
*/
class PD_UI7_API Image : public Container {
class PD_API Image : public Container {
public:
/**
* Constructor for the Image Object

View File

@@ -30,7 +30,7 @@ namespace UI7 {
/**
* Label [Text] Object
*/
class PD_UI7_API Label : public Container {
class PD_API Label : public Container {
public:
/**
* Constructor for Label Object

View File

@@ -33,7 +33,7 @@ namespace UI7 {
* and modifys these by moving left or right when dragging
*/
template <typename T>
class PD_UI7_API Slider : public Container {
class PD_API Slider : public Container {
public:
/**
* Constructor

2
include/pd/ui7/input_api.hpp Executable file → Normal file
View File

@@ -26,8 +26,8 @@ SOFTWARE.
#include <pd/core/core.hpp>
#include <pd/lithium/lithium.hpp>
#include <pd/pd_p_api.hpp>
#include <pd/ui7/id.hpp>
#include <pd/ui7/pd_p_api.hpp>
namespace PD {
namespace UI7 {

4
include/pd/ui7/io.hpp Executable file → Normal file
View File

@@ -25,14 +25,14 @@ SOFTWARE.
*/
#include <pd/core/core.hpp>
#include <pd/pd_p_api.hpp>
#include <pd/ui7/input_api.hpp>
#include <pd/ui7/pd_p_api.hpp>
#include <pd/ui7/theme.hpp>
#include <pd/ui7/viewport.hpp>
namespace PD {
namespace UI7 {
class PD_UI7_API IO {
class PD_API IO {
public:
IO() {
Time = Timer::New();

View File

@@ -25,17 +25,17 @@ SOFTWARE.
*/
#include <pd/core/core.hpp>
#include <pd/pd_p_api.hpp>
#include <pd/ui7/container/container.hpp>
#include <pd/ui7/container/dragdata.hpp>
#include <pd/ui7/container/slider.hpp>
#include <pd/ui7/flags.hpp>
#include <pd/ui7/input_api.hpp>
#include <pd/ui7/pd_p_api.hpp>
#include <pd/ui7/theme.hpp>
namespace PD {
namespace UI7 {
class PD_UI7_API Layout {
class PD_API Layout {
public:
Layout(const ID& id, IO::Ref io) : ID(id) {
this->IO = io;

View File

@@ -25,16 +25,16 @@ SOFTWARE.
*/
#include <pd/core/core.hpp>
#include <pd/pd_p_api.hpp>
#include <pd/ui7/containers.hpp>
#include <pd/ui7/io.hpp>
#include <pd/ui7/layout.hpp>
#include <pd/ui7/pd_p_api.hpp>
#include "pd/ui7/container/dragdata.hpp"
namespace PD {
namespace UI7 {
class PD_UI7_API Menu {
class PD_API Menu {
public:
Menu(const UI7::ID& id, UI7::IO::Ref pIO);
~Menu() {}

View File

@@ -1,51 +0,0 @@
#pragma once
/*
MIT License
Copyright (c) 2024 - 2025 René Amthor (tobid7)
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
*/
/** Generated with ppam */
#ifdef _WIN32 // Windows (MSVC Tested)
#ifdef PD_UI7_BUILD_SHARED
#define PD_UI7_API __declspec(dllexport)
#else
#define PD_UI7_API __declspec(dllimport)
#endif
#elif defined(__APPLE__) // macOS (untested yet)
#ifdef PD_UI7_BUILD_SHARED
#define PD_UI7_API __attribute__((visibility("default")))
#else
#define PD_UI7_API
#endif
#elif defined(__linux__) // Linux (untested yet)
#ifdef PD_UI7_BUILD_SHARED
#define PD_UI7_API __attribute__((visibility("default")))
#else
#define PD_UI7_API
#endif
#elif defined(__3DS__) // 3ds Specific
// Only Static supported
#define PD_UI7_API
#else
#define PD_UI7_API
#endif

View File

@@ -24,7 +24,7 @@ SOFTWARE.
*/
#include <pd/core/core.hpp>
#include <pd/ui7/pd_p_api.hpp>
#include <pd/pd_p_api.hpp>
/**
* Using this to support 32bit color values as well as
@@ -55,7 +55,7 @@ enum UI7Color_ {
namespace PD {
namespace UI7 {
class PD_UI7_API Theme {
class PD_API Theme {
public:
/**
* Default Constructor Setting up the Default theme

6
include/pd/ui7/ui7.hpp Executable file → Normal file
View File

@@ -25,9 +25,9 @@ SOFTWARE.
*/
#include <pd/core/core.hpp>
#include <pd/pd_p_api.hpp>
#include <pd/ui7/io.hpp>
#include <pd/ui7/menu.hpp>
#include <pd/ui7/pd_p_api.hpp>
#include "pd/ui7/flags.hpp"
@@ -46,9 +46,9 @@ namespace UI7 {
* @param show_build Show build num (mostly unused)
* @return Version String (1.0.0-1 for example)
*/
PD_UI7_API std::string GetVersion(bool show_build = false);
PD_API std::string GetVersion(bool show_build = false);
/** Base Context for UI7 */
class PD_UI7_API Context {
class PD_API Context {
public:
Context() { pIO = IO::New(); }
~Context() = default;