safer (hopefully future-proof) version of syslibs.patch
This commit is contained in:
parent
298a2b8e17
commit
d44830eaf3
@ -28,8 +28,8 @@
|
|||||||
|
|
||||||
-COMPILERFLAGS = -O3 -fPIC -fexceptions -fvisibility=hidden
|
-COMPILERFLAGS = -O3 -fPIC -fexceptions -fvisibility=hidden
|
||||||
-LIBRARIES = -lstdc++
|
-LIBRARIES = -lstdc++
|
||||||
+COMPILERFLAGS = -O3 -fPIC -fexceptions -fvisibility=hidden -I/usr/include/OpenEXR
|
+COMPILERFLAGS = -O3 -fPIC -fexceptions -fvisibility=hidden `pkgconfig --cflags libopenjpeg` -I/usr/include/OpenEXR
|
||||||
+LIBRARIES = -lstdc++ -lz -lmng -lpng -ltiff -ljpeg -lopenjpeg `pkg-config --libs OpenEXR`
|
+LIBRARIES = -lstdc++ -lz -lmng -lpng -ltiff -ljpeg `pkg-config --libs libopenjpeg` `pkg-config --libs OpenEXR`
|
||||||
|
|
||||||
MODULES = $(SRCS:.c=.o)
|
MODULES = $(SRCS:.c=.o)
|
||||||
MODULES := $(MODULES:.cpp=.o)
|
MODULES := $(MODULES:.cpp=.o)
|
||||||
@ -40,7 +40,7 @@
|
|||||||
#include "FreeImage.h"
|
#include "FreeImage.h"
|
||||||
#include "Utilities.h"
|
#include "Utilities.h"
|
||||||
-#include "../LibOpenJPEG/openjpeg.h"
|
-#include "../LibOpenJPEG/openjpeg.h"
|
||||||
+#include <openjpeg/openjpeg.h>
|
+#include <openjpeg.h>
|
||||||
|
|
||||||
/**
|
/**
|
||||||
Divide an integer by a power of 2 and round upwards
|
Divide an integer by a power of 2 and round upwards
|
||||||
@ -104,7 +104,7 @@
|
|||||||
#include "FreeImage.h"
|
#include "FreeImage.h"
|
||||||
#include "Utilities.h"
|
#include "Utilities.h"
|
||||||
-#include "../LibOpenJPEG/openjpeg.h"
|
-#include "../LibOpenJPEG/openjpeg.h"
|
||||||
+#include <openjpeg/openjpeg.h>
|
+#include <openjpeg.h>
|
||||||
|
|
||||||
// ==========================================================
|
// ==========================================================
|
||||||
// Plugin Interface
|
// Plugin Interface
|
||||||
@ -115,7 +115,7 @@
|
|||||||
#include "FreeImage.h"
|
#include "FreeImage.h"
|
||||||
#include "Utilities.h"
|
#include "Utilities.h"
|
||||||
-#include "../LibOpenJPEG/openjpeg.h"
|
-#include "../LibOpenJPEG/openjpeg.h"
|
||||||
+#include <openjpeg/openjpeg.h>
|
+#include <openjpeg.h>
|
||||||
|
|
||||||
// ==========================================================
|
// ==========================================================
|
||||||
// Plugin Interface
|
// Plugin Interface
|
||||||
|
Loading…
Reference in New Issue
Block a user