diff options
author | Simon Clitherow <aphex@nildram.co.uk> | 2004-02-11 21:36:48 +0300 |
---|---|---|
committer | Simon Clitherow <aphex@nildram.co.uk> | 2004-02-11 21:36:48 +0300 |
commit | c205e7d1c74b64da3889c155623b53f9e68f5e64 (patch) | |
tree | 62a3aab197b454dd2e46f4c7ec0088541cbfd86d | |
parent | 12966aed05460bcf513f9599ee01211619a6d40f (diff) |
- Added csg.dsp to the main intern workspace (intern.dsw)
- Fixed up the paths for "/lib/..." in csg.dsp
Quick note: Currently intern still builds the old lib (bsplib).
To compile the new lib (when everything is ready for it), uncheck
bsplib from the dependancies in build_install_all and replace with csg.
Will eventually drop bsplib completely - but not just yet :)
-rw-r--r-- | intern/csg/make/msvc60/csg.dsp | 12 | ||||
-rw-r--r-- | intern/make/msvc_6_0/intern.dsw | 18 |
2 files changed, 21 insertions, 9 deletions
diff --git a/intern/csg/make/msvc60/csg.dsp b/intern/csg/make/msvc60/csg.dsp index 39c3895fb00..033a47228e6 100644 --- a/intern/csg/make/msvc60/csg.dsp +++ b/intern/csg/make/msvc60/csg.dsp @@ -40,9 +40,9 @@ RSC=rc.exe # PROP Output_Dir "..\..\..\..\obj\windows\intern\bsp\" # PROP Intermediate_Dir "..\..\..\..\obj\windows\intern\bsp\" # PROP Target_Dir "" +LINK32=link.exe -lib # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c -# ADD CPP /nologo /G6 /MT /W3 /GX /Oy- /Ob0 /I "../../intern/blender" /I "../../extern" /I "../../intern" /I "../../../../lib/windows/memutil/include" /I "../.." /I "../../../../lib/windows/moto/include" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /FD /c -# SUBTRACT CPP /Ox /Ot /Og /YX +# ADD CPP /nologo /G6 /MT /W3 /GX /I "../../intern/blender" /I "../../extern" /I "../../intern" /I "../../../../../lib/windows/memutil/include" /I "../.." /I "../../../../../lib/windows/moto/include" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /FD /c # ADD BASE RSC /l 0x413 /d "NDEBUG" # ADD RSC /l 0x413 /d "NDEBUG" BSC32=bscmake.exe @@ -53,7 +53,7 @@ LIB32=link.exe -lib # ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\intern\bsp\libbsp.lib" # Begin Special Build Tool SOURCE="$(InputPath)" -PostBuild_Cmds=ECHO Copying header files XCOPY /E /Y ..\..\extern\*.h ..\..\..\..\lib\windows\bsp\include\ ECHO Copying lib XCOPY /E /Y ..\..\..\..\obj\windows\intern\bsp\*.lib ..\..\..\..\lib\windows\bsp\lib\*.a ECHO Done +PostBuild_Cmds=ECHO Copying header files XCOPY /E /Y ..\..\extern\*.h ..\..\..\..\..\lib\windows\bsp\include\ ECHO Copying lib XCOPY /E /Y ..\..\..\..\obj\windows\intern\bsp\*.lib ..\..\..\..\lib\windows\bsp\lib\*.a ECHO Done # End Special Build Tool !ELSEIF "$(CFG)" == "csg - Win32 Debug" @@ -68,9 +68,9 @@ PostBuild_Cmds=ECHO Copying header files XCOPY /E /Y ..\..\extern\*.h ..\..\..\. # PROP Output_Dir "..\..\..\..\obj\windows\intern\bsp\debug\" # PROP Intermediate_Dir "..\..\..\..\obj\windows\intern\bsp\debug\" # PROP Target_Dir "" +LINK32=link.exe -lib # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../../intern/blender" /I "../../extern" /I "../../intern" /I "../../../../lib/windows/memutil/include" /I "../.." /I "../../../../lib/windows/moto/include" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /FD /GZ /c -# SUBTRACT CPP /X /YX +# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../../intern/blender" /I "../../extern" /I "../../intern" /I "../../../../../lib/windows/memutil/include" /I "../.." /I "../../../../../lib/windows/moto/include" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /FD /GZ /c # ADD BASE RSC /l 0x413 /d "_DEBUG" # ADD RSC /l 0x413 /d "_DEBUG" BSC32=bscmake.exe @@ -81,7 +81,7 @@ LIB32=link.exe -lib # ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\intern\bsp\debug\libbsp.lib" # Begin Special Build Tool SOURCE="$(InputPath)" -PostBuild_Cmds=ECHO Copying header files XCOPY /E /Y ..\..\extern\*.h ..\..\..\..\lib\windows\bsp\include\ ECHO Copying lib XCOPY /E /Y ..\..\..\..\obj\windows\intern\bsp\debug\*.lib ..\..\..\..\lib\windows\bsp\lib\debug\*.a ECHO Copying Debug info. XCOPY /E /Y ..\..\..\..\obj\windows\intern\bsp\debug\vc60.* ..\..\..\..\lib\windows\bsp\lib\debug\ ECHO Done +PostBuild_Cmds=ECHO Copying header files XCOPY /E /Y ..\..\extern\*.h ..\..\..\..\..\lib\windows\bsp\include\ ECHO Copying lib XCOPY /E /Y ..\..\..\..\obj\windows\intern\bsp\debug\*.lib ..\..\..\..\..\lib\windows\bsp\lib\debug\*.a ECHO Copying Debug info. XCOPY /E /Y ..\..\..\..\obj\windows\intern\bsp\debug\vc60.* ..\..\..\..\..\lib\windows\bsp\lib\debug\ ECHO Done # End Special Build Tool !ENDIF diff --git a/intern/make/msvc_6_0/intern.dsw b/intern/make/msvc_6_0/intern.dsw index 2058d99555a..7b0591e83d4 100644 --- a/intern/make/msvc_6_0/intern.dsw +++ b/intern/make/msvc_6_0/intern.dsw @@ -93,9 +93,6 @@ Package=<5> Package=<4> {{{ Begin Project Dependency - Project_Dep_Name bsplib - End Project Dependency - Begin Project Dependency Project_Dep_Name container End Project Dependency Begin Project Dependency @@ -131,6 +128,9 @@ Package=<4> Begin Project Dependency Project_Dep_Name OpenALSoundSystem End Project Dependency + Begin Project Dependency + Project_Dep_Name csg + End Project Dependency }}} ############################################################################### @@ -147,6 +147,18 @@ Package=<4> ############################################################################### +Project: "csg"="..\..\csg\make\msvc60\csg.dsp" - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + Project: "decimation"="..\..\decimation\make\msvc_6_0\decimation.dsp" - Package Owner=<4> Package=<5> |