History

Rename expand_picture.S to expand_picture_neon.S

This avoids ambiguity in the make based build system about whether expand_picture.o should be built from expand_picture.S or expand_picture.asm.

Martin Storsjö committed 12 years ago

Commit 45e059e1 parent 201ab422 files · +4 −4Browse files

Unified · Split

2 files
  1. codec/build/iOS/common/common.xcodeproj/project.pbxproj +4 −4
  2. codec/common/expand_picture_neon.S +0 −0
codec/build/iOS/common/common.xcodeproj/project.pbxproj+4−4
@@ -7,7 +7,7 @@ · 6 unmodified lines
7 objects = {7 objects = {
8 8
9/* Begin PBXBuildFile section */9/* Begin PBXBuildFile section */
10 4C34067D18C5C94C00DFA14A /* expand_picture.S in Sources */ = {isa = PBXBuildFile; fileRef = 4C34067C18C5C94C00DFA14A /* expand_picture.S */; };10 4C34067D18C5C94C00DFA14A /* expand_picture_neon.S in Sources */ = {isa = PBXBuildFile; fileRef = 4C34067C18C5C94C00DFA14A /* expand_picture_neon.S */; };
11 4CE443D918B722CD0017DF25 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4CE443D818B722CD0017DF25 /* Foundation.framework */; };11 4CE443D918B722CD0017DF25 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4CE443D818B722CD0017DF25 /* Foundation.framework */; };
12 4CE443E718B722CD0017DF25 /* XCTest.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4CE443E618B722CD0017DF25 /* XCTest.framework */; };12 4CE443E718B722CD0017DF25 /* XCTest.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4CE443E618B722CD0017DF25 /* XCTest.framework */; };
13 4CE443E818B722CD0017DF25 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4CE443D818B722CD0017DF25 /* Foundation.framework */; };13 4CE443E818B722CD0017DF25 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4CE443D818B722CD0017DF25 /* Foundation.framework */; };
@@ -47,7 +47,7 @@ · 33 unmodified lines
47/* End PBXCopyFilesBuildPhase section */47/* End PBXCopyFilesBuildPhase section */
48 48
49/* Begin PBXFileReference section */49/* Begin PBXFileReference section */
50 4C34067C18C5C94C00DFA14A /* expand_picture.S */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.asm; path = expand_picture.S; sourceTree = "<group>"; };50 4C34067C18C5C94C00DFA14A /* expand_picture_neon.S */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.asm; path = expand_picture_neon.S; sourceTree = "<group>"; };
51 4CE443D518B722CD0017DF25 /* libcommon.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libcommon.a; sourceTree = BUILT_PRODUCTS_DIR; };51 4CE443D518B722CD0017DF25 /* libcommon.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libcommon.a; sourceTree = BUILT_PRODUCTS_DIR; };
52 4CE443D818B722CD0017DF25 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };52 4CE443D818B722CD0017DF25 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
53 4CE443E518B722CD0017DF25 /* commonTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = commonTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };53 4CE443E518B722CD0017DF25 /* commonTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = commonTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -150,7 +150,7 @@ · 96 unmodified lines
150 4CE4472F18BC61650017DF25 /* common */ = {150 4CE4472F18BC61650017DF25 /* common */ = {
151 isa = PBXGroup;151 isa = PBXGroup;
152 children = (152 children = (
153 4C34067C18C5C94C00DFA14A /* expand_picture.S */,153 4C34067C18C5C94C00DFA14A /* expand_picture_neon.S */,
154 4CE447BE18C085900017DF25 /* arm_arch_common_macro.S */,154 4CE447BE18C085900017DF25 /* arm_arch_common_macro.S */,
155 4CE447BC18C085320017DF25 /* deblocking_neon.S */,155 4CE447BC18C085320017DF25 /* deblocking_neon.S */,
156 4CE4473118BC61650017DF25 /* cpu.cpp */,156 4CE4473118BC61650017DF25 /* cpu.cpp */,
@@ -260,7 +260,7 @@ · 103 unmodified lines
260 4CE4475018BC61650017DF25 /* deblocking_common.cpp in Sources */,260 4CE4475018BC61650017DF25 /* deblocking_common.cpp in Sources */,
261 4CE4474C18BC61650017DF25 /* cpu.cpp in Sources */,261 4CE4474C18BC61650017DF25 /* cpu.cpp in Sources */,
262 4CE4475218BC61650017DF25 /* logging.cpp in Sources */,262 4CE4475218BC61650017DF25 /* logging.cpp in Sources */,
263 4C34067D18C5C94C00DFA14A /* expand_picture.S in Sources */,263 4C34067D18C5C94C00DFA14A /* expand_picture_neon.S in Sources */,
264 4CE447BD18C085320017DF25 /* deblocking_neon.S in Sources */,264 4CE447BD18C085320017DF25 /* deblocking_neon.S in Sources */,
265 4CE4475818BC61650017DF25 /* WelsThreadLib.cpp in Sources */,265 4CE4475818BC61650017DF25 /* WelsThreadLib.cpp in Sources */,
266 4CE4474E18BC61650017DF25 /* crt_util_safe_x.cpp in Sources */,266 4CE4474E18BC61650017DF25 /* crt_util_safe_x.cpp in Sources */,
codec/common/expand_picture_neon.Srenamed from codec/common/expand_picture.S+0−0

File renamed without changes.

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t