diff --git a/.gitignore b/.gitignore index 86ad221..980d79d 100644 --- a/.gitignore +++ b/.gitignore @@ -134,6 +134,7 @@ ui_*.h *.jsc Makefile* *build-* +vsbuild # Qt unit tests target_wrapper.* diff --git a/CMakeLists.txt b/CMakeLists.txt index c947c0a..920c881 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,17 +1,29 @@ cmake_minimum_required(VERSION 3.16) -# Project +include(CMakePackageConfigHelpers) + project(libbsarch CXX) -# Add library to build. -add_library(libbsarch SHARED - src/libbsarch.h - src/libbsarch.cpp - src/libbsarch.def +find_package(mo2-dds-header CONFIG REQUIRED) +find_package(Qt6 COMPONENTS Core REQUIRED) + +get_target_property(SRCS mo2::dds-header SOURCES) + +# libbsarch +add_library(libbsarch SHARED) +target_sources(libbsarch + PRIVATE + src/libbsarch.cpp + src/libbsarch.def + PUBLIC + FILE_SET HEADERS + BASE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/include + FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/libbsarch/libbsarch.h ) -set_target_properties(libbsarch PROPERTIES DEBUG_POSTFIX "d") -target_include_directories(libbsarch PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/dds) -target_compile_features(libbsarch PRIVATE cxx_std_11) +target_include_directories(libbsarch PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include/libbsarch) +set_target_properties(libbsarch PROPERTIES DEBUG_POSTFIX "d" CXX_STANDARD 11) +target_link_libraries(libbsarch PUBLIC mo2::dds-header) +target_compile_definitions(libbsarch PRIVATE BSARCH_DLL_EXPORT) # preprocessor definitions if(MSVC) @@ -22,52 +34,59 @@ if(MSVC) ) endif() -target_compile_definitions(libbsarch PRIVATE BSARCH_DLL_EXPORT) -#We only want the lib file. The DLL will be provided by Delphi -#Removing the generated DLL -add_custom_command(TARGET libbsarch POST_BUILD - COMMAND ${CMAKE_COMMAND} -E remove - ${CMAKE_CURRENT_BINARY_DIR}/libbsarch.dll) +# libbsarch_OOP +add_library(libbsarch_OOP STATIC) -############################################################ -# libbsarch_OOP # -############################################################ - -find_package(Qt6 COMPONENTS Core REQUIRED) - -add_library(libbsarch_OOP STATIC - src/base_types.hpp - src/bs_archive_auto.cpp - src/bs_archive_auto.hpp - src/bs_archive.cpp - src/bs_archive.h - src/bs_archive_entries.cpp - src/bs_archive_entries.h - - src/libbsarch.hpp - src/libbsarch.h - - src/utils/convertible_string.cpp - src/utils/convertible_string.hpp - src/utils/convertible_ostream.cpp - src/utils/convertible_ostream.hpp - src/utils/string_convert.cpp - src/utils/string_convert.hpp +target_sources(libbsarch_OOP + PRIVATE + src/bs_archive_entries.cpp + src/utils/string_convert.cpp + src/utils/convertible_ostream.cpp + src/utils/convertible_string.cpp + src/bs_archive_auto.cpp + src/bs_archive.cpp + PUBLIC + FILE_SET HEADERS + BASE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/include + FILES + ${CMAKE_CURRENT_SOURCE_DIR}/include/libbsarch/base_types.hpp + ${CMAKE_CURRENT_SOURCE_DIR}/include/libbsarch/bs_archive_auto.hpp + ${CMAKE_CURRENT_SOURCE_DIR}/include/libbsarch/bs_archive.h + ${CMAKE_CURRENT_SOURCE_DIR}/include/libbsarch/bs_archive_entries.h + ${CMAKE_CURRENT_SOURCE_DIR}/include/libbsarch/libbsarch.hpp + ${CMAKE_CURRENT_SOURCE_DIR}/include/libbsarch/libbsarch.h + ${CMAKE_CURRENT_SOURCE_DIR}/include/libbsarch/utils/convertible_string.hpp + ${CMAKE_CURRENT_SOURCE_DIR}/include/libbsarch/utils/convertible_ostream.hpp + ${CMAKE_CURRENT_SOURCE_DIR}/include/libbsarch/utils/string_convert.hpp ) +target_include_directories(libbsarch_OOP PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR}/include/libbsarch + ${CMAKE_CURRENT_SOURCE_DIR}/include/libbsarch/utils) +target_link_libraries(libbsarch_OOP PUBLIC mo2::dds-header) + set_target_properties(libbsarch_OOP PROPERTIES DEBUG_POSTFIX "d" CXX_STANDARD 17 ) -target_include_directories(libbsarch_OOP PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/dds) if (MSVC) target_compile_options(libbsarch_OOP PRIVATE /MP) endif() -## Copying the corresponding DLL ## +# adding Qt support +if(Qt6_FOUND) + message("libbsarch: Qt6 found, enabling Qt support") + target_link_libraries(libbsarch_OOP PUBLIC Qt::Core) + target_compile_definitions(libbsarch PUBLIC "LIBBSARCH_QT_SUPPORT") + target_compile_definitions(libbsarch_OOP PUBLIC "LIBBSARCH_QT_SUPPORT") +endif() -#Finding 32 or 64bits +# target_link_libraries(libbsarch_OOP PUBLIC libbsarch) + +# install + +# finding 32 or 64bits if(CMAKE_SIZEOF_VOID_P EQUAL 8) # 64 bits set(lib_delphi "${CMAKE_CURRENT_SOURCE_DIR}/delphi/lib64") @@ -78,12 +97,34 @@ elseif(CMAKE_SIZEOF_VOID_P EQUAL 4) message("libbsarch: using 32bits DLL") endif() -#Adding Qt support -if(Qt6_FOUND) - message("libbsarch: Qt6 found, enabling Qt support") - target_link_libraries(libbsarch_OOP PUBLIC Qt::Core) - target_compile_definitions(libbsarch PUBLIC "LIBBSARCH_QT_SUPPORT") - target_compile_definitions(libbsarch_OOP PUBLIC "LIBBSARCH_QT_SUPPORT") -endif() +install(TARGETS libbsarch libbsarch_OOP EXPORT libbsarchTargets FILE_SET HEADERS) +install(FILES $ DESTINATION pdb OPTIONAL) +install(EXPORT libbsarchTargets + FILE mo2-libbsarch-targets.cmake + NAMESPACE mo2:: + DESTINATION lib/cmake/mo2-libbsarch +) -target_link_libraries(libbsarch_OOP PUBLIC libbsarch) +# install the true DLLs +install(FILES ${lib_delphi}/libbsarch.dll DESTINATION bin CONFIGURATIONS Release RelWithDebInfo MinSizeRel) +install(FILES ${lib_delphi}/libbsarchd.dll DESTINATION bin CONFIGURATIONS Debug) + +configure_package_config_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/config.cmake.in + "${CMAKE_CURRENT_BINARY_DIR}/mo2-libbsarch-config.cmake" + INSTALL_DESTINATION "lib/cmake/mo2-libbsarch" + NO_SET_AND_CHECK_MACRO + NO_CHECK_REQUIRED_COMPONENTS_MACRO +) + +write_basic_package_version_file( + "${CMAKE_CURRENT_BINARY_DIR}/mo2-libbsarch-config-version.cmake" + VERSION "0.0.13" + COMPATIBILITY AnyNewerVersion + ARCH_INDEPENDENT +) + +install(FILES + ${CMAKE_CURRENT_BINARY_DIR}/mo2-libbsarch-config.cmake + ${CMAKE_CURRENT_BINARY_DIR}/mo2-libbsarch-config-version.cmake + DESTINATION lib/cmake/mo2-libbsarch +) diff --git a/CMakePresets.json b/CMakePresets.json new file mode 100644 index 0000000..acc6d97 --- /dev/null +++ b/CMakePresets.json @@ -0,0 +1,17 @@ +{ + "configurePresets": [ + { + "binaryDir": "${sourceDir}/vsbuild", + "toolchainFile": "$env{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake", + "generator": "Visual Studio 17 2022", + "name": "vs2022-windows" + } + ], + "buildPresets": [ + { + "name": "vs2022-windows", + "configurePreset": "vs2022-windows" + } + ], + "version": 4 +} diff --git a/README.md b/README.md index fcb68fb..671b6ff 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,5 @@ # BSArchive DLL and C++ bindings + BSArchive Dynamic Link Library and C++ bindings ## How to build @@ -9,7 +10,7 @@ BSArchive Dynamic Link Library and C++ bindings ## How to use -With CMake: +With CMake: Use ``add_subdirectory`` and ``target_link_library`` Then ``#include "libbsarch.h"`` for the C wrapper, or ``#include "bs_archive_auto"`` for the C++ wrapper. See the example for code use. @@ -20,4 +21,5 @@ Use `libbsarch.dll` (provided in delphi/lib), `libbsarch.lib` and `libbsarch.h` ## Credits The original BSArchive can be found at: https://github.com/TES5Edit/TES5Edit/tree/dev/Tools/BSArchive -The version in this project had been modified for better compatibility with C/C++ and allow the users to allocate their own memory in some cases. \ No newline at end of file +The version in this project had been modified for better compatibility with C/C++ and +allow the users to allocate their own memory in some cases. diff --git a/cmake/config.cmake.in b/cmake/config.cmake.in new file mode 100644 index 0000000..57a1af7 --- /dev/null +++ b/cmake/config.cmake.in @@ -0,0 +1,24 @@ +@PACKAGE_INIT@ + +include ( "${CMAKE_CURRENT_LIST_DIR}/mo2-libbsarch-targets.cmake" ) + +target_link_libraries(mo2::libbsarch PUBLIC mo2::libbsarch_OOP) + +# libbsarch is usually be build in Debug or Release/RelWithDebInfo, so we need to map +# missing configurations to avoid issue with CMP0111 +list(FIND _LIBBSARCH_CONFIGURATIONS "RELEASE" _LIBBSARCH_HAS_RELEASE) +if (_LIBBSARCH_HAS_RELEASE EQUAL -1) + set_target_properties(mo2::libbsarch PROPERTIES + MAP_IMPORTED_CONFIG_MINSIZEREL RelWithDebInfo + MAP_IMPORTED_CONFIG_RELEASE RelWithDebInfo + ) + set_property(TARGET mo2::libbsarch APPEND PROPERTY IMPORTED_CONFIGURATIONS MINSIZEREL) + set_property(TARGET mo2::libbsarch APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE) +else() + set_target_properties(mo2::libbsarch PROPERTIES + MAP_IMPORTED_CONFIG_MINSIZEREL Release + MAP_IMPORTED_CONFIG_RELWITHDEBINFO Release + ) + set_property(TARGET mo2::libbsarch APPEND PROPERTY IMPORTED_CONFIGURATIONS MINSIZEREL) + set_property(TARGET mo2::libbsarch APPEND PROPERTY IMPORTED_CONFIGURATIONS RELWITHDEBINFO) +endif() diff --git a/dds/dds.h b/dds/dds.h deleted file mode 100644 index a37183d..0000000 --- a/dds/dds.h +++ /dev/null @@ -1,240 +0,0 @@ -//-------------------------------------------------------------------------------------- -// dds.h -// -// This header defines constants and structures that are useful when parsing -// DDS files. DDS files were originally designed to use several structures -// and constants that are native to DirectDraw and are defined in ddraw.h, -// such as DDSURFACEDESC2 and DDSCAPS2. This file defines similar -// (compatible) constants and structures so that one can use DDS files -// without needing to include ddraw.h. -// -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// -// http://go.microsoft.com/fwlink/?LinkId=248926 -// http://go.microsoft.com/fwlink/?LinkId=248929 -// http://go.microsoft.com/fwlink/?LinkID=615561 -//-------------------------------------------------------------------------------------- - -#pragma once - -#include -#include - -namespace DirectX { -#pragma pack(push, 1) - -const uint32_t DDS_MAGIC = 0x20534444; // "DDS " - -struct DDS_PIXELFORMAT -{ - uint32_t size; - uint32_t flags; - uint32_t fourCC; - uint32_t RGBBitCount; - uint32_t RBitMask; - uint32_t GBitMask; - uint32_t BBitMask; - uint32_t ABitMask; -}; - -#define DDS_FOURCC 0x00000004 // DDPF_FOURCC -#define DDS_RGB 0x00000040 // DDPF_RGB -#define DDS_RGBA 0x00000041 // DDPF_RGB | DDPF_ALPHAPIXELS -#define DDS_LUMINANCE 0x00020000 // DDPF_LUMINANCE -#define DDS_LUMINANCEA 0x00020001 // DDPF_LUMINANCE | DDPF_ALPHAPIXELS -#define DDS_ALPHAPIXELS 0x00000001 // DDPF_ALPHAPIXELS -#define DDS_ALPHA 0x00000002 // DDPF_ALPHA -#define DDS_PAL8 0x00000020 // DDPF_PALETTEINDEXED8 -#define DDS_PAL8A 0x00000021 // DDPF_PALETTEINDEXED8 | DDPF_ALPHAPIXELS -#define DDS_BUMPDUDV 0x00080000 // DDPF_BUMPDUDV - -#ifndef MAKEFOURCC -#define MAKEFOURCC(ch0, ch1, ch2, ch3) \ - (static_cast(static_cast(ch0)) | (static_cast(static_cast(ch1)) << 8) \ - | (static_cast(static_cast(ch2)) << 16) \ - | (static_cast(static_cast(ch3)) << 24)) -#endif /* defined(MAKEFOURCC) */ - -extern __declspec(selectany) const DDS_PIXELFORMAT - DDSPF_DXT1 = {sizeof(DDS_PIXELFORMAT), DDS_FOURCC, MAKEFOURCC('D', 'X', 'T', '1'), 0, 0, 0, 0, 0}; - -extern __declspec(selectany) const DDS_PIXELFORMAT - DDSPF_DXT2 = {sizeof(DDS_PIXELFORMAT), DDS_FOURCC, MAKEFOURCC('D', 'X', 'T', '2'), 0, 0, 0, 0, 0}; - -extern __declspec(selectany) const DDS_PIXELFORMAT - DDSPF_DXT3 = {sizeof(DDS_PIXELFORMAT), DDS_FOURCC, MAKEFOURCC('D', 'X', 'T', '3'), 0, 0, 0, 0, 0}; - -extern __declspec(selectany) const DDS_PIXELFORMAT - DDSPF_DXT4 = {sizeof(DDS_PIXELFORMAT), DDS_FOURCC, MAKEFOURCC('D', 'X', 'T', '4'), 0, 0, 0, 0, 0}; - -extern __declspec(selectany) const DDS_PIXELFORMAT - DDSPF_DXT5 = {sizeof(DDS_PIXELFORMAT), DDS_FOURCC, MAKEFOURCC('D', 'X', 'T', '5'), 0, 0, 0, 0, 0}; - -extern __declspec(selectany) const DDS_PIXELFORMAT - DDSPF_BC4_UNORM = {sizeof(DDS_PIXELFORMAT), DDS_FOURCC, MAKEFOURCC('B', 'C', '4', 'U'), 0, 0, 0, 0, 0}; - -extern __declspec(selectany) const DDS_PIXELFORMAT - DDSPF_BC4_SNORM = {sizeof(DDS_PIXELFORMAT), DDS_FOURCC, MAKEFOURCC('B', 'C', '4', 'S'), 0, 0, 0, 0, 0}; - -extern __declspec(selectany) const DDS_PIXELFORMAT - DDSPF_BC5_UNORM = {sizeof(DDS_PIXELFORMAT), DDS_FOURCC, MAKEFOURCC('B', 'C', '5', 'U'), 0, 0, 0, 0, 0}; - -extern __declspec(selectany) const DDS_PIXELFORMAT - DDSPF_BC5_SNORM = {sizeof(DDS_PIXELFORMAT), DDS_FOURCC, MAKEFOURCC('B', 'C', '5', 'S'), 0, 0, 0, 0, 0}; - -extern __declspec(selectany) const DDS_PIXELFORMAT - DDSPF_R8G8_B8G8 = {sizeof(DDS_PIXELFORMAT), DDS_FOURCC, MAKEFOURCC('R', 'G', 'B', 'G'), 0, 0, 0, 0, 0}; - -extern __declspec(selectany) const DDS_PIXELFORMAT - DDSPF_G8R8_G8B8 = {sizeof(DDS_PIXELFORMAT), DDS_FOURCC, MAKEFOURCC('G', 'R', 'G', 'B'), 0, 0, 0, 0, 0}; - -extern __declspec(selectany) const DDS_PIXELFORMAT - DDSPF_YUY2 = {sizeof(DDS_PIXELFORMAT), DDS_FOURCC, MAKEFOURCC('Y', 'U', 'Y', '2'), 0, 0, 0, 0, 0}; - -extern __declspec(selectany) const DDS_PIXELFORMAT - DDSPF_A8R8G8B8 = {sizeof(DDS_PIXELFORMAT), DDS_RGBA, 0, 32, 0x00ff0000, 0x0000ff00, 0x000000ff, 0xff000000}; - -extern __declspec(selectany) const DDS_PIXELFORMAT - DDSPF_X8R8G8B8 = {sizeof(DDS_PIXELFORMAT), DDS_RGB, 0, 32, 0x00ff0000, 0x0000ff00, 0x000000ff, 0x00000000}; - -extern __declspec(selectany) const DDS_PIXELFORMAT - DDSPF_A8B8G8R8 = {sizeof(DDS_PIXELFORMAT), DDS_RGBA, 0, 32, 0x000000ff, 0x0000ff00, 0x00ff0000, 0xff000000}; - -extern __declspec(selectany) const DDS_PIXELFORMAT - DDSPF_X8B8G8R8 = {sizeof(DDS_PIXELFORMAT), DDS_RGB, 0, 32, 0x000000ff, 0x0000ff00, 0x00ff0000, 0x00000000}; - -extern __declspec(selectany) const DDS_PIXELFORMAT - DDSPF_G16R16 = {sizeof(DDS_PIXELFORMAT), DDS_RGB, 0, 32, 0x0000ffff, 0xffff0000, 0x00000000, 0x00000000}; - -extern __declspec(selectany) const DDS_PIXELFORMAT - DDSPF_R5G6B5 = {sizeof(DDS_PIXELFORMAT), DDS_RGB, 0, 16, 0x0000f800, 0x000007e0, 0x0000001f, 0x00000000}; - -extern __declspec(selectany) const DDS_PIXELFORMAT - DDSPF_A1R5G5B5 = {sizeof(DDS_PIXELFORMAT), DDS_RGBA, 0, 16, 0x00007c00, 0x000003e0, 0x0000001f, 0x00008000}; - -extern __declspec(selectany) const DDS_PIXELFORMAT - DDSPF_A4R4G4B4 = {sizeof(DDS_PIXELFORMAT), DDS_RGBA, 0, 16, 0x00000f00, 0x000000f0, 0x0000000f, 0x0000f000}; - -extern __declspec(selectany) const DDS_PIXELFORMAT - DDSPF_R8G8B8 = {sizeof(DDS_PIXELFORMAT), DDS_RGB, 0, 24, 0x00ff0000, 0x0000ff00, 0x000000ff, 0x00000000}; - -extern __declspec(selectany) const - DDS_PIXELFORMAT DDSPF_L8 = {sizeof(DDS_PIXELFORMAT), DDS_LUMINANCE, 0, 8, 0xff, 0x00, 0x00, 0x00}; - -extern __declspec(selectany) const - DDS_PIXELFORMAT DDSPF_L16 = {sizeof(DDS_PIXELFORMAT), DDS_LUMINANCE, 0, 16, 0xffff, 0x0000, 0x0000, 0x0000}; - -extern __declspec(selectany) const DDS_PIXELFORMAT - DDSPF_A8L8 = {sizeof(DDS_PIXELFORMAT), DDS_LUMINANCEA, 0, 16, 0x00ff, 0x0000, 0x0000, 0xff00}; - -extern __declspec(selectany) const DDS_PIXELFORMAT - DDSPF_A8L8_ALT = {sizeof(DDS_PIXELFORMAT), DDS_LUMINANCEA, 0, 8, 0x00ff, 0x0000, 0x0000, 0xff00}; - -extern __declspec(selectany) const - DDS_PIXELFORMAT DDSPF_A8 = {sizeof(DDS_PIXELFORMAT), DDS_ALPHA, 0, 8, 0x00, 0x00, 0x00, 0xff}; - -extern __declspec(selectany) const DDS_PIXELFORMAT - DDSPF_V8U8 = {sizeof(DDS_PIXELFORMAT), DDS_BUMPDUDV, 0, 16, 0x00ff, 0xff00, 0x0000, 0x0000}; - -extern __declspec(selectany) const DDS_PIXELFORMAT - DDSPF_Q8W8V8U8 = {sizeof(DDS_PIXELFORMAT), DDS_BUMPDUDV, 0, 32, 0x000000ff, 0x0000ff00, 0x00ff0000, 0xff000000}; - -extern __declspec(selectany) const DDS_PIXELFORMAT - DDSPF_V16U16 = {sizeof(DDS_PIXELFORMAT), DDS_BUMPDUDV, 0, 32, 0x0000ffff, 0xffff0000, 0x00000000, 0x00000000}; - -// D3DFMT_A2R10G10B10/D3DFMT_A2B10G10R10 should be written using DX10 extension to avoid D3DX 10:10:10:2 reversal issue - -// This indicates the DDS_HEADER_DXT10 extension is present (the format is in dxgiFormat) -extern __declspec(selectany) const DDS_PIXELFORMAT - DDSPF_DX10 = {sizeof(DDS_PIXELFORMAT), DDS_FOURCC, MAKEFOURCC('D', 'X', '1', '0'), 0, 0, 0, 0, 0}; - -#define DDS_HEADER_FLAGS_TEXTURE 0x00001007 // DDSD_CAPS | DDSD_HEIGHT | DDSD_WIDTH | DDSD_PIXELFORMAT -#define DDS_HEADER_FLAGS_MIPMAP 0x00020000 // DDSD_MIPMAPCOUNT -#define DDS_HEADER_FLAGS_VOLUME 0x00800000 // DDSD_DEPTH -#define DDS_HEADER_FLAGS_PITCH 0x00000008 // DDSD_PITCH -#define DDS_HEADER_FLAGS_LINEARSIZE 0x00080000 // DDSD_LINEARSIZE - -#define DDS_HEIGHT 0x00000002 // DDSD_HEIGHT -#define DDS_WIDTH 0x00000004 // DDSD_WIDTH - -#define DDS_SURFACE_FLAGS_TEXTURE 0x00001000 // DDSCAPS_TEXTURE -#define DDS_SURFACE_FLAGS_MIPMAP 0x00400008 // DDSCAPS_COMPLEX | DDSCAPS_MIPMAP -#define DDS_SURFACE_FLAGS_CUBEMAP 0x00000008 // DDSCAPS_COMPLEX - -#define DDS_CUBEMAP_POSITIVEX 0x00000600 // DDSCAPS2_CUBEMAP | DDSCAPS2_CUBEMAP_POSITIVEX -#define DDS_CUBEMAP_NEGATIVEX 0x00000a00 // DDSCAPS2_CUBEMAP | DDSCAPS2_CUBEMAP_NEGATIVEX -#define DDS_CUBEMAP_POSITIVEY 0x00001200 // DDSCAPS2_CUBEMAP | DDSCAPS2_CUBEMAP_POSITIVEY -#define DDS_CUBEMAP_NEGATIVEY 0x00002200 // DDSCAPS2_CUBEMAP | DDSCAPS2_CUBEMAP_NEGATIVEY -#define DDS_CUBEMAP_POSITIVEZ 0x00004200 // DDSCAPS2_CUBEMAP | DDSCAPS2_CUBEMAP_POSITIVEZ -#define DDS_CUBEMAP_NEGATIVEZ 0x00008200 // DDSCAPS2_CUBEMAP | DDSCAPS2_CUBEMAP_NEGATIVEZ - -#define DDS_CUBEMAP_ALLFACES \ - (DDS_CUBEMAP_POSITIVEX | DDS_CUBEMAP_NEGATIVEX | DDS_CUBEMAP_POSITIVEY | DDS_CUBEMAP_NEGATIVEY \ - | DDS_CUBEMAP_POSITIVEZ | DDS_CUBEMAP_NEGATIVEZ) - -#define DDS_CUBEMAP 0x00000200 // DDSCAPS2_CUBEMAP - -#define DDS_FLAGS_VOLUME 0x00200000 // DDSCAPS2_VOLUME - -// Subset here matches D3D10_RESOURCE_DIMENSION and D3D11_RESOURCE_DIMENSION -enum DDS_RESOURCE_DIMENSION -{ - DDS_DIMENSION_TEXTURE1D = 2, - DDS_DIMENSION_TEXTURE2D = 3, - DDS_DIMENSION_TEXTURE3D = 4, -}; - -// Subset here matches D3D10_RESOURCE_MISC_FLAG and D3D11_RESOURCE_MISC_FLAG -enum DDS_RESOURCE_MISC_FLAG -{ - DDS_RESOURCE_MISC_TEXTURECUBE = 0x4L, -}; - -enum DDS_MISC_FLAGS2 -{ - DDS_MISC_FLAGS2_ALPHA_MODE_MASK = 0x7L, -}; - -enum DDS_ALPHA_MODE -{ - DDS_ALPHA_MODE_UNKNOWN = 0, - DDS_ALPHA_MODE_STRAIGHT = 1, - DDS_ALPHA_MODE_PREMULTIPLIED = 2, - DDS_ALPHA_MODE_OPAQUE = 3, - DDS_ALPHA_MODE_CUSTOM = 4, -}; - -struct DDS_HEADER -{ - uint32_t size; - uint32_t flags; - uint32_t height; - uint32_t width; - uint32_t pitchOrLinearSize; - uint32_t depth; // only if DDS_HEADER_FLAGS_VOLUME is set in flags - uint32_t mipMapCount; - uint32_t reserved1[11]; - DDS_PIXELFORMAT ddspf; - uint32_t caps; - uint32_t caps2; - uint32_t caps3; - uint32_t caps4; - uint32_t reserved2; -}; - -struct DDS_HEADER_DXT10 -{ - DXGI_FORMAT dxgiFormat; - uint32_t resourceDimension; - uint32_t miscFlag; // see D3D11_RESOURCE_MISC_FLAG - uint32_t arraySize; - uint32_t miscFlags2; // see DDS_MISC_FLAGS2 -}; - -#pragma pack(pop) - -static_assert(sizeof(DDS_HEADER) == 124, "DDS Header size mismatch"); -static_assert(sizeof(DDS_HEADER_DXT10) == 20, "DDS DX10 Extended Header size mismatch"); - -} // namespace DirectX diff --git a/src/base_types.hpp b/include/libbsarch/base_types.hpp similarity index 100% rename from src/base_types.hpp rename to include/libbsarch/base_types.hpp diff --git a/src/bs_archive.h b/include/libbsarch/bs_archive.h similarity index 100% rename from src/bs_archive.h rename to include/libbsarch/bs_archive.h diff --git a/src/bs_archive_auto.hpp b/include/libbsarch/bs_archive_auto.hpp similarity index 100% rename from src/bs_archive_auto.hpp rename to include/libbsarch/bs_archive_auto.hpp diff --git a/src/bs_archive_entries.h b/include/libbsarch/bs_archive_entries.h similarity index 100% rename from src/bs_archive_entries.h rename to include/libbsarch/bs_archive_entries.h diff --git a/src/libbsarch.h b/include/libbsarch/libbsarch.h similarity index 99% rename from src/libbsarch.h rename to include/libbsarch/libbsarch.h index d0f4371..9a5da87 100644 --- a/src/libbsarch.h +++ b/include/libbsarch/libbsarch.h @@ -1,7 +1,9 @@ #pragma once #include -#include + +#include + #include #ifdef BSARCH_DLL_EXPORT diff --git a/src/libbsarch.hpp b/include/libbsarch/libbsarch.hpp similarity index 100% rename from src/libbsarch.hpp rename to include/libbsarch/libbsarch.hpp diff --git a/src/utils/convertible_ostream.hpp b/include/libbsarch/utils/convertible_ostream.hpp similarity index 100% rename from src/utils/convertible_ostream.hpp rename to include/libbsarch/utils/convertible_ostream.hpp diff --git a/src/utils/convertible_string.hpp b/include/libbsarch/utils/convertible_string.hpp similarity index 100% rename from src/utils/convertible_string.hpp rename to include/libbsarch/utils/convertible_string.hpp diff --git a/src/utils/string_convert.hpp b/include/libbsarch/utils/string_convert.hpp similarity index 100% rename from src/utils/string_convert.hpp rename to include/libbsarch/utils/string_convert.hpp diff --git a/vcpkg.json b/vcpkg.json new file mode 100644 index 0000000..03fbd46 --- /dev/null +++ b/vcpkg.json @@ -0,0 +1,18 @@ +{ + "dependencies": ["mo2-dds-header"], + "vcpkg-configuration": { + "default-registry": { + "kind": "git", + "repository": "https://github.com/Microsoft/vcpkg", + "baseline": "f61a294e765b257926ae9e9d85f96468a0af74e7" + }, + "registries": [ + { + "kind": "git", + "repository": "https://github.com/ModOrganizer2/vcpkg-registry", + "baseline": "27d8adbfe9e4ce88a875be3a45fadab69869eb60", + "packages": ["mo2-*"] + } + ] + } +}