set svn end of lines to native
authorCampbell Barton <ideasman42@gmail.com>
Mon, 9 May 2011 08:15:38 +0000 (08:15 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 9 May 2011 08:15:38 +0000 (08:15 +0000)
intern/bsp/test/BSP_GhostTest/BSP_GhostTest.dsp
intern/bsp/test/BSP_GhostTest/BSP_GhostTest.dsw
intern/smoke/intern/Makefile.FFT
intern/smoke/intern/Makefile.cygwin
intern/smoke/intern/Makefile.linux
intern/smoke/intern/Makefile.mac
release/environment-mswindows
release/windows/installer/00.sconsblender.nsi
source/darwin/blender.app/Contents/Info.plist
source/darwin/blenderplayer.app/Contents/Info.plist
source/icons/blender.exe.manifest

index 4474eaa5d90a876bc903ef9835a586cc7789624f..aaa4527384505d77ff431a20ed6b54d7690f9170 100644 (file)
-# Microsoft Developer Studio Project File - Name="BSP_GhostTest" - Package Owner=<4>\r
-# Microsoft Developer Studio Generated Build File, Format Version 6.00\r
-# ** DO NOT EDIT **\r
-\r
-# TARGTYPE "Win32 (x86) Console Application" 0x0103\r
-\r
-CFG=BSP_GhostTest - Win32 Debug\r
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,\r
-!MESSAGE use the Export Makefile command and run\r
-!MESSAGE \r
-!MESSAGE NMAKE /f "BSP_GhostTest.mak".\r
-!MESSAGE \r
-!MESSAGE You can specify a configuration when running NMAKE\r
-!MESSAGE by defining the macro CFG on the command line. For example:\r
-!MESSAGE \r
-!MESSAGE NMAKE /f "BSP_GhostTest.mak" CFG="BSP_GhostTest - Win32 Debug"\r
-!MESSAGE \r
-!MESSAGE Possible choices for configuration are:\r
-!MESSAGE \r
-!MESSAGE "BSP_GhostTest - Win32 Release" (based on "Win32 (x86) Console Application")\r
-!MESSAGE "BSP_GhostTest - Win32 Debug" (based on "Win32 (x86) Console Application")\r
-!MESSAGE \r
-\r
-# Begin Project\r
-# PROP AllowPerConfigDependencies 0\r
-# PROP Scc_ProjName ""\r
-# PROP Scc_LocalPath ""\r
-CPP=cl.exe\r
-RSC=rc.exe\r
-\r
-!IF  "$(CFG)" == "BSP_GhostTest - Win32 Release"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 0\r
-# PROP BASE Output_Dir "Release"\r
-# PROP BASE Intermediate_Dir "Release"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 0\r
-# PROP Output_Dir "Release"\r
-# PROP Intermediate_Dir "Release"\r
-# PROP Ignore_Export_Lib 0\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c\r
-# ADD CPP /nologo /G6 /MT /W3 /GX /O2 /Ob2 /I "../../extern/" /I "../../../../lib/windows/string/include" /I "../../../../lib/windows/ghost/include" /I "../../../../lib/windows/moto/include" /I "../../../../lib/windows/memutil/include" /I "../../../../lib/windows/container/include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c\r
-# ADD BASE RSC /l 0x413 /d "NDEBUG"\r
-# ADD RSC /l 0x413 /d "NDEBUG"\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LINK32=link.exe\r
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386\r
-# ADD LINK32 glu32.lib opengl32.lib kernel32.lib user32.lib gdi32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\lib\windows\glut-3.7\lib\\"\r
-\r
-!ELSEIF  "$(CFG)" == "BSP_GhostTest - Win32 Debug"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 1\r
-# PROP BASE Output_Dir "Debug"\r
-# PROP BASE Intermediate_Dir "Debug"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 1\r
-# PROP Output_Dir "Debug"\r
-# PROP Intermediate_Dir "Debug"\r
-# PROP Ignore_Export_Lib 0\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c\r
-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../../extern/" /I "../../../../lib/windows/string/include" /I "../../../../lib/windows/ghost/include" /I "../../../../lib/windows/moto/include" /I "../../../../lib/windows/memutil/include" /I "../../../../lib/windows/container/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c\r
-# ADD BASE RSC /l 0x413 /d "_DEBUG"\r
-# ADD RSC /l 0x413 /d "_DEBUG"\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LINK32=link.exe\r
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept\r
-# ADD LINK32 glu32.lib opengl32.lib user32.lib gdi32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\lib\windows\glut-3.7\lib\\"\r
-\r
-!ENDIF \r
-\r
-# Begin Target\r
-\r
-# Name "BSP_GhostTest - Win32 Release"\r
-# Name "BSP_GhostTest - Win32 Debug"\r
-# Begin Source File\r
-\r
-SOURCE=.\BSP_GhostTest3D.cpp\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\BSP_GhostTest3D.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\BSP_MeshDrawer.cpp\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\BSP_MeshDrawer.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\BSP_PlyLoader.cpp\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\BSP_PlyLoader.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\BSP_TMesh.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\main.cpp\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\ply.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\plyfile.c\r
-# End Source File\r
-# End Target\r
-# End Project\r
+# Microsoft Developer Studio Project File - Name="BSP_GhostTest" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=BSP_GhostTest - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "BSP_GhostTest.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "BSP_GhostTest.mak" CFG="BSP_GhostTest - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "BSP_GhostTest - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "BSP_GhostTest - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "BSP_GhostTest - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /G6 /MT /W3 /GX /O2 /Ob2 /I "../../extern/" /I "../../../../lib/windows/string/include" /I "../../../../lib/windows/ghost/include" /I "../../../../lib/windows/moto/include" /I "../../../../lib/windows/memutil/include" /I "../../../../lib/windows/container/include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD BASE RSC /l 0x413 /d "NDEBUG"
+# ADD RSC /l 0x413 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 glu32.lib opengl32.lib kernel32.lib user32.lib gdi32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\lib\windows\glut-3.7\lib\\"
+
+!ELSEIF  "$(CFG)" == "BSP_GhostTest - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../../extern/" /I "../../../../lib/windows/string/include" /I "../../../../lib/windows/ghost/include" /I "../../../../lib/windows/moto/include" /I "../../../../lib/windows/memutil/include" /I "../../../../lib/windows/container/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD BASE RSC /l 0x413 /d "_DEBUG"
+# ADD RSC /l 0x413 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 glu32.lib opengl32.lib user32.lib gdi32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\lib\windows\glut-3.7\lib\\"
+
+!ENDIF 
+
+# Begin Target
+
+# Name "BSP_GhostTest - Win32 Release"
+# Name "BSP_GhostTest - Win32 Debug"
+# Begin Source File
+
+SOURCE=.\BSP_GhostTest3D.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\BSP_GhostTest3D.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\BSP_MeshDrawer.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\BSP_MeshDrawer.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\BSP_PlyLoader.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\BSP_PlyLoader.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\BSP_TMesh.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\main.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\ply.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\plyfile.c
+# End Source File
+# End Target
+# End Project
index 0d9ca3d2b08cc2bacb6207a559a91b92dc721c8a..802fba84befc472c2b1dcef0e7977b503c06d146 100644 (file)
-Microsoft Developer Studio Workspace File, Format Version 6.00\r
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!\r
-\r
-###############################################################################\r
-\r
-Project: "BSP_GhostTest"=.\BSP_GhostTest.dsp - Package Owner=<4>\r
-\r
-Package=<5>\r
-{{{\r
-}}}\r
-\r
-Package=<4>\r
-{{{\r
-    Begin Project Dependency\r
-    Project_Dep_Name bsplib\r
-    End Project Dependency\r
-    Begin Project Dependency\r
-    Project_Dep_Name ghost\r
-    End Project Dependency\r
-    Begin Project Dependency\r
-    Project_Dep_Name string\r
-    End Project Dependency\r
-    Begin Project Dependency\r
-    Project_Dep_Name MoTo\r
-    End Project Dependency\r
-}}}\r
-\r
-###############################################################################\r
-\r
-Project: "MoTo"=..\..\..\moto\make\msvc_6_0\MoTo.dsp - Package Owner=<4>\r
-\r
-Package=<5>\r
-{{{\r
-}}}\r
-\r
-Package=<4>\r
-{{{\r
-}}}\r
-\r
-###############################################################################\r
-\r
-Project: "bsplib"=..\..\make\msvc6_0\bsplib.dsp - Package Owner=<4>\r
-\r
-Package=<5>\r
-{{{\r
-}}}\r
-\r
-Package=<4>\r
-{{{\r
-    Begin Project Dependency\r
-    Project_Dep_Name container\r
-    End Project Dependency\r
-    Begin Project Dependency\r
-    Project_Dep_Name memutil\r
-    End Project Dependency\r
-    Begin Project Dependency\r
-    Project_Dep_Name MoTo\r
-    End Project Dependency\r
-}}}\r
-\r
-###############################################################################\r
-\r
-Project: "container"=..\..\..\container\make\msvc_6_0\container.dsp - Package Owner=<4>\r
-\r
-Package=<5>\r
-{{{\r
-}}}\r
-\r
-Package=<4>\r
-{{{\r
-    Begin Project Dependency\r
-    Project_Dep_Name memutil\r
-    End Project Dependency\r
-}}}\r
-\r
-###############################################################################\r
-\r
-Project: "ghost"=..\..\..\ghost\make\msvc\ghost.dsp - Package Owner=<4>\r
-\r
-Package=<5>\r
-{{{\r
-}}}\r
-\r
-Package=<4>\r
-{{{\r
-}}}\r
-\r
-###############################################################################\r
-\r
-Project: "memutil"=..\..\..\memutil\make\msvc_60\memutil.dsp - Package Owner=<4>\r
-\r
-Package=<5>\r
-{{{\r
-}}}\r
-\r
-Package=<4>\r
-{{{\r
-}}}\r
-\r
-###############################################################################\r
-\r
-Project: "string"=..\..\..\string\make\msvc_6_0\string.dsp - Package Owner=<4>\r
-\r
-Package=<5>\r
-{{{\r
-}}}\r
-\r
-Package=<4>\r
-{{{\r
-}}}\r
-\r
-###############################################################################\r
-\r
-Global:\r
-\r
-Package=<5>\r
-{{{\r
-}}}\r
-\r
-Package=<3>\r
-{{{\r
-}}}\r
-\r
-###############################################################################\r
-\r
+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "BSP_GhostTest"=.\BSP_GhostTest.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name bsplib
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name ghost
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name string
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name MoTo
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "MoTo"=..\..\..\moto\make\msvc_6_0\MoTo.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "bsplib"=..\..\make\msvc6_0\bsplib.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name container
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name memutil
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name MoTo
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "container"=..\..\..\container\make\msvc_6_0\container.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name memutil
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "ghost"=..\..\..\ghost\make\msvc\ghost.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "memutil"=..\..\..\memutil\make\msvc_60\memutil.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "string"=..\..\..\string\make\msvc_6_0\string.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+
index e45af1df29be7395a88986c45cf3fb4bc1be5846..7e9d089cec2f8966b4984c11812e8c5d79e93e32 100644 (file)
@@ -1,22 +1,22 @@
-# common stuff\r
-LDFLAGS_COMMON = -lfftw3 #-lglut -lglu32 -lopengl32 -lz -lpng\r
-CFLAGS_COMMON =  -c -Wall -I./ #-I/cygdrive/c/lib/glvu/include -D_WIN32\r
-\r
-CC         = g++\r
-CFLAGS     = ${CFLAGS_COMMON} -O3 -Wno-unused\r
-LDFLAGS    = ${LDFLAGS_COMMON}\r
-EXECUTABLE = noiseFFT\r
-\r
-SOURCES    = noiseFFT.cpp\r
-OBJECTS    = $(SOURCES:.cpp=.o)\r
-\r
-all: $(SOURCES) $(EXECUTABLE)\r
-       \r
-$(EXECUTABLE): $(OBJECTS) \r
-       $(CC) $(OBJECTS) $(LDFLAGS) -o $@\r
-\r
-.cpp.o:\r
-       $(CC) $(CFLAGS) $< -o $@\r
-\r
-clean:\r
-       rm -f *.o $(EXECUTABLE_LOADER) $(EXECUTABLE)\r
+# common stuff
+LDFLAGS_COMMON = -lfftw3 #-lglut -lglu32 -lopengl32 -lz -lpng
+CFLAGS_COMMON =  -c -Wall -I./ #-I/cygdrive/c/lib/glvu/include -D_WIN32
+
+CC         = g++
+CFLAGS     = ${CFLAGS_COMMON} -O3 -Wno-unused
+LDFLAGS    = ${LDFLAGS_COMMON}
+EXECUTABLE = noiseFFT
+
+SOURCES    = noiseFFT.cpp
+OBJECTS    = $(SOURCES:.cpp=.o)
+
+all: $(SOURCES) $(EXECUTABLE)
+       
+$(EXECUTABLE): $(OBJECTS) 
+       $(CC) $(OBJECTS) $(LDFLAGS) -o $@
+
+.cpp.o:
+       $(CC) $(CFLAGS) $< -o $@
+
+clean:
+       rm -f *.o $(EXECUTABLE_LOADER) $(EXECUTABLE)
index c93753a67fe6fb48a12862600df8ab79cd4b92e5..2a747219554da56b91c11b5977ad95724b843834 100644 (file)
@@ -1,23 +1,23 @@
-CC         = g++\r
-LDFLAGS    = -lz -lpng\r
-CFLAGS     =  -O3 -Wno-unused -c -Wall -I./ -D_WIN32\r
-EXECUTABLE = FLUID_3D\r
-\r
-SOURCES    = main.cpp FLUID_3D.cpp FLUID_3D_SOLVERS.cpp FLUID_3D_STATIC.cpp SPHERE.cpp WTURBULENCE.cpp\r
-OBJECTS    = $(SOURCES:.cpp=.o)\r
-\r
-all: $(SOURCES) $(EXECUTABLE)\r
-       \r
-$(EXECUTABLE): $(OBJECTS) \r
-       $(CC) $(OBJECTS) $(LDFLAGS) -o $@\r
-\r
-.cpp.o:\r
-       $(CC) $(CFLAGS) $< -o $@\r
-\r
-SPHERE.o: SPHERE.h\r
-FLUID_3D.o: FLUID_3D.h FLUID_3D.cpp\r
-FLUID_3D_SOLVERS.o: FLUID_3D.h FLUID_3D_SOLVERS.cpp\r
-main.o: FLUID_3D.h FLUID_3D.cpp FLUID_3D_SOLVERS.cpp\r
-\r
-clean:\r
-       rm -f *.o $(EXECUTABLE_LOADER) $(EXECUTABLE)\r
+CC         = g++
+LDFLAGS    = -lz -lpng
+CFLAGS     =  -O3 -Wno-unused -c -Wall -I./ -D_WIN32
+EXECUTABLE = FLUID_3D
+
+SOURCES    = main.cpp FLUID_3D.cpp FLUID_3D_SOLVERS.cpp FLUID_3D_STATIC.cpp SPHERE.cpp WTURBULENCE.cpp
+OBJECTS    = $(SOURCES:.cpp=.o)
+
+all: $(SOURCES) $(EXECUTABLE)
+       
+$(EXECUTABLE): $(OBJECTS) 
+       $(CC) $(OBJECTS) $(LDFLAGS) -o $@
+
+.cpp.o:
+       $(CC) $(CFLAGS) $< -o $@
+
+SPHERE.o: SPHERE.h
+FLUID_3D.o: FLUID_3D.h FLUID_3D.cpp
+FLUID_3D_SOLVERS.o: FLUID_3D.h FLUID_3D_SOLVERS.cpp
+main.o: FLUID_3D.h FLUID_3D.cpp FLUID_3D_SOLVERS.cpp
+
+clean:
+       rm -f *.o $(EXECUTABLE_LOADER) $(EXECUTABLE)
index 8e71af465dd0ac89220cb022affc662b913ca4ba..5fbb6e6c3e3fb32820b10526ad72d6ec95aa5033 100644 (file)
@@ -1,23 +1,23 @@
-CC         = g++\r
-LDFLAGS    = -lz -lpng -fopenmp -lgomp\r
-CFLAGS     =  -c -Wall -I./ -fopenmp -DPARALLEL=1 -O3 -Wno-unused\r
-EXECUTABLE = FLUID_3D\r
-\r
-SOURCES    = main.cpp FLUID_3D.cpp FLUID_3D_SOLVERS.cpp FLUID_3D_STATIC.cpp SPHERE.cpp WTURBULENCE.cpp\r
-OBJECTS    = $(SOURCES:.cpp=.o)\r
-\r
-all: $(SOURCES) $(EXECUTABLE)\r
-       \r
-$(EXECUTABLE): $(OBJECTS) \r
-       $(CC) $(OBJECTS) $(LDFLAGS) -o $@\r
-\r
-.cpp.o:\r
-       $(CC) $(CFLAGS) $< -o $@\r
-\r
-SPHERE.o: SPHERE.h\r
-FLUID_3D.o: FLUID_3D.h FLUID_3D.cpp\r
-FLUID_3D_SOLVERS.o: FLUID_3D.h FLUID_3D_SOLVERS.cpp\r
-main.o: FLUID_3D.h FLUID_3D.cpp FLUID_3D_SOLVERS.cpp\r
-\r
-clean:\r
-       rm -f *.o $(EXECUTABLE_LOADER) $(EXECUTABLE)\r
+CC         = g++
+LDFLAGS    = -lz -lpng -fopenmp -lgomp
+CFLAGS     =  -c -Wall -I./ -fopenmp -DPARALLEL=1 -O3 -Wno-unused
+EXECUTABLE = FLUID_3D
+
+SOURCES    = main.cpp FLUID_3D.cpp FLUID_3D_SOLVERS.cpp FLUID_3D_STATIC.cpp SPHERE.cpp WTURBULENCE.cpp
+OBJECTS    = $(SOURCES:.cpp=.o)
+
+all: $(SOURCES) $(EXECUTABLE)
+       
+$(EXECUTABLE): $(OBJECTS) 
+       $(CC) $(OBJECTS) $(LDFLAGS) -o $@
+
+.cpp.o:
+       $(CC) $(CFLAGS) $< -o $@
+
+SPHERE.o: SPHERE.h
+FLUID_3D.o: FLUID_3D.h FLUID_3D.cpp
+FLUID_3D_SOLVERS.o: FLUID_3D.h FLUID_3D_SOLVERS.cpp
+main.o: FLUID_3D.h FLUID_3D.cpp FLUID_3D_SOLVERS.cpp
+
+clean:
+       rm -f *.o $(EXECUTABLE_LOADER) $(EXECUTABLE)
index 227aaa10a166ef1f1c7e359716cdf2e3ff960d9f..d0b7bd38c857b913bac98542d809582f633587e2 100644 (file)
@@ -1,35 +1,35 @@
-CC         = g++\r
-\r
-# uncomment the other two OPENMP_... lines, if your gcc supports OpenMP\r
-#OPENMP_FLAGS = -fopenmp   -DPARALLEL=1 -I/opt/gcc-4.3/usr/local/include\r
-#OPENMPLD_FLAGS = -fopenmp  -lgomp -I/opt/gcc-4.3/usr/local/lib\r
-OPENMP_FLAGS = \r
-OPENMPLD_FLAGS = \r
-\r
-# assumes MacPorts libpng installation\r
-PNG_INCLUDE =  -I/opt/local/include  \r
-PNG_LIBS =  -I/opt/local/lib  \r
-\r
-LDFLAGS    =  $(PNG_LIBS)-lz -lpng $(OPENMPLD_FLAGS)\r
-CFLAGS     =  -c -Wall -I./ $(PNG_INCLUDE) $(OPENMP_FLAGS) -O3 -Wno-unused\r
-EXECUTABLE = FLUID_3D\r
-\r
-SOURCES    = main.cpp FLUID_3D.cpp FLUID_3D_SOLVERS.cpp FLUID_3D_STATIC.cpp SPHERE.cpp WTURBULENCE.cpp\r
-OBJECTS    = $(SOURCES:.cpp=.o)\r
-\r
-all: $(SOURCES) $(EXECUTABLE)\r
-       \r
-$(EXECUTABLE): $(OBJECTS) \r
-       $(CC) $(OBJECTS) $(LDFLAGS) -o $@\r
-\r
-.cpp.o:\r
-       $(CC) $(CFLAGS) $< -o $@\r
-\r
-SPHERE.o: SPHERE.h\r
-FLUID_3D.o: FLUID_3D.h FLUID_3D.cpp\r
-FLUID_3D_SOLVERS.o: FLUID_3D.h FLUID_3D_SOLVERS.cpp\r
-main.o: FLUID_3D.h FLUID_3D.cpp FLUID_3D_SOLVERS.cpp\r
-\r
-clean:\r
-       rm -f *.o $(EXECUTABLE_LOADER) $(EXECUTABLE)\r
-\r
+CC         = g++
+
+# uncomment the other two OPENMP_... lines, if your gcc supports OpenMP
+#OPENMP_FLAGS = -fopenmp   -DPARALLEL=1 -I/opt/gcc-4.3/usr/local/include
+#OPENMPLD_FLAGS = -fopenmp  -lgomp -I/opt/gcc-4.3/usr/local/lib
+OPENMP_FLAGS = 
+OPENMPLD_FLAGS = 
+
+# assumes MacPorts libpng installation
+PNG_INCLUDE =  -I/opt/local/include  
+PNG_LIBS =  -I/opt/local/lib  
+
+LDFLAGS    =  $(PNG_LIBS)-lz -lpng $(OPENMPLD_FLAGS)
+CFLAGS     =  -c -Wall -I./ $(PNG_INCLUDE) $(OPENMP_FLAGS) -O3 -Wno-unused
+EXECUTABLE = FLUID_3D
+
+SOURCES    = main.cpp FLUID_3D.cpp FLUID_3D_SOLVERS.cpp FLUID_3D_STATIC.cpp SPHERE.cpp WTURBULENCE.cpp
+OBJECTS    = $(SOURCES:.cpp=.o)
+
+all: $(SOURCES) $(EXECUTABLE)
+       
+$(EXECUTABLE): $(OBJECTS) 
+       $(CC) $(OBJECTS) $(LDFLAGS) -o $@
+
+.cpp.o:
+       $(CC) $(CFLAGS) $< -o $@
+
+SPHERE.o: SPHERE.h
+FLUID_3D.o: FLUID_3D.h FLUID_3D.cpp
+FLUID_3D_SOLVERS.o: FLUID_3D.h FLUID_3D_SOLVERS.cpp
+main.o: FLUID_3D.h FLUID_3D.cpp FLUID_3D_SOLVERS.cpp
+
+clean:
+       rm -f *.o $(EXECUTABLE_LOADER) $(EXECUTABLE)
+
index f8890f89af899f4f28dc1fae18bd2d007c43da87..41308533e0b17528359b4bba801399d1e2b83825 100644 (file)
@@ -1,18 +1,18 @@
-# This is a Blender Environment Variable config file.\r
-#\r
-# Comment lines start with "#", other lines will be split at the "="\r
-# and the part before will be used as env var name and the part after\r
-# as env var value. The value can make reference to previous or\r
-# prelaunch variables with "%%" and the content will be replaced.\r
-# Once set, values of variables will not be overwritten.\r
-#\r
-# BLENDER_SHARE should be COMMON_APPDATA\\Blender Foundation\\Blender for typical installs.\r
-# BLENDER_VERSION will be set by the program before processing this file.\r
-BLENDER_USER_BASE=%USERPROFILE%\\Blender Foundation\\Blender\\%BLENDER_VERSION%\r
-BLENDER_SYSTEM_BASE=%BLENDER_SHARE%\\%BLENDER_VERSION%\r
-BLENDER_USER_DATAFILES=%USERPROFILE%\\Blender Foundation\\%BLENDER_VERSION%\\datafiles\r
-BLENDER_SYSTEM_DATAFILES=%BLENDER_SHARE%\\%BLENDER_VERSION%\\datafiles\r
-BLENDER_USER_PY=%USERPROFILE%\\Blender Foundation\\%BLENDER_VERSION%\\py\r
-BLENDER_SYSTEM_PY=%BLENDER_SHARE%\\%BLENDER_VERSION%\\py\r
-BLENDER_USER_PLUGINS=%USERPROFILE%\\Blender Foundation\\%BLENDER_VERSION%\\plugins\r
-BLENDER_SYSTEM_PLUGINS=%BLENDER_SHARE%\\%BLENDER_VERSION%\\plugins\r
+# This is a Blender Environment Variable config file.
+#
+# Comment lines start with "#", other lines will be split at the "="
+# and the part before will be used as env var name and the part after
+# as env var value. The value can make reference to previous or
+# prelaunch variables with "%%" and the content will be replaced.
+# Once set, values of variables will not be overwritten.
+#
+# BLENDER_SHARE should be COMMON_APPDATA\\Blender Foundation\\Blender for typical installs.
+# BLENDER_VERSION will be set by the program before processing this file.
+BLENDER_USER_BASE=%USERPROFILE%\\Blender Foundation\\Blender\\%BLENDER_VERSION%
+BLENDER_SYSTEM_BASE=%BLENDER_SHARE%\\%BLENDER_VERSION%
+BLENDER_USER_DATAFILES=%USERPROFILE%\\Blender Foundation\\%BLENDER_VERSION%\\datafiles
+BLENDER_SYSTEM_DATAFILES=%BLENDER_SHARE%\\%BLENDER_VERSION%\\datafiles
+BLENDER_USER_PY=%USERPROFILE%\\Blender Foundation\\%BLENDER_VERSION%\\py
+BLENDER_SYSTEM_PY=%BLENDER_SHARE%\\%BLENDER_VERSION%\\py
+BLENDER_USER_PLUGINS=%USERPROFILE%\\Blender Foundation\\%BLENDER_VERSION%\\plugins
+BLENDER_SYSTEM_PLUGINS=%BLENDER_SHARE%\\%BLENDER_VERSION%\\plugins
index 2a37f7f6ba68e2223dc3397ef4334d4cf34cb772..03f62f0df489f08679fc9cb0fea48f3967c8aeeb 100644 (file)
-;\r
-; $Id$\r
-;\r
-; Blender Self-Installer for Windows (NSIS - http://nsis.sourceforge.net)\r
-;\r
-\r
-SetCompressor /SOLID lzma\r
-\r
-Name "Blender [VERSION]" \r
-\r
-RequestExecutionLevel admin\r
-\r
-!include "MUI.nsh"\r
-!include "WinVer.nsh"\r
-!include "FileFunc.nsh"\r
-!include "WordFunc.nsh"\r
-!include "nsDialogs.nsh"\r
-!include "x64.nsh"\r
-\r
-!define MUI_ABORTWARNING\r
-\r
-!define MUI_WELCOMEPAGE_TEXT  "This wizard will guide you through the installation of Blender. It is recommended that you close all other applications before starting Setup."\r
-!define MUI_WELCOMEFINISHPAGE_BITMAP "[RELDIR]\01.installer.bmp"\r
-!define MUI_HEADERIMAGE\r
-!define MUI_HEADERIMAGE_BITMAP  "[RELDIR]\00.header.bmp"\r
-!define MUI_COMPONENTSPAGE_SMALLDESC\r
-!define MUI_FINISHPAGE_RUN "$INSTDIR\blender.exe"\r
-!define MUI_CHECKBITMAP "[RELDIR]\00.checked.bmp"\r
-!define MUI_UNWELCOMEFINISHPAGE_BITMAP "[RELDIR]\01.installer.bmp"\r
-\r
-!insertmacro MUI_PAGE_WELCOME\r
-!insertmacro MUI_PAGE_LICENSE "[DISTDIR]\Copyright.txt"\r
-!insertmacro MUI_PAGE_COMPONENTS\r
-    \r
-!insertmacro MUI_PAGE_DIRECTORY\r
-Page custom DataLocation DataLocationOnLeave\r
-!insertmacro MUI_PAGE_INSTFILES\r
-!insertmacro MUI_PAGE_FINISH\r
-  \r
-!insertmacro MUI_UNPAGE_WELCOME\r
-!insertmacro MUI_UNPAGE_CONFIRM\r
-!insertmacro MUI_UNPAGE_INSTFILES\r
-!insertmacro MUI_UNPAGE_FINISH\r
-\r
-!insertmacro Locate\r
-!insertmacro VersionCompare\r
-\r
-\r
-Icon "[RELDIR]\00.installer.ico"\r
-UninstallIcon "[RELDIR]\00.installer.ico"\r
-\r
-;--------------------------------\r
-;Languages\r
\r
-  !insertmacro MUI_LANGUAGE "English"\r
-    \r
-;--------------------------------\r
-;Language Strings\r
-\r
-  ;Description\r
-  LangString DESC_InstallFiles ${LANG_ENGLISH} "Copy all required files to the application folder."\r
-  LangString DESC_StartMenu ${LANG_ENGLISH} "Add shortcut items to the Start Menu. (Recommended)"\r
-  LangString DESC_DesktopShortcut ${LANG_ENGLISH} "Add a shortcut to Blender on your desktop."\r
-  LangString DESC_BlendRegister ${LANG_ENGLISH} "Blender can register itself with .blend files to allow double-clicking from Windows Explorer, etc."\r
-  LangString TEXT_IO_TITLE ${LANG_ENGLISH} "Specify User Data Location"\r
-;--------------------------------\r
-;Data\r
-\r
-Caption "Blender [VERSION] Installer"\r
-OutFile "[DISTDIR]\..\blender-[VERSION]-windows[BITNESS].exe"\r
-InstallDir $INSTDIR ; $INSTDIR is set inside .onInit\r
-BrandingText "Blender Foundation | http://www.blender.org"\r
-ComponentText "This will install Blender [VERSION] on your computer."\r
-\r
-DirText "Use the field below to specify the folder where you want Blender to be copied to. To specify a different folder, type a new name or use the Browse button to select an existing folder."\r
-\r
-SilentUnInstall normal\r
-\r
-Var BLENDERHOME\r
-Var SHORTVERSION ; This is blender_version_decimal() from path_util.c\r
-\r
-; Custom controls\r
-Var HWND\r
-\r
-Var HWND_APPDATA\r
-Var HWND_INSTDIR\r
-Var HWND_HOMEDIR\r
-\r
-Function .onInit\r
-  ClearErrors\r
-  StrCpy $SHORTVERSION "[SHORTVERSION]"\r
-\r
-  ${If} ${RunningX64}\r
-    ${If} "[BITNESS]" == "32"\r
-    ${OrIf} "[BITNESS]" == "-mingw"\r
-      StrCpy $INSTDIR "$PROGRAMFILES32\Blender Foundation\Blender" ; Can't use InstallDir inside Section\r
-    ${ElseIf} "[BITNESS]" == "64"\r
-      StrCpy $INSTDIR "$PROGRAMFILES64\Blender Foundation\Blender"\r
-    ${EndIf}\r
-  ${Else}\r
-    StrCpy $INSTDIR "$PROGRAMFILES\Blender Foundation\Blender"\r
-  ${EndIf}\r
-FunctionEnd\r
-\r
-Function un.onInit\r
-FunctionEnd\r
-\r
-Function DataLocation\r
-  nsDialogs::Create /NOUNLOAD 1018\r
-  Pop $HWND\r
-  \r
-  ${If} $HWND == error\r
-    Abort\r
-  ${EndIf}\r
-  \r
-  ${NSD_CreateLabel} 0 0 100% 24u "Please specify where you wish to install Blender's user data files. Be aware that if you choose to use your Application Data directory, your preferences and scripts will only be accessible by the current user account."\r
-  ${NSD_CreateRadioButton} 0 50 100% 12u "Use Application Data directory (recommended)"\r
-  Pop $HWND_APPDATA\r
-  ${NSD_CreateRadioButton} 0 80 100% 12u "Use installation directory"\r
-  Pop $HWND_INSTDIR\r
-  ${NSD_CreateRadioButton} 0 110 100% 12u "I have defined a %HOME% variable, please install files there"\r
-  Pop $HWND_HOMEDIR\r
-  \r
-  ${If} ${AtMostWinME}\r
-    GetDlgItem $0 $HWND $HWND_APPDATA\r
-    EnableWindow $0 0\r
-    SendMessage $HWND_INSTDIR ${BM_SETCHECK} 1 0\r
-  ${Else}\r
-    SendMessage $HWND_APPDATA ${BM_SETCHECK} 1 0\r
-  ${EndIf}\r
-  \r
-  nsDialogs::Show\r
-  \r
-FunctionEnd\r
-\r
-Function DataLocationOnLeave\r
-  ${NSD_GetState} $HWND_APPDATA $R0\r
-  ${If} $R0 == "1"\r
-    SetShellVarContext current\r
-    StrCpy $BLENDERHOME "$APPDATA\Blender Foundation\Blender"\r
-    SetShellVarContext all\r
-  ${Else}\r
-    ${NSD_GetState} $HWND_INSTDIR $R0\r
-    ${If} $R0 == "1"\r
-      StrCpy $BLENDERHOME $INSTDIR\r
-    ${Else}\r
-      ${NSD_GetState} $HWND_HOMEDIR $R0\r
-      ${If} $R0 == "1"\r
-        ReadEnvStr $BLENDERHOME "HOME"\r
-      ${EndIf}\r
-    ${EndIf}\r
-  ${EndIf}\r
-FunctionEnd\r
-\r
-Section "Blender [VERSION] (required)" InstallFiles\r
-  SectionIn RO\r
-\r
-  ; Set output path to the installation directory.\r
-  SetOutPath $INSTDIR\r
-  ; The contents of Blender installation root dir\r
-  [ROOTDIRCONTS]\r
-  \r
-  ; All datafiles (python, scripts, config)\r
-  [DODATAFILES]\r
-  \r
-  SetOutPath $INSTDIR\r
-  ${If} ${RunningX64}\r
-    SetRegView 64\r
-  ${EndIf}\r
-  ; Write the installation path into the registry\r
-  WriteRegStr HKLM "SOFTWARE\BlenderFoundation" "Install_Dir" "$INSTDIR"\r
-  WriteRegStr HKLM "SOFTWARE\BlenderFoundation" "ConfigData_Dir" "$BLENDERHOME"\r
-  WriteRegStr HKLM "SOFTWARE\BlenderFoundation" "ShortVersion" "[SHORTVERSION]"\r
-  ; Write the uninstall keys for Windows\r
-  WriteRegStr   HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Blender" "DisplayName" "Blender"\r
-  WriteRegStr   HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Blender" "Publisher" "Blender Foundation"\r
-  WriteRegStr   HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Blender" "URLInfoAbout" "http://www.blender.org/"\r
-  WriteRegStr   HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Blender" "DisplayVersion" "[VERSION]"\r
-  WriteRegStr   HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Blender" "DisplayIcon" "$INSTDIR\blender.exe"\r
-  WriteRegStr   HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Blender" "UninstallString" '"$INSTDIR\uninstall.exe"'\r
-  WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Blender" "NoModify" 1\r
-  WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Blender" "NoRepair " 1\r
-  WriteUninstaller "uninstall.exe"\r
-\r
-SectionEnd\r
-\r
-Section "Add Start Menu Shortcuts" StartMenu\r
-  SetShellVarContext all\r
-  CreateDirectory "$SMPROGRAMS\Blender Foundation\Blender\"\r
-  CreateShortCut "$SMPROGRAMS\Blender Foundation\Blender\Uninstall.lnk" "$INSTDIR\uninstall.exe" "" "$INSTDIR\uninstall.exe" 0\r
-  CreateShortCut "$SMPROGRAMS\Blender Foundation\Blender\Blender.lnk" "$INSTDIR\Blender.exe" "" "$INSTDIR\blender.exe" 0\r
-  CreateShortCut "$SMPROGRAMS\Blender Foundation\Blender\Readme.lnk" "$INSTDIR\readme.html" "" "" 0\r
-  CreateShortCut "$SMPROGRAMS\Blender Foundation\Blender\Copyright.lnk" "$INSTDIR\Copyright.txt" "" "$INSTDIR\copyright.txt" 0\r
-  CreateShortCut "$SMPROGRAMS\Blender Foundation\Blender\GPL-license.lnk" "$INSTDIR\GPL-license.txt" "" "$INSTDIR\GPL-license.txt" 0\r
-  System::Call 'shell32.dll::SHChangeNotify(i, i, i, i) v (0x08000000, 0, 0, 0)' ; refresh icons\r
-SectionEnd\r
-\r
-Section "Add Desktop Shortcut" DesktopShortcut\r
-  CreateShortCut "$DESKTOP\Blender.lnk" "$INSTDIR\blender.exe" "" "$INSTDIR\blender.exe" 0\r
-  System::Call 'shell32.dll::SHChangeNotify(i, i, i, i) v (0x08000000, 0, 0, 0)' ; refresh icons\r
-SectionEnd\r
-\r
-Section "Open .blend files with Blender" BlendRegister\r
-  ExecWait '"$INSTDIR\blender.exe" -r'\r
-SectionEnd\r
-\r
-UninstallText "This will uninstall Blender [VERSION], and all installed files. Before continuing make sure you have created backup of all the files you may want to keep: startup.blend, bookmarks.txt, recent-files.txt. Hit 'Uninstall' to continue."\r
-\r
-Section "Uninstall"\r
-  ; Remove registry keys\r
-  ${If} ${RunningX64}\r
-    SetRegView 64\r
-  ${EndIf}\r
-  \r
-  ReadRegStr $BLENDERHOME HKLM "SOFTWARE\BlenderFoundation" "ConfigData_Dir"\r
-  ReadRegStr $SHORTVERSION HKLM "SOFTWARE\BlenderFoundation" "ShortVersion"\r
-  DeleteRegKey HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Blender"\r
-  DeleteRegKey HKLM "SOFTWARE\BlenderFoundation"\r
-  DeleteRegKey HKCR ".blend"\r
-  DeleteRegKey HKCR "blendfile"\r
-  DeleteRegKey HKCR "CLSID\{D45F043D-F17F-4e8a-8435-70971D9FA46D}"\r
-  SetShellVarContext all\r
\r
-  ; Remove files\r
-  [DELROOTDIRCONTS]\r
-\r
-  Delete "$INSTDIR\uninstall.exe"\r
-\r
-  MessageBox MB_YESNO "Recursively erase contents of $BLENDERHOME\$SHORTVERSION\scripts? NOTE: This includes all installed scripts and *any* file and directory you have manually created, installed later or copied. This also including .blend files." IDNO NextNoScriptRemove\r
-  RMDir /r "$BLENDERHOME\$SHORTVERSION\scripts"\r
-NextNoScriptRemove:\r
-  MessageBox MB_YESNO "Recursively erase contents from $BLENDERHOME\$SHORTVERSION\config? NOTE: This includes your startup.blend, bookmarks and any other file and directory you may have created in that directory" IDNO NextNoConfigRemove\r
-  RMDir /r "$BLENDERHOME\$SHORTVERSION\config"\r
-NextNoConfigRemove:\r
-  MessageBox MB_YESNO "Recursively erase contents from $BLENDERHOME\$SHORTVERSION\plugins? NOTE: This includes files and subdirectories in this directory" IDNO NextNoPluginRemove\r
-  RMDir /r "$BLENDERHOME\$SHORTVERSION\plugins"\r
-NextNoPluginRemove:\r
-  ; Try to remove dirs, but leave them if they contain anything\r
-  RMDir "$BLENDERHOME\$SHORTVERSION\plugins"\r
-  RMDir "$BLENDERHOME\$SHORTVERSION\config"\r
-  RMDir "$BLENDERHOME\$SHORTVERSION\scripts"\r
-  RMDir "$BLENDERHOME\$SHORTVERSION"\r
-  RMDir "$BLENDERHOME"\r
-  ; Remove shortcuts\r
-  Delete "$SMPROGRAMS\Blender Foundation\Blender\*.*"\r
-  Delete "$DESKTOP\Blender.lnk"\r
-  ; Remove all link related directories and files\r
-  RMDir /r "$SMPROGRAMS\Blender Foundation"\r
-  ; Clear out installation dir\r
-  RMDir /r "$INSTDIR"\r
-  \r
-  System::Call 'shell32.dll::SHChangeNotify(i, i, i, i) v (0x08000000, 0, 0, 0)' ; Refresh icons\r
-SectionEnd\r
-\r
-!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN\r
-  !insertmacro MUI_DESCRIPTION_TEXT ${InstallFiles} $(DESC_InstallFiles)\r
-  !insertmacro MUI_DESCRIPTION_TEXT ${StartMenu} $(DESC_StartMenu)\r
-  !insertmacro MUI_DESCRIPTION_TEXT ${DesktopShortcut} $(DESC_DesktopShortcut)\r
-  !insertmacro MUI_DESCRIPTION_TEXT ${BlendRegister} $(DESC_BlendRegister)\r
-!insertmacro MUI_FUNCTION_DESCRIPTION_END\r
-\r
+;
+; $Id$
+;
+; Blender Self-Installer for Windows (NSIS - http://nsis.sourceforge.net)
+;
+
+SetCompressor /SOLID lzma
+
+Name "Blender [VERSION]" 
+
+RequestExecutionLevel admin
+
+!include "MUI.nsh"
+!include "WinVer.nsh"
+!include "FileFunc.nsh"
+!include "WordFunc.nsh"
+!include "nsDialogs.nsh"
+!include "x64.nsh"
+
+!define MUI_ABORTWARNING
+
+!define MUI_WELCOMEPAGE_TEXT  "This wizard will guide you through the installation of Blender. It is recommended that you close all other applications before starting Setup."
+!define MUI_WELCOMEFINISHPAGE_BITMAP "[RELDIR]\01.installer.bmp"
+!define MUI_HEADERIMAGE
+!define MUI_HEADERIMAGE_BITMAP  "[RELDIR]\00.header.bmp"
+!define MUI_COMPONENTSPAGE_SMALLDESC
+!define MUI_FINISHPAGE_RUN "$INSTDIR\blender.exe"
+!define MUI_CHECKBITMAP "[RELDIR]\00.checked.bmp"
+!define MUI_UNWELCOMEFINISHPAGE_BITMAP "[RELDIR]\01.installer.bmp"
+
+!insertmacro MUI_PAGE_WELCOME
+!insertmacro MUI_PAGE_LICENSE "[DISTDIR]\Copyright.txt"
+!insertmacro MUI_PAGE_COMPONENTS
+    
+!insertmacro MUI_PAGE_DIRECTORY
+Page custom DataLocation DataLocationOnLeave
+!insertmacro MUI_PAGE_INSTFILES
+!insertmacro MUI_PAGE_FINISH
+  
+!insertmacro MUI_UNPAGE_WELCOME
+!insertmacro MUI_UNPAGE_CONFIRM
+!insertmacro MUI_UNPAGE_INSTFILES
+!insertmacro MUI_UNPAGE_FINISH
+
+!insertmacro Locate
+!insertmacro VersionCompare
+
+
+Icon "[RELDIR]\00.installer.ico"
+UninstallIcon "[RELDIR]\00.installer.ico"
+
+;--------------------------------
+;Languages
+  !insertmacro MUI_LANGUAGE "English"
+    
+;--------------------------------
+;Language Strings
+
+  ;Description
+  LangString DESC_InstallFiles ${LANG_ENGLISH} "Copy all required files to the application folder."
+  LangString DESC_StartMenu ${LANG_ENGLISH} "Add shortcut items to the Start Menu. (Recommended)"
+  LangString DESC_DesktopShortcut ${LANG_ENGLISH} "Add a shortcut to Blender on your desktop."
+  LangString DESC_BlendRegister ${LANG_ENGLISH} "Blender can register itself with .blend files to allow double-clicking from Windows Explorer, etc."
+  LangString TEXT_IO_TITLE ${LANG_ENGLISH} "Specify User Data Location"
+;--------------------------------
+;Data
+
+Caption "Blender [VERSION] Installer"
+OutFile "[DISTDIR]\..\blender-[VERSION]-windows[BITNESS].exe"
+InstallDir $INSTDIR ; $INSTDIR is set inside .onInit
+BrandingText "Blender Foundation | http://www.blender.org"
+ComponentText "This will install Blender [VERSION] on your computer."
+
+DirText "Use the field below to specify the folder where you want Blender to be copied to. To specify a different folder, type a new name or use the Browse button to select an existing folder."
+
+SilentUnInstall normal
+
+Var BLENDERHOME
+Var SHORTVERSION ; This is blender_version_decimal() from path_util.c
+
+; Custom controls
+Var HWND
+
+Var HWND_APPDATA
+Var HWND_INSTDIR
+Var HWND_HOMEDIR
+
+Function .onInit
+  ClearErrors
+  StrCpy $SHORTVERSION "[SHORTVERSION]"
+
+  ${If} ${RunningX64}
+    ${If} "[BITNESS]" == "32"
+    ${OrIf} "[BITNESS]" == "-mingw"
+      StrCpy $INSTDIR "$PROGRAMFILES32\Blender Foundation\Blender" ; Can't use InstallDir inside Section
+    ${ElseIf} "[BITNESS]" == "64"
+      StrCpy $INSTDIR "$PROGRAMFILES64\Blender Foundation\Blender"
+    ${EndIf}
+  ${Else}
+    StrCpy $INSTDIR "$PROGRAMFILES\Blender Foundation\Blender"
+  ${EndIf}
+FunctionEnd
+
+Function un.onInit
+FunctionEnd
+
+Function DataLocation
+  nsDialogs::Create /NOUNLOAD 1018
+  Pop $HWND
+  
+  ${If} $HWND == error
+    Abort
+  ${EndIf}
+  
+  ${NSD_CreateLabel} 0 0 100% 24u "Please specify where you wish to install Blender's user data files. Be aware that if you choose to use your Application Data directory, your preferences and scripts will only be accessible by the current user account."
+  ${NSD_CreateRadioButton} 0 50 100% 12u "Use Application Data directory (recommended)"
+  Pop $HWND_APPDATA
+  ${NSD_CreateRadioButton} 0 80 100% 12u "Use installation directory"
+  Pop $HWND_INSTDIR
+  ${NSD_CreateRadioButton} 0 110 100% 12u "I have defined a %HOME% variable, please install files there"
+  Pop $HWND_HOMEDIR
+  
+  ${If} ${AtMostWinME}
+    GetDlgItem $0 $HWND $HWND_APPDATA
+    EnableWindow $0 0
+    SendMessage $HWND_INSTDIR ${BM_SETCHECK} 1 0
+  ${Else}
+    SendMessage $HWND_APPDATA ${BM_SETCHECK} 1 0
+  ${EndIf}
+  
+  nsDialogs::Show
+  
+FunctionEnd
+
+Function DataLocationOnLeave
+  ${NSD_GetState} $HWND_APPDATA $R0
+  ${If} $R0 == "1"
+    SetShellVarContext current
+    StrCpy $BLENDERHOME "$APPDATA\Blender Foundation\Blender"
+    SetShellVarContext all
+  ${Else}
+    ${NSD_GetState} $HWND_INSTDIR $R0
+    ${If} $R0 == "1"
+      StrCpy $BLENDERHOME $INSTDIR
+    ${Else}
+      ${NSD_GetState} $HWND_HOMEDIR $R0
+      ${If} $R0 == "1"
+        ReadEnvStr $BLENDERHOME "HOME"
+      ${EndIf}
+    ${EndIf}
+  ${EndIf}
+FunctionEnd
+
+Section "Blender [VERSION] (required)" InstallFiles
+  SectionIn RO
+
+  ; Set output path to the installation directory.
+  SetOutPath $INSTDIR
+  ; The contents of Blender installation root dir
+  [ROOTDIRCONTS]
+  
+  ; All datafiles (python, scripts, config)
+  [DODATAFILES]
+  
+  SetOutPath $INSTDIR
+  ${If} ${RunningX64}
+    SetRegView 64
+  ${EndIf}
+  ; Write the installation path into the registry
+  WriteRegStr HKLM "SOFTWARE\BlenderFoundation" "Install_Dir" "$INSTDIR"
+  WriteRegStr HKLM "SOFTWARE\BlenderFoundation" "ConfigData_Dir" "$BLENDERHOME"
+  WriteRegStr HKLM "SOFTWARE\BlenderFoundation" "ShortVersion" "[SHORTVERSION]"
+  ; Write the uninstall keys for Windows
+  WriteRegStr   HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Blender" "DisplayName" "Blender"
+  WriteRegStr   HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Blender" "Publisher" "Blender Foundation"
+  WriteRegStr   HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Blender" "URLInfoAbout" "http://www.blender.org/"
+  WriteRegStr   HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Blender" "DisplayVersion" "[VERSION]"
+  WriteRegStr   HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Blender" "DisplayIcon" "$INSTDIR\blender.exe"
+  WriteRegStr   HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Blender" "UninstallString" '"$INSTDIR\uninstall.exe"'
+  WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Blender" "NoModify" 1
+  WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Blender" "NoRepair " 1
+  WriteUninstaller "uninstall.exe"
+
+SectionEnd
+
+Section "Add Start Menu Shortcuts" StartMenu
+  SetShellVarContext all
+  CreateDirectory "$SMPROGRAMS\Blender Foundation\Blender\"
+  CreateShortCut "$SMPROGRAMS\Blender Foundation\Blender\Uninstall.lnk" "$INSTDIR\uninstall.exe" "" "$INSTDIR\uninstall.exe" 0
+  CreateShortCut "$SMPROGRAMS\Blender Foundation\Blender\Blender.lnk" "$INSTDIR\Blender.exe" "" "$INSTDIR\blender.exe" 0
+  CreateShortCut "$SMPROGRAMS\Blender Foundation\Blender\Readme.lnk" "$INSTDIR\readme.html" "" "" 0
+  CreateShortCut "$SMPROGRAMS\Blender Foundation\Blender\Copyright.lnk" "$INSTDIR\Copyright.txt" "" "$INSTDIR\copyright.txt" 0
+  CreateShortCut "$SMPROGRAMS\Blender Foundation\Blender\GPL-license.lnk" "$INSTDIR\GPL-license.txt" "" "$INSTDIR\GPL-license.txt" 0
+  System::Call 'shell32.dll::SHChangeNotify(i, i, i, i) v (0x08000000, 0, 0, 0)' ; refresh icons
+SectionEnd
+
+Section "Add Desktop Shortcut" DesktopShortcut
+  CreateShortCut "$DESKTOP\Blender.lnk" "$INSTDIR\blender.exe" "" "$INSTDIR\blender.exe" 0
+  System::Call 'shell32.dll::SHChangeNotify(i, i, i, i) v (0x08000000, 0, 0, 0)' ; refresh icons
+SectionEnd
+
+Section "Open .blend files with Blender" BlendRegister
+  ExecWait '"$INSTDIR\blender.exe" -r'
+SectionEnd
+
+UninstallText "This will uninstall Blender [VERSION], and all installed files. Before continuing make sure you have created backup of all the files you may want to keep: startup.blend, bookmarks.txt, recent-files.txt. Hit 'Uninstall' to continue."
+
+Section "Uninstall"
+  ; Remove registry keys
+  ${If} ${RunningX64}
+    SetRegView 64
+  ${EndIf}
+  
+  ReadRegStr $BLENDERHOME HKLM "SOFTWARE\BlenderFoundation" "ConfigData_Dir"
+  ReadRegStr $SHORTVERSION HKLM "SOFTWARE\BlenderFoundation" "ShortVersion"
+  DeleteRegKey HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Blender"
+  DeleteRegKey HKLM "SOFTWARE\BlenderFoundation"
+  DeleteRegKey HKCR ".blend"
+  DeleteRegKey HKCR "blendfile"
+  DeleteRegKey HKCR "CLSID\{D45F043D-F17F-4e8a-8435-70971D9FA46D}"
+  SetShellVarContext all
+  ; Remove files
+  [DELROOTDIRCONTS]
+
+  Delete "$INSTDIR\uninstall.exe"
+
+  MessageBox MB_YESNO "Recursively erase contents of $BLENDERHOME\$SHORTVERSION\scripts? NOTE: This includes all installed scripts and *any* file and directory you have manually created, installed later or copied. This also including .blend files." IDNO NextNoScriptRemove
+  RMDir /r "$BLENDERHOME\$SHORTVERSION\scripts"
+NextNoScriptRemove:
+  MessageBox MB_YESNO "Recursively erase contents from $BLENDERHOME\$SHORTVERSION\config? NOTE: This includes your startup.blend, bookmarks and any other file and directory you may have created in that directory" IDNO NextNoConfigRemove
+  RMDir /r "$BLENDERHOME\$SHORTVERSION\config"
+NextNoConfigRemove:
+  MessageBox MB_YESNO "Recursively erase contents from $BLENDERHOME\$SHORTVERSION\plugins? NOTE: This includes files and subdirectories in this directory" IDNO NextNoPluginRemove
+  RMDir /r "$BLENDERHOME\$SHORTVERSION\plugins"
+NextNoPluginRemove:
+  ; Try to remove dirs, but leave them if they contain anything
+  RMDir "$BLENDERHOME\$SHORTVERSION\plugins"
+  RMDir "$BLENDERHOME\$SHORTVERSION\config"
+  RMDir "$BLENDERHOME\$SHORTVERSION\scripts"
+  RMDir "$BLENDERHOME\$SHORTVERSION"
+  RMDir "$BLENDERHOME"
+  ; Remove shortcuts
+  Delete "$SMPROGRAMS\Blender Foundation\Blender\*.*"
+  Delete "$DESKTOP\Blender.lnk"
+  ; Remove all link related directories and files
+  RMDir /r "$SMPROGRAMS\Blender Foundation"
+  ; Clear out installation dir
+  RMDir /r "$INSTDIR"
+  
+  System::Call 'shell32.dll::SHChangeNotify(i, i, i, i) v (0x08000000, 0, 0, 0)' ; Refresh icons
+SectionEnd
+
+!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
+  !insertmacro MUI_DESCRIPTION_TEXT ${InstallFiles} $(DESC_InstallFiles)
+  !insertmacro MUI_DESCRIPTION_TEXT ${StartMenu} $(DESC_StartMenu)
+  !insertmacro MUI_DESCRIPTION_TEXT ${DesktopShortcut} $(DESC_DesktopShortcut)
+  !insertmacro MUI_DESCRIPTION_TEXT ${BlendRegister} $(DESC_BlendRegister)
+!insertmacro MUI_FUNCTION_DESCRIPTION_END
+
index 2f5d235a6194ed0479b944cbc77d40bf30f0a72d..23941d910751e97b97c0bf44a02fb2220aaf6bfa 100644 (file)
@@ -1,53 +1,53 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<!DOCTYPE plist SYSTEM "file://localhost/System/Library/DTDs/PropertyList.dtd">\r
-<plist version="0.9">\r
-<dict>\r
-       <key>CFBundleInfoDictionaryVersion</key>\r
-       <string>6.0</string>\r
-\r
-       <key>CFBundleExecutable</key>\r
-       <string>blender</string>\r
-\r
-       <key>CFBundlePackageType</key>\r
-       <string>APPL</string>\r
-       <key>CFBundleSignature</key>\r
-       <string>????</string>\r
-\r
-       <key>CFBundleIconFile</key>\r
-       <string>blender icon.icns</string>\r
-\r
-       <key>CFBundleName</key>\r
-       <string>Blender</string>\r
-       <key>CFBundleIdentifier</key>\r
-       <string>org.blenderfoundation.blender</string>\r
-\r
-       <key>CFBundleVersion</key>\r
-       <string>${MACOSX_BUNDLE_LONG_VERSION_STRING}, Blender Foundation</string>\r
-       <key>CFBundleShortVersionString</key>\r
-       <string>${MACOSX_BUNDLE_SHORT_VERSION_STRING}</string>\r
-       <key>CFBundleGetInfoString</key>\r
-       <string>${MACOSX_BUNDLE_LONG_VERSION_STRING}, Blender Foundation</string>\r
-\r
-       <key>CFBundleDocumentTypes</key>\r
-       <array>\r
-               <dict>\r
-                       <key>CFBundleTypeIconFile</key>\r
-                       <string>blender file icon.icns</string>\r
-                       <key>CFBundleTypeName</key>\r
-                       <string>Blender File</string>\r
-                       <key>CFBundleTypeOSTypes</key>\r
-                       <array>\r
-                               <string>BLND</string>\r
-                       </array>\r
-                       <key>CFBundleTypeExtensions</key>\r
-                       <array>\r
-                               <string>blend</string>\r
-                       </array>\r
-                       <key>CFBundleTypeRole</key>\r
-                       <string>Editor</string>\r
-                       <key>LSIsAppleDefaultForType</key>\r
-                       <true/> \r
-               </dict>\r
-       </array>\r
-</dict>\r
-</plist>\r
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist SYSTEM "file://localhost/System/Library/DTDs/PropertyList.dtd">
+<plist version="0.9">
+<dict>
+       <key>CFBundleInfoDictionaryVersion</key>
+       <string>6.0</string>
+
+       <key>CFBundleExecutable</key>
+       <string>blender</string>
+
+       <key>CFBundlePackageType</key>
+       <string>APPL</string>
+       <key>CFBundleSignature</key>
+       <string>????</string>
+
+       <key>CFBundleIconFile</key>
+       <string>blender icon.icns</string>
+
+       <key>CFBundleName</key>
+       <string>Blender</string>
+       <key>CFBundleIdentifier</key>
+       <string>org.blenderfoundation.blender</string>
+
+       <key>CFBundleVersion</key>
+       <string>${MACOSX_BUNDLE_LONG_VERSION_STRING}, Blender Foundation</string>
+       <key>CFBundleShortVersionString</key>
+       <string>${MACOSX_BUNDLE_SHORT_VERSION_STRING}</string>
+       <key>CFBundleGetInfoString</key>
+       <string>${MACOSX_BUNDLE_LONG_VERSION_STRING}, Blender Foundation</string>
+
+       <key>CFBundleDocumentTypes</key>
+       <array>
+               <dict>
+                       <key>CFBundleTypeIconFile</key>
+                       <string>blender file icon.icns</string>
+                       <key>CFBundleTypeName</key>
+                       <string>Blender File</string>
+                       <key>CFBundleTypeOSTypes</key>
+                       <array>
+                               <string>BLND</string>
+                       </array>
+                       <key>CFBundleTypeExtensions</key>
+                       <array>
+                               <string>blend</string>
+                       </array>
+                       <key>CFBundleTypeRole</key>
+                       <string>Editor</string>
+                       <key>LSIsAppleDefaultForType</key>
+                       <true/> 
+               </dict>
+       </array>
+</dict>
+</plist>
index f99338d6c4763c995a065e877a3284ca7ef1e30d..54364d188663b39e544cd20807f2561c20057d3a 100644 (file)
@@ -1,53 +1,53 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<!DOCTYPE plist SYSTEM "file://localhost/System/Library/DTDs/PropertyList.dtd">\r
-<plist version="0.9">\r
-<dict>\r
-       <key>CFBundleInfoDictionaryVersion</key>\r
-       <string>6.0</string>\r
-\r
-       <key>CFBundleExecutable</key>\r
-       <string>blenderplayer</string>\r
-\r
-       <key>CFBundlePackageType</key>\r
-       <string>APPL</string>\r
-       <key>CFBundleSignature</key>\r
-       <string>????</string>\r
-\r
-       <key>CFBundleIconFile</key>\r
-       <string>blender player icon.icns</string>\r
-\r
-       <key>CFBundleName</key>\r
-       <string>BlenderPlayer</string>\r
-       <key>CFBundleIdentifier</key>\r
-       <string>org.blenderfoundation.blenderplayer</string>\r
-\r
-       <key>CFBundleVersion</key>\r
-       <string>${MACOSX_BUNDLE_LONG_VERSION_STRING}, Blender Foundation</string>\r
-       <key>CFBundleShortVersionString</key>\r
-       <string>${MACOSX_BUNDLE_SHORT_VERSION_STRING}</string>\r
-       <key>CFBundleGetInfoString</key>\r
-       <string>${MACOSX_BUNDLE_LONG_VERSION_STRING}, Blender Foundation</string>\r
-\r
-       <key>CFBundleDocumentTypes</key>\r
-       <array>\r
-               <dict>\r
-                       <key>CFBundleTypeIconFile</key>\r
-                       <string>blender file icon.icns</string>\r
-                       <key>CFBundleTypeName</key>\r
-                       <string>Blender File</string>\r
-                       <key>CFBundleTypeOSTypes</key>\r
-                       <array>\r
-                               <string>BLND</string>\r
-                       </array>\r
-                       <key>CFBundleTypeExtensions</key>\r
-                       <array>\r
-                               <string>blend</string>\r
-                       </array>\r
-                       <key>CFBundleTypeRole</key>\r
-                       <string>Viewer</string>\r
-                       <key>LSIsAppleDefaultForType</key>\r
-                       <false/>\r
-               </dict>\r
-       </array>\r
-</dict>\r
-</plist>\r
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist SYSTEM "file://localhost/System/Library/DTDs/PropertyList.dtd">
+<plist version="0.9">
+<dict>
+       <key>CFBundleInfoDictionaryVersion</key>
+       <string>6.0</string>
+
+       <key>CFBundleExecutable</key>
+       <string>blenderplayer</string>
+
+       <key>CFBundlePackageType</key>
+       <string>APPL</string>
+       <key>CFBundleSignature</key>
+       <string>????</string>
+
+       <key>CFBundleIconFile</key>
+       <string>blender player icon.icns</string>
+
+       <key>CFBundleName</key>
+       <string>BlenderPlayer</string>
+       <key>CFBundleIdentifier</key>
+       <string>org.blenderfoundation.blenderplayer</string>
+
+       <key>CFBundleVersion</key>
+       <string>${MACOSX_BUNDLE_LONG_VERSION_STRING}, Blender Foundation</string>
+       <key>CFBundleShortVersionString</key>
+       <string>${MACOSX_BUNDLE_SHORT_VERSION_STRING}</string>
+       <key>CFBundleGetInfoString</key>
+       <string>${MACOSX_BUNDLE_LONG_VERSION_STRING}, Blender Foundation</string>
+
+       <key>CFBundleDocumentTypes</key>
+       <array>
+               <dict>
+                       <key>CFBundleTypeIconFile</key>
+                       <string>blender file icon.icns</string>
+                       <key>CFBundleTypeName</key>
+                       <string>Blender File</string>
+                       <key>CFBundleTypeOSTypes</key>
+                       <array>
+                               <string>BLND</string>
+                       </array>
+                       <key>CFBundleTypeExtensions</key>
+                       <array>
+                               <string>blend</string>
+                       </array>
+                       <key>CFBundleTypeRole</key>
+                       <string>Viewer</string>
+                       <key>LSIsAppleDefaultForType</key>
+                       <false/>
+               </dict>
+       </array>
+</dict>
+</plist>
index bc13bf4c5868a0cfe8a02ecc891d374dcd5ab638..a43d11b21a0d06799c6e74db67e84ebd755cacc2 100644 (file)
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>\r
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">\r
-  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">\r
-    <security>\r
-      <requestedPrivileges>\r
-        <requestedExecutionLevel level="asInvoker" uiAccess="false"></requestedExecutionLevel>\r
-      </requestedPrivileges>\r
-    </security>\r
-  </trustInfo>\r
-</assembly>\r
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
+    <security>
+      <requestedPrivileges>
+        <requestedExecutionLevel level="asInvoker" uiAccess="false"></requestedExecutionLevel>
+      </requestedPrivileges>
+    </security>
+  </trustInfo>
+</assembly>