diff options
author | Frank van Beek <frank@iae.nl> | 2003-02-09 18:25:02 +0300 |
---|---|---|
committer | Frank van Beek <frank@iae.nl> | 2003-02-09 18:25:02 +0300 |
commit | 1919cf50ac9f1477fb963d6525807ebf8769ebbc (patch) | |
tree | 45bca7742217ada3ee396ace8a6558d3d7222552 /release | |
parent | 000b0efb7dbf563af91c798ad97142e46f674e6e (diff) |
make in the release directory now works correctly again on windows
- updated Help.url -> http://www.blender3d.org/Community/websites.php
- export $(DISTDIR) from Makefile
- chmod +x windows/specific.sh
- use awk to generate dos txt files instead of perl, perl stuff was broken
- chmod +x python22.dll, otherwise blender refuses to start
Diffstat (limited to 'release')
-rw-r--r-- | release/Makefile | 2 | ||||
-rw-r--r-- | release/windows/extra/Help.url | 4 | ||||
-rwxr-xr-x | release/windows/specific.sh | 9 |
3 files changed, 10 insertions, 5 deletions
diff --git a/release/Makefile b/release/Makefile index c394b9b279a..f401d18f181 100644 --- a/release/Makefile +++ b/release/Makefile @@ -34,7 +34,7 @@ include nan_definitions.mk VERSION := $(shell cat VERSION) BLENDNAME=blender-$(VERSION)-$(CONFIG_GUESS)$(TYPE) -DISTDIR=$(NAN_OBJDIR)/$(BLENDNAME) +export DISTDIR=$(NAN_OBJDIR)/$(BLENDNAME) all: ifeq ($(OS),beos) diff --git a/release/windows/extra/Help.url b/release/windows/extra/Help.url index e9d27cc54ca..991e2d2df26 100644 --- a/release/windows/extra/Help.url +++ b/release/windows/extra/Help.url @@ -1,4 +1,4 @@ [DEFAULT] -BASEURL=http://www.blender.nl/help/beginners.php +BASEURL=http://www.blender3d.org/Community/websites.php [InternetShortcut] -URL=http://www.blender.nl/help/beginners.php +URL=http://www.blender3d.org/Community/websites.php diff --git a/release/windows/specific.sh b/release/windows/specific.sh index 5d830331de1..11477ac0ac1 100755 --- a/release/windows/specific.sh +++ b/release/windows/specific.sh @@ -33,11 +33,11 @@ # OS specific stuff for the package, only to be executed by ../Makefile # Create ^M in readme.txt -perl -p -e 's/\r/\r\n/' $DISTDIR/README > $DISTDIR/readme.txt +awk '{printf("%s\r\n", $0);}' $DISTDIR/README > $DISTDIR/Readme.txt rm -f $DISTDIR/README # Create ^M in copyright.txt -perl -p -e 's/\r/\r\n/' $DISTDIR/copyright.txt > $DISTDIR/aCopyright.txt +awk '{printf("%s\r\n", $0);}' $DISTDIR/copyright.txt > $DISTDIR/aCopyright.txt rm -f $DISTDIR/copyright.txt mv -f $DISTDIR/aCopyright.txt $DISTDIR/Copyright.txt # PS. the whole aCopyright kludge is because of windows being braindead @@ -46,6 +46,11 @@ mv -f $DISTDIR/aCopyright.txt $DISTDIR/Copyright.txt # Stupid windows needs the . removed : PVERS=`echo $NAN_PYTHON_VERSION | sed 's/\.//'` cp -f $NAN_PYTHON/lib/python$PVERS.dll $DISTDIR/python$PVERS.dll +chmod +x $DISTDIR/python$PVERS.dll + +# Add fmod DLL to package +# cp -f $NAN_FMOD/lib/fmod.dll $DISTDIR/fmod.dll +# chmod +x $DISTDIR/fmod.dll # Add the Help.url to the ditribution cp -f extra/Help.url $DISTDIR/ |