Changeset View
Changeset View
Standalone View
Standalone View
files/FreeImage_unbundle.patch
| Show First 20 Lines • Show All 60 Lines • ▼ Show 20 Lines | |||||
| endif | endif | ||||
| TARGET = freeimageplus | TARGET = freeimageplus | ||||
| @@ -68,7 +70,7 @@ $(STATICLIB): $(MODULES) | @@ -68,7 +70,7 @@ $(STATICLIB): $(MODULES) | ||||
| $(AR) r $@ $(MODULES) | $(AR) r $@ $(MODULES) | ||||
| $(SHAREDLIB): $(MODULES) | $(SHAREDLIB): $(MODULES) | ||||
| - $(CC) -s -shared -Wl,-soname,$(VERLIBNAME) $(LDFLAGS) -o $@ $(MODULES) $(LIBRARIES) | - $(CC) -s -shared -Wl,-soname,$(VERLIBNAME) $(LDFLAGS) -o $@ $(MODULES) $(LIBRARIES) | ||||
| + $(CC) -shared -Wl,-soname,$(VERLIBNAME) $(LDFLAGS) -o $@ $(MODULES) $(LIBRARIES) | + $(CC) -shared -Wl,-soname,$(VERLIBNAME) -o $@ $(MODULES) $(LIBRARIES) $(LDFLAGS) | ||||
| install: | install: | ||||
| install -d $(INCDIR) $(INSTALLDIR) | install -d $(INCDIR) $(INSTALLDIR) | ||||
| diff -rupN FreeImage/Makefile.gnu FreeImage-new/Makefile.gnu | diff -rupN FreeImage/Makefile.gnu FreeImage-new/Makefile.gnu | ||||
| --- FreeImage/Makefile.gnu 2015-03-10 08:04:00.000000000 +0100 | --- FreeImage/Makefile.gnu 2015-03-10 08:04:00.000000000 +0100 | ||||
| +++ FreeImage-new/Makefile.gnu 2018-07-31 23:37:58.556953201 +0200 | +++ FreeImage-new/Makefile.gnu 2018-07-31 23:37:58.556953201 +0200 | ||||
| @@ -16,21 +16,11 @@ LIBRARIES = -lstdc++ | @@ -16,21 +16,11 @@ LIBRARIES = -lstdc++ | ||||
| MODULES = $(SRCS:.c=.o) | MODULES = $(SRCS:.c=.o) | ||||
| Show All 27 Lines | |||||
| - $(CXX) $(CXXFLAGS) -c $< -o $@ | - $(CXX) $(CXXFLAGS) -c $< -o $@ | ||||
| + $(CXX) $(CFLAGS) -c $< -o $@ | + $(CXX) $(CFLAGS) -c $< -o $@ | ||||
| $(STATICLIB): $(MODULES) | $(STATICLIB): $(MODULES) | ||||
| $(AR) r $@ $(MODULES) | $(AR) r $@ $(MODULES) | ||||
| $(SHAREDLIB): $(MODULES) | $(SHAREDLIB): $(MODULES) | ||||
| - $(CC) -s -shared -Wl,-soname,$(VERLIBNAME) $(LDFLAGS) -o $@ $(MODULES) $(LIBRARIES) | - $(CC) -s -shared -Wl,-soname,$(VERLIBNAME) $(LDFLAGS) -o $@ $(MODULES) $(LIBRARIES) | ||||
| + $(CC) -shared -Wl,-soname,$(VERLIBNAME) $(LDFLAGS) -o $@ $(MODULES) $(LIBRARIES) | + $(CC) -shared -Wl,-soname,$(VERLIBNAME) -o $@ $(MODULES) $(LIBRARIES) $(LDFLAGS) | ||||
| install: | install: | ||||
| install -d $(INCDIR) $(INSTALLDIR) | install -d $(INCDIR) $(INSTALLDIR) | ||||
| diff -rupN FreeImage/Source/FreeImage/J2KHelper.cpp FreeImage-new/Source/FreeImage/J2KHelper.cpp | diff -rupN FreeImage/Source/FreeImage/J2KHelper.cpp FreeImage-new/Source/FreeImage/J2KHelper.cpp | ||||
| --- FreeImage/Source/FreeImage/J2KHelper.cpp 2015-03-03 23:07:08.000000000 +0100 | --- FreeImage/Source/FreeImage/J2KHelper.cpp 2015-03-03 23:07:08.000000000 +0100 | ||||
| +++ FreeImage-new/Source/FreeImage/J2KHelper.cpp 2018-07-31 23:37:58.557953201 +0200 | +++ FreeImage-new/Source/FreeImage/J2KHelper.cpp 2018-07-31 23:37:58.557953201 +0200 | ||||
| @@ -21,7 +21,7 @@ | @@ -21,7 +21,7 @@ | ||||
| ▲ Show 20 Lines • Show All 629 Lines • Show Last 20 Lines | |||||
Copyright © 2015-2021 Solus Project. The Solus logo is Copyright © 2016-2021 Solus Project. All Rights Reserved.