Skip to content

Fix build with openexr and libtiff #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kobli wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix build with openexr and libtiff #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6006386
fix multiple main definitions when building with libtiff
kobli Dec 9, 2024
29b451c
fix build with openexr
kobli Dec 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ endif()

if(BUILD_LIBTIFF)
set(FreeImage_LIBTIFF_SRCS
Source/LibTIFF4/mkg3states.c Source/LibTIFF4/tif_error.c Source/LibTIFF4/tif_aux.c
Source/LibTIFF4/tif_error.c Source/LibTIFF4/tif_aux.c
Source/LibTIFF4/tif_close.c Source/LibTIFF4/tif_codec.c Source/LibTIFF4/tif_color.c
Source/LibTIFF4/tif_compress.c Source/LibTIFF4/tif_config.h
Source/LibTIFF4/tif_config.vc.h Source/LibTIFF4/tif_config.wince.h
Expand Down
1 change: 1 addition & 0 deletions Source/OpenEXR/IlmImf/ImfAttribute.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
#include "IlmThreadMutex.h"
#include "Iex.h"
#include <string.h>
#include <functional>
#include <map>

#include "ImfNamespace.h"
Expand Down
2 changes: 1 addition & 1 deletion Source/Plugin.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ void DLL_CALLCONV InitGIF(Plugin *plugin, int format_id);
void DLL_CALLCONV InitHDR(Plugin *plugin, int format_id);
void DLL_CALLCONV InitG3(Plugin *plugin, int format_id);
void DLL_CALLCONV InitSGI(Plugin *plugin, int format_id);
#if INCLUDE_LIB_OPEN_EXR
#if INCLUDE_LIB_OPENEXR
void DLL_CALLCONV InitEXR(Plugin *plugin, int format_id);
#endif
void DLL_CALLCONV InitJ2K(Plugin *plugin, int format_id);
Expand Down