Hello,

*Fixed boolean buglet in the bsp lib. I have not committed any libraries so you'll
have to do this to see the changes in blender.
*Got the bsp test program working again with the new GHOST createWindow
interface.
*(Visual C++) Modfied some of the dsp in the intern library to NOT prompt when
overwirting old libs and header files. This is the /Y option after XCOPY
Cheers
Laurence.

diff --git a/intern/bmfont/make/msvc_6_0/bmfont.dsp b/intern/bmfont/make/msvc_6_0/bmfont.dsp
index 38897dca84f70bd310084618b10b31aa3518e47b..9780334144f968f8f90e146190ace5574cc1ae28 100644 (file)
--- a/intern/bmfont/make/msvc_6_0/bmfont.dsp
+++ b/intern/bmfont/make/msvc_6_0/bmfont.dsp
@@ -54,7 +54,7 @@ LIB32=link.exe -lib
 # Begin Special Build Tool
 SOURCE="$(InputPath)"
 PostBuild_Desc=Copying BMFONT files library (release target) to lib tree.
-PostBuild_Cmds=ECHO Copying header files       XCOPY /E ..\..\*.h ..\..\..\..\lib\windows\bmfont\include\      ECHO Copying lib        XCOPY /E ..\..\..\..\obj\windows\intern\bmfont\*.lib ..\..\..\..\lib\windows\bmfont\lib\*.a     ECHO Done
+PostBuild_Cmds=ECHO Copying header files       XCOPY /E /Y ..\..\*.h ..\..\..\..\lib\windows\bmfont\include\   ECHO Copying lib        XCOPY /E /Y ..\..\..\..\obj\windows\intern\bmfont\*.lib ..\..\..\..\lib\windows\bmfont\lib\*.a  ECHO Done
 # End Special Build Tool
 
 !ELSEIF  "$(CFG)" == "bmfont - Win32 Debug"

diff --git a/intern/bsp/intern/BSP_CSGUserData.cpp b/intern/bsp/intern/BSP_CSGUserData.cpp
index a22f88f2f24367540c7c6f4959dc1eb1db5ac871..fec5ff560e6a47306a4d850fbb1b141819777f29 100755 (executable)
--- a/intern/bsp/intern/BSP_CSGUserData.cpp
+++ b/intern/bsp/intern/BSP_CSGUserData.cpp
@@ -66,7 +66,7 @@ Duplicate(
                int output = Size();
                IncSize();
 
-               memcpy(&m_data[ m_data.size() - 1 - m_width ], record, m_width);
+               memcpy(&m_data[ m_data.size() - m_width ], record, m_width);
        
                return output;
        }
@@ -80,7 +80,7 @@ Duplicate(
 ){
        if (m_width) {
                IncSize();
-               memcpy(&m_data[ m_data.size() - 1 - m_width ], 
+               memcpy(&m_data[ m_data.size() - m_width ], 
                        &m_data[ record_index * m_width], m_width);
        }
 }      

diff --git a/intern/bsp/make/msvc6_0/bsplib.dsp b/intern/bsp/make/msvc6_0/bsplib.dsp
index 2ec59bd75338008efb7e059796ab6ff44bce9439..624879414f1986cb11457bdfb8046750bcfe10f2 100644 (file)
--- a/intern/bsp/make/msvc6_0/bsplib.dsp
+++ b/intern/bsp/make/msvc6_0/bsplib.dsp
@@ -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 ..\..\extern\*.h ..\..\..\..\lib\windows\bsp\include\  ECHO Copying lib        XCOPY /E ..\..\..\..\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)" == "bsplib - Win32 Debug"
@@ -82,7 +82,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 ..\..\extern\*.h ..\..\..\..\lib\windows\bsp\include\  ECHO Copying lib        XCOPY /E ..\..\..\..\obj\windows\intern\bsp\debug\*.lib ..\..\..\..\lib\windows\bsp\lib\debug\*.a       ECHO Copying Debug info.        XCOPY /E ..\..\..\..\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/bsp/test/BSP_GhostTest/BSP_GhostTest.dsp b/intern/bsp/test/BSP_GhostTest/BSP_GhostTest.dsp
index 1e9132898241d45d66dad896154f679a5d7974d9..aaa4527384505d77ff431a20ed6b54d7690f9170 100755 (executable)
--- a/intern/bsp/test/BSP_GhostTest/BSP_GhostTest.dsp
+++ b/intern/bsp/test/BSP_GhostTest/BSP_GhostTest.dsp
@@ -108,10 +108,6 @@ SOURCE=.\BSP_PlyLoader.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\BSP_TMesh.cpp
-# End Source File
-# Begin Source File
-
 SOURCE=.\BSP_TMesh.h
 # End Source File
 # Begin Source File

diff --git a/intern/bsp/test/BSP_GhostTest/BSP_GhostTest3D.cpp b/intern/bsp/test/BSP_GhostTest/BSP_GhostTest3D.cpp
index 5d8410462be2ff446c2c1ca39225f981f15d3d12..fe6a2943d1e249b0724d223be46b9ef370531f6d 100755 (executable)
--- a/intern/bsp/test/BSP_GhostTest/BSP_GhostTest3D.cpp
+++ b/intern/bsp/test/BSP_GhostTest/BSP_GhostTest3D.cpp
@@ -64,6 +64,17 @@
 
 #include <iostream>
 
+       int 
+EmptyInterpFunc(
+       void *d1, 
+       void * d2, 
+       void *dnew, 
+       float epsilon
+){
+       return 0;
+}
+
+
 
 using namespace std;
 
@@ -125,10 +136,6 @@ Swap(
 }
 
 
-
-
-
-
        MT_Transform
 BSP_GhostTestApp3D::
 GetTransform(
@@ -174,25 +181,29 @@ Operate(
        // describe properties.
 
        CSG_MeshPropertyDescriptor props;
-       props.mesh_property_flags = 0;
+       props.user_face_vertex_data_size = 0;
        props.user_data_size = 0;
 
        CSG_BooleanOperation * op =  CSG_NewBooleanFunction();
        props = CSG_DescibeOperands(op,props,props);
 
-       CSG_PerformBooleanOperation(op,CSG_OperationType(type),
-               *fA,*vA,*fB,*vB
+       CSG_PerformBooleanOperation(
+               op,CSG_OperationType(type),
+               *fA,*vA,*fB,*vB,EmptyInterpFunc
        );
 
-       CSG_FaceIteratorDescriptor * out_f = CSG_OutputFaceDescriptor(op);
-       CSG_VertexIteratorDescriptor * out_v = CSG_OutputVertexDescriptor(op);
+       CSG_FaceIteratorDescriptor out_f;
+       CSG_OutputFaceDescriptor(op,&out_f);
+
+       CSG_VertexIteratorDescriptor out_v;
+       CSG_OutputVertexDescriptor(op,&out_v);
 
-       MEM_SmartPtr<BSP_TMesh> new_mesh (BuildMesh(props,*out_f,*out_v));
+       MEM_SmartPtr<BSP_TMesh> new_mesh (BuildMesh(props,out_f,out_v));
 
        // free stuff
 
-       CSG_FreeVertexDescriptor(out_v);
-       CSG_FreeFaceDescriptor(out_f);
+       CSG_FreeVertexDescriptor(&out_v);
+       CSG_FreeFaceDescriptor(&out_f);
        CSG_FreeBooleanOperation(op);
 
        op = NULL;
@@ -255,8 +266,8 @@ InitApp(
        
        m_window = m_system->createWindow(
                "GHOST crud3D!",
-               100,100,640,480,GHOST_kWindowStateNormal,
-               GHOST_kDrawingContextTypeOpenGL
+               100,100,512,512,GHOST_kWindowStateNormal,
+               GHOST_kDrawingContextTypeOpenGL,false
        );
 
        if (
@@ -312,7 +323,8 @@ processEvent(
                {
                        int x,y;
                        m_system->getCursorPosition(x,y);
-       
+
+
                        int wx,wy;
                        m_window->screenToClient(x,y,wx,wy);
 
@@ -346,7 +358,8 @@ processEvent(
                                m_rotation_settings[m_current_object].m_moving = false;
                                m_rotation_settings[m_current_object].x_old = 0;
                                m_rotation_settings[m_current_object].y_old = 0;
-                       } else 
+
+               } else 
                        if (button == GHOST_kButtonMaskRight) {
                                m_translation_settings[m_current_object].m_moving = false;
                                m_translation_settings[m_current_object].x_old;
@@ -383,9 +396,10 @@ processEvent(
                                GHOST_Rect bounds;
                                m_window->getClientBounds(bounds);
 
-                               int w_h = bounds.getWidth();
+                               int w_h = bounds.getHeight();
 
                                y = w_h - wy;
+                               x = wx;
 
                                double mvmatrix[16];
                                double projmatrix[16];
@@ -402,16 +416,9 @@ processEvent(
 
                                GLdouble ex,ey,ez;
 
-                               MT_Vector3 bbox_min, bbox_max;
-                               
-                               bbox_min = m_meshes[0]->m_min;
-                               bbox_max = m_meshes[0]->m_max;
-
-                               MT_Vector3 bbox_centre = (bbox_min + bbox_max)/2;
-
-                               ex = bbox_centre.x();
-                               ey = bbox_centre.y();
-                               ez = bbox_centre.z();
+                               ex = m_translation_settings[m_current_object].m_t_x;
+                               ey = m_translation_settings[m_current_object].m_t_y;
+                               ez = m_translation_settings[m_current_object].m_t_z;
 
                                gluProject(ex, ey, ez, mvmatrix, projmatrix, viewport, &px, &py, &sz);
                                gluUnProject((GLdouble) x, (GLdouble) y, sz, mvmatrix, projmatrix, viewport, &px, &py, &pz);
@@ -475,24 +482,19 @@ processEvent(
                                }
 
                                case GHOST_kKeyR:
-
                                        m_render_modes[m_current_object]++;
-
                                        if (m_render_modes[m_current_object] > e_last_render_mode) {
                                                m_render_modes[m_current_object] = e_first_render_mode;
                                        }
-
                                        handled = true;
                                        m_window->invalidate();
                                        break;                                  
 
-
-
                                case GHOST_kKeyB:
                                        handled = true;
                                        m_window->invalidate();
                                        break;                                  
-       
+
                                case GHOST_kKeyQ:
                                        m_finish_me_off = true;
                                        handled = true;
@@ -503,20 +505,19 @@ processEvent(
                                        m_window->invalidate();
                                        handled = true;
                                        break;
-                       
+
                                case GHOST_kKeySpace:
-                                               
+
                                        // increment the current object only if the object is not being
                                        // manipulated.
                                        if (! (m_rotation_settings[m_current_object].m_moving || m_translation_settings[m_current_object].m_moving)) {
                                                m_current_object ++;
                                                if (m_current_object >= m_meshes.size()) {
                                                        m_current_object = 0;
+
                                                }
                                        }
                                        m_window->invalidate();
-                                       
-
                                        handled = true;
                                        break;
                                default :
@@ -527,9 +528,7 @@ processEvent(
                default :
                        break;
        }
-
        return handled;
-       
 };
 
 BSP_GhostTestApp3D::
@@ -543,37 +542,34 @@ BSP_GhostTestApp3D::
                m_system = NULL;
        }
 };
+
        
+
        void
 BSP_GhostTestApp3D::
 DrawPolies(
 ){
-       glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
 
+       glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
        for (int i = 0; i < m_meshes.size(); ++i) {
-
                MT_Transform trans = GetTransform(i);
 
                float opengl_mat[16];
                trans.getValue(opengl_mat);
 
-               opengl_mat[14] -= 30;
-                       
                glPushMatrix();
-               glLoadMatrixf(opengl_mat);
-
+               glMultMatrixf(opengl_mat);
                MT_Vector3 color(1.0,1.0,1.0);
-
                if (i == m_current_object) {
                        color = MT_Vector3(1.0,0,0);
                }
-       
                BSP_MeshDrawer::DrawMesh(m_meshes[i].Ref(),m_render_modes[i]);
 
                glPopMatrix();  
        }
 
        m_window->swapBuffers();
+
 }
 
        void
@@ -590,28 +586,30 @@ InitOpenGl(
        GLfloat light_position1[] = {1.0, 0, 0, 0.0};  /* Infinite light location. */
 
        /* Enable a single OpenGL light. */
+
        glLightfv(GL_LIGHT0, GL_DIFFUSE, light_diffuse0);
        glLightfv(GL_LIGHT0, GL_POSITION, light_position0);
 
        glLightfv(GL_LIGHT1, GL_DIFFUSE, light_diffuse1);
        glLightfv(GL_LIGHT1, GL_POSITION, light_position1);
 
-         glEnable(GL_LIGHT0);
-         glEnable(GL_LIGHT1);
-         glEnable(GL_LIGHTING);
 
-       // make sure there is no back face culling.
-//     glDisable(GL_CULL_FACE);
+       glEnable(GL_LIGHT0);
+       glEnable(GL_LIGHT1);
+       glEnable(GL_LIGHTING);
 
+       // make sure there is no back face culling.
+       //      glDisable(GL_CULL_FACE);
 
        // use two sided lighting model
-       
-        glLightModeli(GL_LIGHT_MODEL_TWO_SIDE,GL_TRUE);
+       glLightModeli(GL_LIGHT_MODEL_TWO_SIDE,GL_TRUE);
 
        /* Use depth buffering for hidden surface elimination. */
+
        glEnable(GL_DEPTH_TEST);
 
        /* Setup the view of the cube. */
+
        glMatrixMode(GL_PROJECTION);
 
        // centre of the box + 3* depth of box
@@ -633,7 +631,8 @@ InitOpenGl(
        gluLookAt(
                centre.x(), centre.y(), centre.z() + distance*depth, //eye  
                centre.x(), centre.y(), centre.z(), //centre      
-               0.0, 1.0, 0.);      /* up is in positive Y direction */
+               0.0, 1.0, 0.
+       );      /* up is in positive Y direction */
 
 }      
 

diff --git a/intern/bsp/test/BSP_GhostTest/BSP_TMesh.h b/intern/bsp/test/BSP_GhostTest/BSP_TMesh.h
index 4322fedbed47bf93ca9f6259b3c1169dd9e5355e..eeb4df3d0d98b525c5406503c46b5ab3f41b2619 100755 (executable)
--- a/intern/bsp/test/BSP_GhostTest/BSP_TMesh.h
+++ b/intern/bsp/test/BSP_GhostTest/BSP_TMesh.h
@@ -80,12 +80,35 @@ public :
        AddFace(
                int *verts,
                int num_verts
-       );
+       ){
+               int i;
+               for (i= 2; i <num_verts; i++) {
+                       BSP_TFace f;
+                       f.m_verts[0] = verts[0];
+                       f.m_verts[1] = verts[i-1];
+                       f.m_verts[2] = verts[i];
+
+                       m_faces.push_back(f);
+
+                       BuildNormal(m_faces.back());            
+               }
+       }
 
                void
        BuildNormal(
                BSP_TFace & f
-       ) const ;
+       ) const {
+               MT_Vector3 l1 = 
+                       m_verts[f.m_verts[1]].m_pos - 
+                       m_verts[f.m_verts[0]].m_pos;
+               MT_Vector3 l2 = 
+                       m_verts[f.m_verts[2]].m_pos - 
+                       m_verts[f.m_verts[1]].m_pos;
+
+               MT_Vector3 normal = l1.cross(l2);
+               
+               f.m_normal = normal.safe_normalized();
+       }
                
 };
 
@@ -157,6 +180,17 @@ VertexIt_Step(
        ++(vertex_it->pos);
 };
 
+static
+       void
+VertexIt_Reset(
+       CSG_IteratorPtr it
+) {
+       // assume CSG_IteratorPtr is of the correct type.
+       VertexIt * vertex_it = (VertexIt *)it;
+
+       vertex_it->pos = vertex_it->mesh->VertexSet().begin();
+};
+
 static
        CSG_VertexIteratorDescriptor * 
 VertexIt_Construct(
@@ -170,6 +204,7 @@ VertexIt_Construct(
        output->Done = VertexIt_Done;
        output->Fill = VertexIt_Fill;
        output->Step = VertexIt_Step;
+       output->Reset = VertexIt_Reset;
        output->num_elements = mesh->VertexSet().size();
        
        VertexIt * v_it = new VertexIt;
@@ -244,6 +279,17 @@ FaceIt_Step(
        face_it->pos ++;
 };
 
+static
+       void
+FaceIt_Reset(
+       CSG_IteratorPtr it
+) {
+       // assume CSG_IteratorPtr is of the correct type.
+       FaceIt * face_it = (FaceIt *)it;                
+
+       face_it->pos = face_it->mesh->FaceSet().begin();
+};
+
 static
        CSG_FaceIteratorDescriptor * 
 FaceIt_Construct(
@@ -255,6 +301,7 @@ FaceIt_Construct(
        output->Done = FaceIt_Done;
        output->Fill = FaceIt_Fill;
        output->Step = FaceIt_Step;
+       output->Reset = FaceIt_Reset;
 
        output->num_elements = mesh->FaceSet().size();
        

diff --git a/intern/container/make/msvc_6_0/container.dsp b/intern/container/make/msvc_6_0/container.dsp
index aaf45b141de28574247fcffc6abf716c982f7b53..1de5f94c741abfac1fb6fedbf9f949e58ddc2aa5 100644 (file)
--- a/intern/container/make/msvc_6_0/container.dsp
+++ b/intern/container/make/msvc_6_0/container.dsp
@@ -53,7 +53,7 @@ LIB32=link.exe -lib
 # ADD LIB32 /nologo /out:"../../../../obj/windows/intern/container/libcontainer.lib"
 # Begin Special Build Tool
 SOURCE="$(InputPath)"
-PostBuild_Cmds=ECHO Copying header files       XCOPY /E ..\..\*.h ..\..\..\..\lib\windows\container\include\   ECHO Copying lib        XCOPY /E ..\..\..\..\obj\windows\intern\container\*.lib ..\..\..\..\lib\windows\container\lib\*.a       ECHO Done
+PostBuild_Cmds=ECHO Copying header files       XCOPY /E /Y ..\..\*.h ..\..\..\..\lib\windows\container\include\        ECHO Copying lib        XCOPY /E /Y ..\..\..\..\obj\windows\intern\container\*.lib ..\..\..\..\lib\windows\container\lib\*.a    ECHO Done
 # End Special Build Tool
 
 !ELSEIF  "$(CFG)" == "container - Win32 Debug"
@@ -81,7 +81,7 @@ LIB32=link.exe -lib
 # ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\intern\container\debug\libcontainer.lib"
 # Begin Special Build Tool
 SOURCE="$(InputPath)"
-PostBuild_Cmds=ECHO Copying header files       XCOPY /E ..\..\*.h ..\..\..\..\lib\windows\container\include\   ECHO Copying lib        XCOPY /E ..\..\..\..\obj\windows\intern\container\debug\*.lib ..\..\..\..\lib\windows\container\lib\debug\*.a   ECHO Copying Debug info.        XCOPY /E ..\..\..\..\obj\windows\intern\container\debug\vc60.* ..\..\..\..\lib\windows\container\lib\debug\     ECHO Done
+PostBuild_Cmds=ECHO Copying header files       XCOPY /E /Y ..\..\*.h ..\..\..\..\lib\windows\container\include\        ECHO Copying lib        XCOPY /E /Y ..\..\..\..\obj\windows\intern\container\debug\*.lib ..\..\..\..\lib\windows\container\lib\debug\*.a        ECHO Copying Debug info.        XCOPY /E /Y ..\..\..\..\obj\windows\intern\container\debug\vc60.* ..\..\..\..\lib\windows\container\lib\debug\  ECHO Done
 # End Special Build Tool
 
 !ENDIF 

diff --git a/intern/decimation/make/msvc_6_0/decimation.dsp b/intern/decimation/make/msvc_6_0/decimation.dsp
index 2e261d38c26cff24738aaf48467740494a829102..8c6e228f9ed4c4d50e2456a28450775815a732c7 100644 (file)
--- a/intern/decimation/make/msvc_6_0/decimation.dsp
+++ b/intern/decimation/make/msvc_6_0/decimation.dsp
@@ -54,7 +54,7 @@ LIB32=link.exe -lib
 # ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\intern\decimation\libdecimation.lib"
 # Begin Special Build Tool
 SOURCE="$(InputPath)"
-PostBuild_Cmds=ECHO Copying header files       XCOPY /E ..\..\extern\*.h ..\..\..\..\lib\windows\decimation\include\   ECHO Copying lib        XCOPY /E ..\..\..\..\obj\windows\intern\decimation\*.lib ..\..\..\..\lib\windows\decimation\lib\*.a     ECHO Done
+PostBuild_Cmds=ECHO Copying header files       XCOPY /E /Y..\..\extern\*.h ..\..\..\..\lib\windows\decimation\include\ ECHO Copying lib        XCOPY /E /Y ..\..\..\..\obj\windows\intern\decimation\*.lib ..\..\..\..\lib\windows\decimation\lib\*.a  ECHO Done
 # End Special Build Tool
 
 !ELSEIF  "$(CFG)" == "decimation - Win32 Debug"

diff --git a/intern/ghost/make/msvc/ghost.dsp b/intern/ghost/make/msvc/ghost.dsp
index 55c5f71b2c178b9ac7a1eac490a3f739c23ed09a..2d39584cf585de58dfca07718ab25f917205b4a4 100644 (file)
--- a/intern/ghost/make/msvc/ghost.dsp
+++ b/intern/ghost/make/msvc/ghost.dsp
@@ -54,7 +54,7 @@ LIB32=link.exe -lib
 # Begin Special Build Tool
 SOURCE="$(InputPath)"
 PostBuild_Desc=Copying GHOST files library (release target) to lib tree.
-PostBuild_Cmds=ECHO Copying header files       XCOPY /E ..\..\*.h ..\..\..\..\lib\windows\ghost\include\       ECHO Copying lib        XCOPY /E ..\..\..\..\obj\windows\intern\ghost\*.lib ..\..\..\..\lib\windows\ghost\lib\*.a       ECHO Done
+PostBuild_Cmds=ECHO Copying header files       XCOPY /E /Y ..\..\*.h ..\..\..\..\lib\windows\ghost\include\    ECHO Copying lib        XCOPY /E /Y ..\..\..\..\obj\windows\intern\ghost\*.lib ..\..\..\..\lib\windows\ghost\lib\*.a    ECHO Done
 # End Special Build Tool
 
 !ELSEIF  "$(CFG)" == "ghost - Win32 Debug"
@@ -83,7 +83,7 @@ LIB32=link.exe -lib
 # Begin Special Build Tool
 SOURCE="$(InputPath)"
 PostBuild_Desc=Copying GHOST files library (debug target) to lib tree.
-PostBuild_Cmds=ECHO Copying header files       XCOPY /E ..\..\*.h ..\..\..\..\lib\windows\ghost\include\       ECHO Copying lib        XCOPY /E ..\..\..\..\obj\windows\intern\ghost\debug\*.lib ..\..\..\..\lib\windows\ghost\lib\debug\*.a   ECHO Done
+PostBuild_Cmds=ECHO Copying header files       XCOPY /E /Y ..\..\*.h ..\..\..\..\lib\windows\ghost\include\    ECHO Copying lib        XCOPY /E /Y ..\..\..\..\obj\windows\intern\ghost\debug\*.lib ..\..\..\..\lib\windows\ghost\lib\debug\*.a        ECHO Done
 # End Special Build Tool
 
 !ENDIF 

diff --git a/intern/guardedalloc/make/msvc_6_0/guardedalloc.dsp b/intern/guardedalloc/make/msvc_6_0/guardedalloc.dsp
index f5e5254546b700352cb2cc2f147727844f213271..218da1f0a8b6e7d9dcd9c447af4a79e999cc7fb6 100644 (file)
--- a/intern/guardedalloc/make/msvc_6_0/guardedalloc.dsp
+++ b/intern/guardedalloc/make/msvc_6_0/guardedalloc.dsp
@@ -53,7 +53,7 @@ LIB32=link.exe -lib
 # ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\intern\guardedalloc\libguardedalloc.lib"
 # Begin Special Build Tool
 SOURCE="$(InputPath)"
-PostBuild_Cmds=ECHO Copying header files       XCOPY /E ..\..\*.h ..\..\..\..\lib\windows\guardedalloc\include\        ECHO Copying lib        XCOPY /E ..\..\..\..\obj\windows\intern\guardedalloc\*.lib ..\..\..\..\lib\windows\guardedalloc\lib\*.a ECHO Done
+PostBuild_Cmds=ECHO Copying header files       XCOPY /E /Y ..\..\*.h ..\..\..\..\lib\windows\guardedalloc\include\     ECHO Copying lib        XCOPY /E /Y ..\..\..\..\obj\windows\intern\guardedalloc\*.lib ..\..\..\..\lib\windows\guardedalloc\lib\*.a      ECHO Done
 # End Special Build Tool
 
 !ELSEIF  "$(CFG)" == "guardedalloc - Win32 Debug"

diff --git a/intern/iksolver/make/msvc_6_0/iksolver.dsp b/intern/iksolver/make/msvc_6_0/iksolver.dsp
index d0ab008e2d4b61240cb95d4f15b49be3d8676d28..6f0f1a74a18e4607fe10c2e70ad78a8aeb397e35 100644 (file)
--- a/intern/iksolver/make/msvc_6_0/iksolver.dsp
+++ b/intern/iksolver/make/msvc_6_0/iksolver.dsp
@@ -54,7 +54,7 @@ LIB32=link.exe -lib
 # ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\intern\iksolver\libiksolver.lib"
 # Begin Special Build Tool
 SOURCE="$(InputPath)"
-PostBuild_Cmds=ECHO Copying header files       XCOPY /E ..\..\extern\*.h ..\..\..\..\lib\windows\iksolver\include\     ECHO Copying lib        XCOPY /E ..\..\..\..\obj\windows\intern\iksolver\*.lib ..\..\..\..\lib\windows\iksolver\lib\*.a ECHO Done
+PostBuild_Cmds=ECHO Copying header files       XCOPY /E /Y ..\..\extern\*.h ..\..\..\..\lib\windows\iksolver\include\  ECHO Copying lib        XCOPY /E /Y ..\..\..\..\obj\windows\intern\iksolver\*.lib ..\..\..\..\lib\windows\iksolver\lib\*.a      ECHO Done
 # End Special Build Tool
 
 !ELSEIF  "$(CFG)" == "iksolver - Win32 Debug"

diff --git a/intern/keymaker/make/msvc_6_0/blenkey.dsp b/intern/keymaker/make/msvc_6_0/blenkey.dsp
index 4fa00fe66b6b11a034b9ef358fc49f137f992da5..12806b34300430a24bbb8472b92115f37dda4fce 100644 (file)
--- a/intern/keymaker/make/msvc_6_0/blenkey.dsp
+++ b/intern/keymaker/make/msvc_6_0/blenkey.dsp
@@ -53,7 +53,7 @@ LIB32=link.exe -lib
 # ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\intern\blenkey\libblenkey.lib"
 # Begin Special Build Tool
 SOURCE="$(InputPath)"
-PostBuild_Cmds=ECHO Copying header files       XCOPY /E ..\..\blenkey.h ..\..\..\..\lib\windows\blenkey\include\       ECHO Copying lib        XCOPY /E ..\..\..\..\obj\windows\intern\blenkey\*.lib ..\..\..\..\lib\windows\blenkey\lib\*.a   ECHO Done
+PostBuild_Cmds=ECHO Copying header files       XCOPY /E /Y ..\..\blenkey.h ..\..\..\..\lib\windows\blenkey\include\    ECHO Copying lib        XCOPY /E /Y ..\..\..\..\obj\windows\intern\blenkey\*.lib ..\..\..\..\lib\windows\blenkey\lib\*.a        ECHO Done
 # End Special Build Tool
 
 !ELSEIF  "$(CFG)" == "blenkey - Win32 Debug"

diff --git a/intern/memutil/make/msvc_60/memutil.dsp b/intern/memutil/make/msvc_60/memutil.dsp
index 862ba9f57e1897eb067e2d8a93a88760bd1db6bd..374609b86fd3e85a67dcc8f4bf039990dfb8c55b 100644 (file)
--- a/intern/memutil/make/msvc_60/memutil.dsp
+++ b/intern/memutil/make/msvc_60/memutil.dsp
@@ -53,7 +53,7 @@ LIB32=link.exe -lib
 # ADD LIB32 /nologo
 # Begin Special Build Tool
 SOURCE="$(InputPath)"
-PostBuild_Cmds=ECHO Copying header files       XCOPY /E ..\..\*.h ..\..\..\..\lib\windows\memutil\include\     ECHO Copying lib        XCOPY /E ..\..\..\..\obj\windows\intern\memutil\*.lib ..\..\..\..\lib\windows\memutil\lib\*.a   ECHO Done
+PostBuild_Cmds=ECHO Copying header files       XCOPY /E /Y ..\..\*.h ..\..\..\..\lib\windows\memutil\include\  ECHO Copying lib        XCOPY /E /Y ..\..\..\..\obj\windows\intern\memutil\*.lib ..\..\..\..\lib\windows\memutil\lib\*.a        ECHO Done
 # End Special Build Tool
 
 !ELSEIF  "$(CFG)" == "memutil - Win32 Debug"
@@ -81,7 +81,7 @@ LIB32=link.exe -lib
 # ADD LIB32 /nologo
 # Begin Special Build Tool
 SOURCE="$(InputPath)"
-PostBuild_Cmds=ECHO Copying header files       XCOPY /E ..\..\*.h ..\..\..\..\lib\windows\memutil\include\     ECHO Copying lib        XCOPY /E ..\..\..\..\obj\windows\intern\memutil\debug\*.lib ..\..\..\..\lib\windows\memutil\lib\debug\*.a       ECHO Copying Debug info.        XCOPY /E ..\..\..\..\obj\windows\intern\memutil\debug\vc60.* ..\..\..\..\lib\windows\memutil\lib\debug\ ECHO Done
+PostBuild_Cmds=ECHO Copying header files       XCOPY /E /Y ..\..\*.h ..\..\..\..\lib\windows\memutil\include\  ECHO Copying lib        XCOPY /E /Y ..\..\..\..\obj\windows\intern\memutil\debug\*.lib ..\..\..\..\lib\windows\memutil\lib\debug\*.a    ECHO Copying Debug info.        XCOPY /E /Y ..\..\..\..\obj\windows\intern\memutil\debug\vc60.* ..\..\..\..\lib\windows\memutil\lib\debug\      ECHO Done
 # End Special Build Tool
 
 !ENDIF 

diff --git a/intern/moto/make/msvc_6_0/MoTo.dsp b/intern/moto/make/msvc_6_0/MoTo.dsp
index 92dcb4112abf338ecfd78c97ed804ccf41e9acfb..51eb08e17bcb016172130e0c637dc49c148c5e5f 100755 (executable)
--- a/intern/moto/make/msvc_6_0/MoTo.dsp
+++ b/intern/moto/make/msvc_6_0/MoTo.dsp
@@ -54,7 +54,7 @@ LIB32=link.exe -lib
 # ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\intern\moto\libmoto.lib"
 # Begin Special Build Tool
 SOURCE="$(InputPath)"
-PostBuild_Cmds=ECHO Copying header files       XCOPY ..\..\include\*.h ..\..\..\..\lib\windows\moto\include\   ECHO Copying lib        XCOPY /E ..\..\..\..\obj\windows\intern\moto\*.lib ..\..\..\..\lib\windows\moto\lib\*.a ECHO Done
+PostBuild_Cmds=ECHO Copying header files       XCOPY /Y ..\..\include\*.h ..\..\..\..\lib\windows\moto\include\        ECHO Copying lib        XCOPY /E /Y ..\..\..\..\obj\windows\intern\moto\*.lib ..\..\..\..\lib\windows\moto\lib\*.a      ECHO Done
 # End Special Build Tool
 
 !ELSEIF  "$(CFG)" == "MoTo - Win32 Debug"
@@ -83,7 +83,7 @@ LIB32=link.exe -lib
 # ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\intern\moto\debug\libmoto.lib"
 # Begin Special Build Tool
 SOURCE="$(InputPath)"
-PostBuild_Cmds=ECHO Copying header files       XCOPY /E ..\..\include\*.h ..\..\..\..\lib\windows\moto\include\        ECHO Copying lib        XCOPY /E ..\..\..\..\obj\windows\intern\moto\debug\*.lib ..\..\..\..\lib\windows\moto\lib\debug\*.a     ECHO Copying Debug info.        XCOPY ..\..\..\..\obj\windows\intern\moto\debug\vc60.* ..\..\..\..\lib\windows\moto\lib\debug\  ECHO Done
+PostBuild_Cmds=ECHO Copying header files       XCOPY /E /Y ..\..\include\*.h ..\..\..\..\lib\windows\moto\include\     ECHO Copying lib        XCOPY /E /Y ..\..\..\..\obj\windows\intern\moto\debug\*.lib ..\..\..\..\lib\windows\moto\lib\debug\*.a  ECHO Copying Debug info.        XCOPY /Y ..\..\..\..\obj\windows\intern\moto\debug\vc60.* ..\..\..\..\lib\windows\moto\lib\debug\       ECHO Done
 # End Special Build Tool
 
 !ENDIF 

diff --git a/intern/string/make/msvc_6_0/string.dsp b/intern/string/make/msvc_6_0/string.dsp
index 6d1504dd12058cfc98a92eb1500df85153722413..7d841d985618051b576ecd868c19ba7d665a0fb6 100644 (file)
--- a/intern/string/make/msvc_6_0/string.dsp
+++ b/intern/string/make/msvc_6_0/string.dsp
@@ -53,7 +53,7 @@ LIB32=link.exe -lib
 # ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\intern\string\libstring.lib"
 # Begin Special Build Tool
 SOURCE="$(InputPath)"
-PostBuild_Cmds=ECHO Copying header files       XCOPY /E ..\..\*.h  ..\..\..\..\lib\windows\string\include\     ECHO Copying lib        XCOPY /E ..\..\..\..\obj\windows\intern\string\*.lib ..\..\..\..\lib\windows\string\lib\*.a     ECHO Done
+PostBuild_Cmds=ECHO Copying header files       XCOPY /E /Y ..\..\*.h  ..\..\..\..\lib\windows\string\include\  ECHO Copying lib        XCOPY /E /Y ..\..\..\..\obj\windows\intern\string\*.lib ..\..\..\..\lib\windows\string\lib\*.a  ECHO Done
 # End Special Build Tool
 
 !ELSEIF  "$(CFG)" == "string - Win32 Debug"
@@ -81,7 +81,7 @@ LIB32=link.exe -lib
 # ADD LIB32 /nologo /out:"../../../../obj/windows/intern/string/debug\libstring.lib"
 # Begin Special Build Tool
 SOURCE="$(InputPath)"
-PostBuild_Cmds=ECHO Copying header files       XCOPY /E ..\..\*.h  ..\..\..\..\lib\windows\string\include\     ECHO Copying lib        XCOPY /E ..\..\..\..\obj\windows\intern\string\debug\*.lib ..\..\..\..\lib\windows\string\lib\debug\*.a ECHO Done
+PostBuild_Cmds=ECHO Copying header files       XCOPY /E /Y ..\..\*.h  ..\..\..\..\lib\windows\string\include\  ECHO Copying lib        XCOPY /E /Y ..\..\..\..\obj\windows\intern\string\debug\*.lib ..\..\..\..\lib\windows\string\lib\debug\*.a      ECHO Done
 # End Special Build Tool
 
 !ENDIF