build_tools/install_gtest/nacl-gmock-1.5.0.patch - Issue 6635045: Updates to make install_third_party build gtest and gmock on windows.

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: build_tools/install_gtest/nacl-gmock-1.5.0.patch

Issue 6635045: Updates to make install_third_party build gtest and gmock on windows. Base URL: http://nativeclient-sdk.googlecode.com/svn/trunk/src/

Patch Set: Created 9 years, 9 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 -Naur gmock-1.5.0/Makefile gmock-1.5.0.nacl/Makefile	1 diff -Naur gmock-1.5.0/Makefile gmock-1.5.0.nacl/Makefile

2 --- gmock-1.5.0/Makefile 1969-12-31 17:00:00.000000000 -0700	2 --- gmock-1.5.0/Makefile 1969-12-31 17:00:00.000000000 -0700

3 +++ gmock-1.5.0.nacl/Makefile 2010-07-07 14:28:27.000000000 -0600	3 +++ gmock-1.5.0.nacl/Makefile 2010-07-07 14:28:27.000000000 -0600

4 @@ -0,0 +1,25 @@	4 @@ -0,0 +1,29 @@

5 +CXXFLAGS = -O0 -g	5 +CXXFLAGS = -O0 -g

6 +INCLUDE = -Iinclude \	6 +INCLUDE = -Iinclude \

7 + -I. \	7 + -I. \

8 + -I$(NACL_TOOLCHAIN_ROOT)/nacl/usr/include \	8 + -I$(NACL_TOOLCHAIN_ROOT)/nacl/usr/include \

9 + -I$(NACL_TOOLCHAIN_ROOT)/nacl64/usr/include	9 + -I$(NACL_TOOLCHAIN_ROOT)/nacl64/usr/include

10 +LIB_GMOCK = libgmock.a	10 +LIB_GMOCK = libgmock.a

11 +OBJ_DIR = obj	11 +OBJ_DIR = obj

12 +	12 +

13 +OBJ_FILES = gmock-all.o \	13 +OBJ_FILES = gmock-all.o \

14 + gmock_main.o	14 + gmock_main.o

15 +	15 +

	16 +# Necessary because we can't CD to the obj directory on windows.

	17 +OBJ_LIST = $(OBJ_DIR)/gmock-all.o \

	18 + $(OBJ_DIR)/gmock_main.o

	19 +

16 +all: $(LIB_GMOCK)	20 +all: $(LIB_GMOCK)

17 + @echo "Making libgmock"	21 + @echo "Making libgmock"

18 +	22 +

19 +clean:	23 +clean:

20 + rm -rf $(OBJ_DIR) $(LIB_GMOCK)	24 + rm -rf $(OBJ_DIR) $(LIB_GMOCK)

21 +	25 +

22 +$(OBJ_DIR):	26 +$(OBJ_DIR):

23 + mkdir $(OBJ_DIR)	27 + mkdir $(OBJ_DIR)

24 +	28 +

25 +$(OBJ_FILES): %.o: src/%.cc $(OBJ_DIR)	29 +$(OBJ_FILES): %.o: src/%.cc $(OBJ_DIR)

26 + $(CXX) -c $(INCLUDE) $(CXXFLAGS) $< -o $(OBJ_DIR)/$@	30 + $(CXX) -c $(INCLUDE) $(CXXFLAGS) $< -o $(OBJ_DIR)/$@

27 +	31 +

28 +$(LIB_GMOCK): $(OBJ_DIR) $(OBJ_FILES)	32 +$(LIB_GMOCK): $(OBJ_DIR) $(OBJ_FILES)

29 +» cd $(OBJ_DIR) && $(AR) rcs ../$(LIB_GMOCK) $(OBJ_FILES)	33 +» $(AR) rcs $(LIB_GMOCK) $(OBJ_LIST)

OLD	NEW

« no previous file with comments | « build_tools/install_gtest/install_gtest.py ('k') | build_tools/install_gtest/nacl-gtest-1.5.0.patch » ('j') | no next file with comments »