Made a dependency so that the MSVC intern project file will actually call the

batch file that freezes the Blender Python code.
I had to add a dummy.cpp file to the freeze directory to make MSVC
understand it should call the batch file in a post build step. If someone else
has a better idea, feel free to change it!
Maarten

3 files changed, 90 insertions, 28 deletions

diff --git a/intern/make/msvc_6_0/build_install_all.dsp b/intern/make/msvc_6_0/build_install_all.dsp
index 29af2d3fb91..911694e8fef 100644
--- a/intern/make/msvc_6_0/build_install_all.dsp
+++ b/intern/make/msvc_6_0/build_install_all.dsp
@@ -52,6 +52,11 @@ MTL=midl.exe
 # PROP Output_Dir "Debug"
 # PROP Intermediate_Dir "Debug"
 # PROP Target_Dir ""
+# Begin Special Build Tool
+SOURCE="$(InputPath)"
+PostBuild_Desc=Python freeze
+PostBuild_Cmds=ECHO Freezing Blender Python code	..\..\python\freeze\freeze.bat
+# End Special Build Tool
 
 !ENDIF 
 
diff --git a/intern/python/freeze/dummy.cpp b/intern/python/freeze/dummy.cpp
new file mode 100644
index 00000000000..26d8dc08a18
--- /dev/null
+++ b/intern/python/freeze/dummy.cpp
@@ -0,0 +1,44 @@
+/**
+ * $Id$
+ * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version. The Blender
+ * Foundation also sells licenses for use in proprietary software under
+ * the Blender License.  See http://www.blender.org/BL/ for information
+ * about this.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ *
+ * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
+ * All rights reserved.
+ *
+ * The Original Code is: all of this file.
+ *
+ * Contributor(s): none yet.
+ *
+ * ***** END GPL/BL DUAL LICENSE BLOCK *****
+ */
+
+/**
+ * @file	dummy.cpp
+ * This file is only used in the MSVC project to create a dependency so that
+ * freeze.bat gets called. The batch file will call python to freeze the 
+ * Blender Python code.
+ * 
+ * @author	Maarten Gribnau
+ * @date	November 11, 2002
+ */
+
+void main(void)
+{
+}
\ No newline at end of file
diff --git a/intern/python/freeze/python_freeze.dsp b/intern/python/freeze/python_freeze.dsp
index 7a7ff8b3400..ba065113544 100644
--- a/intern/python/freeze/python_freeze.dsp
+++ b/intern/python/freeze/python_freeze.dsp
@@ -2,7 +2,7 @@
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 
-# TARGTYPE "Win32 (x86) External Target" 0x0106
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
 
 CFG=python_freeze - Win32 Debug
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
@@ -17,14 +17,16 @@ CFG=python_freeze - Win32 Debug
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "python_freeze - Win32 Release" (based on "Win32 (x86) External Target")
-!MESSAGE "python_freeze - Win32 Debug" (based on "Win32 (x86) External Target")
+!MESSAGE "python_freeze - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "python_freeze - 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)" == "python_freeze - Win32 Release"
 
@@ -32,20 +34,22 @@ CFG=python_freeze - Win32 Debug
 # PROP BASE Use_Debug_Libraries 0
 # PROP BASE Output_Dir "Release"
 # PROP BASE Intermediate_Dir "Release"
-# PROP BASE Cmd_Line "NMAKE /f python_freeze.mak"
-# PROP BASE Rebuild_Opt "/a"
-# PROP BASE Target_File "python_freeze.exe"
-# PROP BASE Bsc_Name "python_freeze.bsc"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
 # PROP Output_Dir "Release"
 # PROP Intermediate_Dir "Release"
-# PROP Cmd_Line "nmake /f "python_freeze.mak""
-# PROP Rebuild_Opt "/a"
-# PROP Target_File "python_freeze.exe"
-# PROP Bsc_Name ""
 # PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /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 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
 
 !ELSEIF  "$(CFG)" == "python_freeze - Win32 Debug"
 
@@ -53,20 +57,28 @@ CFG=python_freeze - Win32 Debug
 # PROP BASE Use_Debug_Libraries 1
 # PROP BASE Output_Dir "Debug"
 # PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Cmd_Line "NMAKE /f python_freeze.mak"
-# PROP BASE Rebuild_Opt "/a"
-# PROP BASE Target_File "python_freeze.exe"
-# PROP BASE Bsc_Name "python_freeze.bsc"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Cmd_Line "freeze.bat"
-# PROP Rebuild_Opt ""
-# PROP Target_File "..\..\..\source\blender\bpython\frozen\M_vrml__scenegraph.c"
-# PROP Bsc_Name ""
+# PROP Output_Dir "..\..\..\..\obj\windows\intern\python\python_freeze\debug"
+# PROP Intermediate_Dir "..\..\..\..\obj\windows\intern\python\python_freeze\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 /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /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 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
+# Begin Special Build Tool
+SOURCE="$(InputPath)"
+PostBuild_Desc=Freezing Blender Python
+PostBuild_Cmds=freeze.bat
+# End Special Build Tool
 
 !ENDIF 
 
@@ -74,16 +86,17 @@ CFG=python_freeze - Win32 Debug
 
 # Name "python_freeze - Win32 Release"
 # Name "python_freeze - Win32 Debug"
-
-!IF  "$(CFG)" == "python_freeze - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "python_freeze - Win32 Debug"
-
-!ENDIF 
-
 # Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=.\dummy.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\freeze.bat
+# End Source File
 # End Group
 # Begin Group "Header Files"