diff --git a/include/europa/io/pak/Reader.hpp b/include/europa/io/pak/Reader.hpp index a723ded..d989928 100644 --- a/include/europa/io/pak/Reader.hpp +++ b/include/europa/io/pak/Reader.hpp @@ -11,14 +11,13 @@ #include #include -#include #include #include namespace europa::io::pak { /// Reader for Europa package files (.pak). - struct LIBEUROPA_EXPORT Reader { + struct Reader { using FlatType = std::pair; using MapType = std::vector; diff --git a/include/europa/io/pak/Writer.hpp b/include/europa/io/pak/Writer.hpp index 84cf322..a5dc378 100644 --- a/include/europa/io/pak/Writer.hpp +++ b/include/europa/io/pak/Writer.hpp @@ -11,17 +11,15 @@ #include #include +#include #include #include #include -#include -#include - namespace europa::io::pak { /// A efficient writer for Europa package (.pak) files. - struct LIBEUROPA_EXPORT Writer { + struct Writer { /// Vocabulary type for making sector alignment stuff a bit easier to see. enum class SectorAlignment { DoNotAlign, /// Do not align to a sector boundary @@ -52,6 +50,6 @@ namespace europa::io::pak { structs::PakVersion version {}; }; -} // namespace europa::io +} // namespace europa::io::pak #endif // EUROPA_IO_PAKWRITER_H diff --git a/include/europa/io/yatf/Reader.hpp b/include/europa/io/yatf/Reader.hpp index f22d748..daed642 100644 --- a/include/europa/io/yatf/Reader.hpp +++ b/include/europa/io/yatf/Reader.hpp @@ -10,7 +10,6 @@ #define EUROPA_IO_YATFREADER_H #include -#include #include namespace europa::util { @@ -20,7 +19,7 @@ namespace europa::util { namespace europa::io::yatf { /// Reader for PS2 Europa .tex (YATF - Yet Another Texture Format) files. - struct LIBEUROPA_EXPORT Reader { + struct Reader { explicit Reader(std::istream& is); /// Read image. The image output to [surface] is converted to RGBA8888 implicitly. diff --git a/include/europa/util/DllExport.hpp b/include/europa/util/DllExport.hpp deleted file mode 100644 index 5bc4b53..0000000 --- a/include/europa/util/DllExport.hpp +++ /dev/null @@ -1,23 +0,0 @@ -// -// EuropaTools -// -// (C) 2021-2025 modeco80 -// -// SPDX-License-Identifier: MIT -// - -#pragma once - -#ifdef europa_EXPORTS - #ifdef _WIN32 - #define LIBEUROPA_EXPORT __declspec(dllexport) - #else - #define LIBEUROPA_EXPORT __attribute__((visibility("default"))) - #endif -#else - #ifdef _WIN32 - #define LIBEUROPA_EXPORT __declspec(dllimport) - #else - #define LIBEUROPA_EXPORT - #endif -#endif \ No newline at end of file diff --git a/include/europa/util/ImageSurface.hpp b/include/europa/util/ImageSurface.hpp index 6743315..9f67a82 100644 --- a/include/europa/util/ImageSurface.hpp +++ b/include/europa/util/ImageSurface.hpp @@ -11,7 +11,6 @@ #include #include #include -#include namespace europa::util { @@ -67,7 +66,7 @@ namespace europa::util { #endif /// A RGBA8888 image surface. - struct LIBEUROPA_EXPORT ImageSurface { + struct ImageSurface { ImageSurface(); explicit ImageSurface(Size size); diff --git a/include/europa/util/UniqueArray.hpp b/include/europa/util/UniqueArray.hpp index dc77238..3653ae3 100644 --- a/include/europa/util/UniqueArray.hpp +++ b/include/europa/util/UniqueArray.hpp @@ -10,7 +10,6 @@ #include #include -#include namespace europa::util { @@ -18,7 +17,7 @@ namespace europa::util { /// std::unique_ptr for buffers /// that need to track their size as well. template - struct LIBEUROPA_EXPORT UniqueArray final { + struct UniqueArray final { UniqueArray() = default; explicit UniqueArray(std::size_t size) { Resize(size); diff --git a/src/libeuropa/CMakeLists.txt b/src/libeuropa/CMakeLists.txt index 1aea665..a8ee2f8 100644 --- a/src/libeuropa/CMakeLists.txt +++ b/src/libeuropa/CMakeLists.txt @@ -6,14 +6,8 @@ # SPDX-License-Identifier: MIT # -# NOTICE: libeuropa in shared form does not have a stable ABI yet, -# and more than likely, until a defined semver release -# never will. -# -# There will probably be an option or additional target always -# to build static libeuropa. -add_library(europa SHARED +add_library(europa # Utility util/ImageSurface.cpp @@ -30,13 +24,4 @@ add_library(europa SHARED target_include_directories(europa PUBLIC ${PROJECT_SOURCE_DIR}/include) -target_compile_features(europa PUBLIC cxx_std_20) - -# SOversion for *ix. -set_target_properties(europa PROPERTIES VERSION ${PROJECT_VERSION} SOVERSION 0) - -install(TARGETS europa - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} -) \ No newline at end of file +europa_target(europa) \ No newline at end of file