2021-01-24 06:02:03 +01:00
|
|
|
Index: libraries/source/fcollada/src/Makefile
|
|
|
|
|
===================================================================
|
srcpkgs/[0-9]*: convert patches to -Np1
```sh
git grep -l '^patch_args=-Np0' "srcpkgs/$1*/template" |
while read template; do
for p in ${template%/template}/patches/*; do
sed -i '
\,^[+-][+-][+-] /dev/null,b
/^[*-]\+ [0-9]\+\(,[0-9]\+\)\? [*-]\+$/b
s,^[*][*][*] ,&a/,
/^--- /{
s,\(^--- \)\(./\)*,\1a/,
s,[.-][Oo][Rr][Ii][Gg]\([ /]\),\1,
s/[.-][Oo][Rr][Ii][Gg]$//
s/[.]patched[.]\([^.]\)/.\1/
h
}
/^+++ -/{
g
s/^--- a/+++ b/
b
}
s,\(^+++ \)\(./\)*,\1b/,
' "$p"
done
sed -i '/^patch_args=/d' $template
done
```
2021-06-19 05:03:21 +02:00
|
|
|
--- a/libraries/source/fcollada/src/Makefile
|
|
|
|
|
+++ b/libraries/source/fcollada/src/Makefile
|
2021-01-24 06:02:03 +01:00
|
|
|
@@ -224,7 +224,7 @@ OBJECTS_RELEASE = $(addprefix output/rel
|
|
|
|
|
OBJECTS_TEST = $(addprefix output/test/,$(SOURCE:.cpp=.o) $(TEST_SOURCE:.cpp=.o))
|
|
|
|
|
OBJECTS_ALL = $(OBJECTS_DEBUG) $(OBJECTS_RELEASE) $(OBJECTS_TEST)
|
|
|
|
|
|
|
|
|
|
-all: output/libFColladaSD.a output/libFColladaSR.a install
|
|
|
|
|
+all: output/libFColladaSR.a install
|
|
|
|
|
|
|
|
|
|
output_dirs:
|
|
|
|
|
bash -c 'mkdir -p output/{debug,release,test}/{FCollada/{FCDocument,FMath,FUtils,FColladaTest/{FCTestAssetManagement,FCTestExportImport,FCTestXRef}},FColladaPlugins/FArchiveXML}'
|
|
|
|
|
@@ -244,8 +244,7 @@ output/libFColladaSR.a: $(OBJECTS_RELEAS
|
|
|
|
|
output/FColladaTest: $(OBJECTS_TEST) | output_dirs
|
|
|
|
|
$(CXX) -o $@ $(LDFLAGS) $(OBJECTS_TEST) $(LIBS)
|
|
|
|
|
|
|
|
|
|
-install: output/libFColladaSD.a output/libFColladaSR.a
|
|
|
|
|
- cp output/libFColladaSD.a ../lib/libFColladaSD.a
|
|
|
|
|
+install: output/libFColladaSR.a
|
|
|
|
|
cp output/libFColladaSR.a ../lib/libFColladaSR.a
|
|
|
|
|
|
|
|
|
|
dfile = $(@:.o=.d)
|
