vitalif
/
openscad
mirror of https://github.com/vitalif/openscad
1
0
Fork 0
Code Issues Releases Wiki Activity

update readme

felipesanches-svg
Don Bright 2013-05-18 15:40:01 -05:00
parent 6509f08382
commit ca4fb9238f
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
README.md
View File

@ -188,14 +188,14 @@ http://en.wikibooks.org/wiki/OpenSCAD_User_Manual/Building_on_Windows
To cross-build, first make sure that you have development tools
installed to get GCC. Then after you've cloned this git repository,
start a new clean shell and run the script that sets up the environment
start a new clean bash shell and run the script that sets up the environment
variables.
source ./scripts/setenv-mingw-xbuild.sh
source ./scripts/setenv-mingw-xbuild.sh 32
Then run the script to download & compile all the prerequisite libraries above:
./scripts/mingw-x-build-dependencies.sh
./scripts/mingw-x-build-dependencies.sh 32
Note that this process can take several hours, as it uses the
http://mxe.cc system to cross-build many libraries. After it is
@ -208,7 +208,9 @@ If you wish you can only build the openscad.exe binary:
cd mingw32
qmake .. CONFIG+=mingw-cross-env
make
For a 64-bit Windows cross-build, replace 32 with 64 in the above instructions.
### Compilation
First, run 'qmake' from Qt4 to generate a Makefile. On some systems you need to

12
scripts/builder.sh
View File

@ -45,7 +45,7 @@ get_source_code()
git clone http://github.com/openscad/openscad.git
cd openscad
git submodule update --init # MCAD
git checkout issue341
#git checkout branch ##debugging
}
build_win32()
@ -104,8 +104,8 @@ upload_win32()
SUMMARY1="Windows x86-32 Snapshot Zipfile"
SUMMARY2="Windows x86-32 Snapshot Installer"
BASEDIR=./mingw32/
WIN32_PACKAGEFILE1=OpenSCAD-$DATECODE-x86-32.zip
WIN32_PACKAGEFILE2=OpenSCAD-$DATECODE-x86-32-Installer.exe
WIN32_PACKAGEFILE1=OpenSCAD-$DATECODE-x86-32-Installer.exe
WIN32_PACKAGEFILE2=OpenSCAD-$DATECODE-x86-32.zip
upload_win_generic "$SUMMARY1" $USERNAME $BASEDIR/$WIN32_PACKAGEFILE1
upload_win_generic "$SUMMARY2" $USERNAME $BASEDIR/$WIN32_PACKAGEFILE2
export WIN32_PACKAGEFILE1
@ -123,8 +123,8 @@ upload_win64()
SUMMARY1="Windows x86-64 Snapshot Zipfile"
SUMMARY2="Windows x86-64 Snapshot Installer"
BASEDIR=./mingw64/
WIN64_PACKAGEFILE1=OpenSCAD-$DATECODE-x86-64.zip
WIN64_PACKAGEFILE2=OpenSCAD-$DATECODE-x86-64-Installer.exe
WIN64_PACKAGEFILE1=OpenSCAD-$DATECODE-x86-64-Installer.exe
WIN64_PACKAGEFILE2=OpenSCAD-$DATECODE-x86-64.zip
upload_win_generic "$SUMMARY1" $USERNAME $BASEDIR/$WIN64_PACKAGEFILE1
upload_win_generic "$SUMMARY2" $USERNAME $BASEDIR/$WIN64_PACKAGEFILE2
export WIN64_PACKAGEFILE1
@ -192,7 +192,7 @@ update_win_www_download_links()
PAGER=cat git diff
if [ ! $DRYRUN ]; then
git commit -a -m 'builder.sh - updated snapshot links'
git push origin
git push origin master
else
echo dry run, not updating www links
fi