Skip to content

Commit

Permalink
Merge pull request #29 from raistlinthewiz/develop
Browse files Browse the repository at this point in the history
v0.1 release with basic monogame & xna support.
  • Loading branch information
Hüseyin Uslu committed Dec 27, 2012
2 parents bcae409 + e7d4b41 commit f136d9a
Show file tree
Hide file tree
Showing 99 changed files with 206,763 additions and 1,330 deletions.
22 changes: 22 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# Auto detect text files and perform LF normalization
* text=auto

# Custom for Visual Studio
*.cs diff=csharp
*.sln merge=union
*.csproj merge=union
*.vbproj merge=union
*.fsproj merge=union
*.dbproj merge=union

# Standard to msysgit
*.doc diff=astextplain
*.DOC diff=astextplain
*.docx diff=astextplain
*.DOCX diff=astextplain
*.dot diff=astextplain
*.DOT diff=astextplain
*.pdf diff=astextplain
*.PDF diff=astextplain
*.rtf diff=astextplain
*.RTF diff=astextplain
1 change: 1 addition & 0 deletions build/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,4 @@
/UpgradeLog.htm
/*.Windows.sln.DotSettings
/*.DotSettings
/*.userprefs
19 changes: 19 additions & 0 deletions build/build-effects.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
..\dep\monogame\tools\2MGFX.exe ..\src\Content\Effects\BlockEffect.fx ..\src\Content\Effects\BlockEffect.mgfxo /DEBUG
..\dep\monogame\tools\2MGFX.exe ..\src\Content\Effects\DualTextured.fx ..\src\Content\Effects\DualTextured.mgfxo /DEBUG
..\dep\monogame\tools\2MGFX.exe ..\src\Content\Effects\PerlinNoise.fx ..\src\Content\Effects\PerlinNoise.mgfxo /DEBUG
..\dep\monogame\tools\2MGFX.exe ..\src\Content\Effects\SkyDome.fx ..\src\Content\Effects\SkyDome.mgfxo /DEBUG

copy ..\src\Content\Effects\BlockEffect.mgfxo ..\bin\debug\windows\monogame\Content\Effects\BlockEffect.mgfxo
copy ..\src\Content\Effects\DualTextured.mgfxo ..\bin\debug\windows\monogame\Content\Effects\DualTextured.mgfxo
copy ..\src\Content\Effects\PerlinNoise.mgfxo ..\bin\debug\windows\monogame\Content\Effects\PerlinNoise.mgfxo
copy ..\src\Content\Effects\SkyDome.mgfxo ..\bin\debug\windows\monogame\Content\Effects\SkyDome.mgfxo

..\dep\monogame\tools\2MGFX.exe ..\src\Content\Effects\PostProcessing\Bloom\BloomCombine.fx ..\src\Content\Effects\PostProcessing\Bloom\BloomCombine.mgfxo /DEBUG
..\dep\monogame\tools\2MGFX.exe ..\src\Content\Effects\PostProcessing\Bloom\BloomExtract.fx ..\src\Content\Effects\PostProcessing\Bloom\BloomExtract.mgfxo /DEBUG
..\dep\monogame\tools\2MGFX.exe ..\src\Content\Effects\PostProcessing\Bloom\GaussianBlur.fx ..\src\Content\Effects\PostProcessing\Bloom\GaussianBlur.mgfxo /DEBUG

copy ..\src\Content\Effects\PostProcessing\Bloom\BloomCombine.mgfxo ..\bin\debug\windows\monogame\Content\Effects\PostProcessing\Bloom\BloomCombine.mgfxo
copy ..\src\Content\Effects\PostProcessing\Bloom\BloomExtract.mgfxo ..\bin\debug\windows\monogame\Content\Effects\PostProcessing\Bloom\BloomExtract.mgfxo
copy ..\src\Content\Effects\PostProcessing\Bloom\GaussianBlur.mgfxo ..\bin\debug\windows\monogame\Content\Effects\PostProcessing\Bloom\GaussianBlur.mgfxo

exit 0
9 changes: 9 additions & 0 deletions build/build-mono.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
!/bin/bash

SCRIPT="$(cd "${0%/*}" 2>/dev/null; echo "$PWD"/"${0##*/}")"
SCRIPTPATH=`dirname $SCRIPT`
echo $SCRIPTPATH

sed -e 's/dep\\sqlite\\sqlite-mixed/dep\\sqlite\\sqlite-managed/g' $SCRIPTPATH/../src/Voxeliq/Voxeliq-VS2010.csproj > $SCRIPTPATH/../src/Voxeliq/Voxeliq-Mono.csproj

xbuild $SCRIPTPATH/Voxeliq.Windows.Monogame.sln
1 change: 1 addition & 0 deletions build/build-win-monogame.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
%SystemRoot%\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe Voxeliq.Windows.Monogame.sln
1 change: 1 addition & 0 deletions build/build-win-xna.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
%SystemRoot%\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe Voxeliq.Windows.XNA.sln
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added dep/monogame/pipeline/NAudio.dll
Binary file not shown.
Loading

0 comments on commit f136d9a

Please sign in to comment.