Skip to content
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

Jump to bottom

Linux: advancements in the build environment #145

Merged
merged 2 commits into from
Apr 25, 2024
Merged

Linux: advancements in the build environment #145

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
5085b0c
buildsystem: bring back the patches folder
IkerGalardi Apr 25, 2024
13e17e0
buildsystem: improve compilation speed
IkerGalardi Apr 25, 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
4 changes: 2 additions & 2 deletions build_scripts/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ RUN cd /deps &&\
git clone --recursive --depth=1 https://github.com/GPUOpen-Tools/Compressonator.git; cd Compressonator &&\
cd scripts/; python3 fetch_dependencies.py; cd .. &&\
cmake -DOPTION_ENABLE_ALL_APPS=OFF -DOPTION_BUILD_CMP_SDK=ON -DOPTION_CMP_OPENGL=OFF -DOPTION_CMP_QT=OFF -DOPTION_CMP_OPENCV=OFF &&\
make; \
make -j $(nproc); \
mkdir /usr/lib/Compressonator; cp cmp_compressonatorlib/compressonator.h /usr/include/compressonator.h &&\
cp lib/*.a /usr/lib

Expand All @@ -36,7 +36,7 @@ RUN cd /deps &&\
unzip FreeImage3180 &&\
cd FreeImage/ &&\
git apply ../freeimage.patch &&\
make -f Makefile.gnu libfreeimage-3.18.0.so &&\
make -f Makefile.gnu libfreeimage-3.18.0.so -j $(nproc) &&\
cp libfreeimage-3.18.0.so /usr/lib/libFreeImageLib.so &&\
mkdir /usr/include/FreeImage cp Source/FreeImage.h Source/Utilities.h /usr/include/FreeImage

Expand Down
31 changes: 31 additions & 0 deletions build_scripts/patches/freeimage.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
diff --git a/Makefile.gnu b/Makefile.gnu
index 5f2c625..871ffd0 100644
--- a/Makefile.gnu
+++ b/Makefile.gnu
@@ -15,7 +15,7 @@ LIBRARIES = -lstdc++

MODULES = $(SRCS:.c=.o)
MODULES := $(MODULES:.cpp=.o)
-CFLAGS ?= -O3 -fPIC -fexceptions -fvisibility=hidden
+CFLAGS ?= -O3 -fPIC -fexceptions -fvisibility=hidden -std=c++14 -Wno-error=all
# OpenJPEG
CFLAGS += -DOPJ_STATIC
# LibRaw
@@ -23,7 +23,7 @@ CFLAGS += -DNO_LCMS
# LibJXR
CFLAGS += -DDISABLE_PERF_MEASUREMENT -D__ANSI__
CFLAGS += $(INCLUDE)
-CXXFLAGS ?= -O3 -fPIC -fexceptions -fvisibility=hidden -Wno-ctor-dtor-privacy
+CXXFLAGS ?= -O3 -fPIC -fexceptions -fvisibility=hidden -Wno-ctor-dtor-privacy -std=c++14 -Wno-error=all -Wno-narrowing
# LibJXR
CXXFLAGS += -D__ANSI__
CXXFLAGS += $(INCLUDE)
@@ -54,7 +54,7 @@ dist: FreeImage
dos2unix:
@$(DOS2UNIX) $(SRCS) $(INCLS)

-FreeImage: $(STATICLIB) $(SHAREDLIB)
+FreeImage: $(SHAREDLIB)

.c.o:
$(CC) $(CFLAGS) -c $< -o $@
Loading