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

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

Unified 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 side-by-side diff with in-line comments

Download patch

Index: build_tools/install_gtest/nacl-gmock-1.5.0.patch

===================================================================

--- build_tools/install_gtest/nacl-gmock-1.5.0.patch (revision 760)

+++ build_tools/install_gtest/nacl-gmock-1.5.0.patch (working copy)

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

diff -Naur gmock-1.5.0/Makefile gmock-1.5.0.nacl/Makefile

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

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

-@@ -0,0 +1,25 @@

+@@ -0,0 +1,29 @@

+CXXFLAGS = -O0 -g

+INCLUDE = -Iinclude \

+ -I. \

@@ -13,6 +13,10 @@

+OBJ_FILES = gmock-all.o \

+ gmock_main.o

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

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

++ $(OBJ_DIR)/gmock_main.o

+all: $(LIB_GMOCK)

+ @echo "Making libgmock"

@@ -26,4 +30,4 @@

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

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

-+ cd $(OBJ_DIR) && $(AR) rcs ../$(LIB_GMOCK) $(OBJ_FILES)

++ $(AR) rcs $(LIB_GMOCK) $(OBJ_LIST)

« 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 »