diff --git a/README.md b/README.md index 63ff7b4..df5d9d4 100644 --- a/README.md +++ b/README.md @@ -29,8 +29,8 @@ sudo cmake --install libragephoto-build #### RagePhoto API -[RagePhoto C API](https://libragephoto.syping.de/doc/RagePhoto_8h.html) -[RagePhoto C++ API](https://libragephoto.syping.de/doc/classRagePhoto.html) +[RagePhoto C API](https://libragephoto.syping.de/doc/structRagePhotoInstance.html) +[RagePhoto C++ API](https://libragephoto.syping.de/doc/classragephoto_1_1photo.html) #### libragephoto Documentation diff --git a/cmake/wasm.cmake b/cmake/wasm.cmake index 0aa5e77..a6d481a 100644 --- a/cmake/wasm.cmake +++ b/cmake/wasm.cmake @@ -16,37 +16,33 @@ * responsible for anything with use of the software, you are self responsible. ****************************************************************************]] -if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.13.0") - add_executable(ragephoto-wasm - ${RAGEPHOTO_HEADERS} - ${RAGEPHOTO_SOURCES} - ) - set_target_properties(ragephoto-wasm PROPERTIES - CXX_STANDARD ${RAGEPHOTO_CXX_STANDARD} - CXX_STANDARD_REQUIRED ON - PREFIX "lib" - OUTPUT_NAME "ragephoto" - ) - target_compile_definitions(ragephoto-wasm PRIVATE - LIBRAGEPHOTO_LIBRARY - LIBRAGEPHOTO_WASM - ${LIBRAGEPHOTO_DEFINES} - ) - target_link_options(ragephoto-wasm PRIVATE - "SHELL:-O3" - "SHELL:--no-entry" - "SHELL:-s ALLOW_MEMORY_GROWTH=1" - "SHELL:-s MODULARIZE=1" - "SHELL:-s WASM=1" - "SHELL:-s WASM_BIGINT=1" - "SHELL:-s EXPORT_NAME=libragephotoModule" - "SHELL:-s EXPORTED_FUNCTIONS=_free,_malloc" - "SHELL:-s EXPORTED_RUNTIME_METHODS=ccall,cwrap" - ) - target_include_directories(ragephoto-wasm PUBLIC - "${ragephoto_BINARY_DIR}/include" - "${ragephoto_SOURCE_DIR}/src/core" - ) -else() - message(WARNING "A useable WebAssembly build needs at least CMake 3.13.0 or newer") -endif() +add_executable(ragephoto-wasm + ${RAGEPHOTO_HEADERS} + ${RAGEPHOTO_SOURCES} +) +set_target_properties(ragephoto-wasm PROPERTIES + CXX_STANDARD ${RAGEPHOTO_CXX_STANDARD} + CXX_STANDARD_REQUIRED ON + PREFIX "lib" + OUTPUT_NAME "ragephoto" +) +target_compile_definitions(ragephoto-wasm PRIVATE + LIBRAGEPHOTO_LIBRARY + LIBRAGEPHOTO_WASM + ${LIBRAGEPHOTO_DEFINES} +) +target_link_options(ragephoto-wasm PRIVATE + "SHELL:-O3" + "SHELL:--no-entry" + "SHELL:-s ALLOW_MEMORY_GROWTH=1" + "SHELL:-s MODULARIZE=1" + "SHELL:-s WASM=1" + "SHELL:-s WASM_BIGINT=1" + "SHELL:-s EXPORT_NAME=libragephotoModule" + "SHELL:-s EXPORTED_FUNCTIONS=_free,_malloc" + "SHELL:-s EXPORTED_RUNTIME_METHODS=ccall,cwrap" +) +target_include_directories(ragephoto-wasm PUBLIC + "${ragephoto_BINARY_DIR}/include" + "${ragephoto_SOURCE_DIR}/src/core" +) diff --git a/src/core/RagePhoto.c b/src/core/RagePhoto.c index e381412..b7ab048 100644 --- a/src/core/RagePhoto.c +++ b/src/core/RagePhoto.c @@ -24,8 +24,13 @@ #ifdef RAGEPHOTO_BENCHMARK #ifdef _WIN32 +#ifndef VC_EXTRALEAN +#define VC_EXTRALEAN +#endif +#ifndef WIN32_LEAN_AND_MEAN +#define WIN32_LEAN_AND_MEAN +#endif #include -#include #else #include #endif diff --git a/tests/WincvtTest.c b/tests/WincvtTest.c index c7f20af..9609587 100644 --- a/tests/WincvtTest.c +++ b/tests/WincvtTest.c @@ -1,6 +1,6 @@ /***************************************************************************** * libragephoto RAGE Photo Parser -* Copyright (C) 2021-2022 Syping +* Copyright (C) 2021-2024 Syping * * Redistribution and use in source and binary forms, with or without modification, * are permitted provided that the following conditions are met: