libraries/FreeImage-3.14.1/nacl-FreeImage-3.14.1.patch - Issue 11885025: Allow re-targeting of naclports install

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: libraries/FreeImage-3.14.1/nacl-FreeImage-3.14.1.patch

Issue 11885025: Allow re-targeting of naclports install (Closed) Base URL: http://naclports.googlecode.com/svn/trunk/src

Patch Set: rebase Created 7 years, 11 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch | Annotate | Revision Log

OLD	NEW
1 diff -bNaur FreeImage/Makefile FreeImage-nacl/Makefile	1 diff -bNaur FreeImage/Makefile FreeImage-nacl/Makefile

2 --- FreeImage/Makefile 2009-07-25 11:16:10.000000000 -0600	2 --- FreeImage/Makefile 2009-07-25 11:16:10.000000000 -0600

3 +++ FreeImage-nacl/Makefile 2010-12-01 16:40:11.000000000 -0700	3 +++ FreeImage-nacl/Makefile 2010-12-01 16:40:11.000000000 -0700

4 @@ -1,7 +1,7 @@	4 @@ -1,7 +1,7 @@

5 # Entry point for FreeImage makefiles	5 # Entry point for FreeImage makefiles

6 # Default to 'make -f Makefile.gnu' for Linux and for unknown OS.	6 # Default to 'make -f Makefile.gnu' for Linux and for unknown OS.

7 #	7 #

8 -OS = $(shell uname)	8 -OS = $(shell uname)

9 +OS ?= $(shell uname)	9 +OS ?= $(shell uname)

10 MAKEFILE = gnu	10 MAKEFILE = gnu

(...skipping 12 matching lines...) Expand all Loading...
23 diff -bNaur FreeImage/Makefile.nacl FreeImage-nacl/Makefile.nacl	23 diff -bNaur FreeImage/Makefile.nacl FreeImage-nacl/Makefile.nacl

24 --- FreeImage/Makefile.nacl 1969-12-31 17:00:00.000000000 -0700	24 --- FreeImage/Makefile.nacl 1969-12-31 17:00:00.000000000 -0700

25 +++ FreeImage-nacl/Makefile.nacl 2010-12-02 14:18:03.000000000 -0700	25 +++ FreeImage-nacl/Makefile.nacl 2010-12-02 14:18:03.000000000 -0700

26 @@ -0,0 +1,63 @@	26 @@ -0,0 +1,63 @@

27 +# Native Client makefile for FreeImage	27 +# Native Client makefile for FreeImage

28 +	28 +

29 +# This file can be generated by ./gensrclist.sh	29 +# This file can be generated by ./gensrclist.sh

30 +include Makefile.srcs	30 +include Makefile.srcs

31 +	31 +

32 +# General configuration variables:	32 +# General configuration variables:

33 +INCDIR ?= $(NACL_SDK_USR_INCLUDE)	33 +INCDIR ?= $(NACLPORTS_INCLUDE)

34 +INSTALLDIR ?= $(NACL_SDK_USR_LIB)	34 +INSTALLDIR ?= $(NACLPORTS_LIBDIR)

35 +	35 +

36 +# Converts cr/lf to just lf	36 +# Converts cr/lf to just lf

37 +DOS2UNIX = dos2unix	37 +DOS2UNIX = dos2unix

38 +	38 +

39 +LIBRARIES = -lstdc++	39 +LIBRARIES = -lstdc++

40 +	40 +

41 +MODULES = $(SRCS:.c=.o)	41 +MODULES = $(SRCS:.c=.o)

42 +MODULES := $(MODULES:.cpp=.o)	42 +MODULES := $(MODULES:.cpp=.o)

43 +CFLAGS ?= -O3 -fexceptions -fvisibility=hidden -DNO_LCMS	43 +CFLAGS ?= -O3 -fexceptions -fvisibility=hidden -DNO_LCMS

44 +CFLAGS += $(INCLUDE)	44 +CFLAGS += $(INCLUDE)

(...skipping 180 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
225 --- FreeImage/Source/Utilities.h 2010-08-13 01:42:02.000000000 -0600	225 --- FreeImage/Source/Utilities.h 2010-08-13 01:42:02.000000000 -0600

226 +++ FreeImage-nacl/Source/Utilities.h 2010-12-01 16:55:14.000000000 -0700	226 +++ FreeImage-nacl/Source/Utilities.h 2010-12-01 16:55:14.000000000 -0700

227 @@ -30,7 +30,6 @@	227 @@ -30,7 +30,6 @@

228	228

229 #include <math.h>	229 #include <math.h>

230 #include <stdlib.h>	230 #include <stdlib.h>

231 -#include <memory.h>	231 -#include <memory.h>

232 #include <stdio.h>	232 #include <stdio.h>

233 #include <string.h>	233 #include <string.h>

234 #include <stdarg.h>	234 #include <stdarg.h>

OLD	NEW

« no previous file with comments | « examples/tools/thttpd-2.25b/nacl-thttpd-2.25b.sh ('k') | libraries/FreeImage-3.14.1/nacl-FreeImage-3.14.1.sh » ('j') | no next file with comments »