From dfd332e024184d2db87f211fa31fe595840945b9 Mon Sep 17 00:00:00 2001
From: luca <luca@c028cbd2-c16b-5b4b-a496-9718f37d4682>
Date: Tue, 26 Apr 2005 13:08:25 +0000
Subject: [PATCH] Patch level         :2.2 nopatch Files correlati    
 :progetti vari Ricompilazione Demo : [ ] Commento            :

git-svn-id: svn://10.65.10.50/trunk@13007 c028cbd2-c16b-5b4b-a496-9718f37d4682
---
 projects/ci.dsp  | 63 ------------------------------------------------
 projects/ci.dsw  | 15 ------------
 projects/ci0.dsp | 15 ++++++++++++
 3 files changed, 15 insertions(+), 78 deletions(-)
 delete mode 100755 projects/ci.dsp

diff --git a/projects/ci.dsp b/projects/ci.dsp
deleted file mode 100755
index 4e78752d1..000000000
--- a/projects/ci.dsp
+++ /dev/null
@@ -1,63 +0,0 @@
-# Microsoft Developer Studio Project File - Name="ci" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Generic Project" 0x010a
-
-CFG=ci - 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 "ci.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 "ci.mak" CFG="ci - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "ci - Win32 Release" (based on "Win32 (x86) Generic Project")
-!MESSAGE "ci - Win32 Debug" (based on "Win32 (x86) Generic Project")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-MTL=midl.exe
-
-!IF  "$(CFG)" == "ci - 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 Target_Dir ""
-
-!ELSEIF  "$(CFG)" == "ci - 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 Target_Dir ""
-
-!ENDIF 
-
-# Begin Target
-
-# Name "ci - Win32 Release"
-# Name "ci - Win32 Debug"
-# End Target
-# End Project
diff --git a/projects/ci.dsw b/projects/ci.dsw
index 218a499d3..e17aca76d 100755
--- a/projects/ci.dsw
+++ b/projects/ci.dsw
@@ -15,21 +15,6 @@ Package=<4>
 
 ###############################################################################
 
-Project: "ci"=.\ci\ci.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name ci0
-    End Project Dependency
-}}}
-
-###############################################################################
-
 Project: "ci0"=.\ci0.dsp - Package Owner=<4>
 
 Package=<5>
diff --git a/projects/ci0.dsp b/projects/ci0.dsp
index bdb36d1ec..4dc4bd6ef 100755
--- a/projects/ci0.dsp
+++ b/projects/ci0.dsp
@@ -120,10 +120,25 @@ SOURCE=..\ci\ci0400a.uml
 
 !IF  "$(CFG)" == "ci0 - Win32 Release"
 
+# Begin Custom Build - Compiling mask $(InputPath)...
+TargetDir=D:\Release\Campo22
+InputPath=..\ci\ci0400a.uml
+InputName=ci0400a
+
+"$(TargetDir)\$(InputName).msk" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	msk32 $(InputPath) $(TargetDir)\$(InputName).msk
+
+# End Custom Build
+
 !ELSEIF  "$(CFG)" == "ci0 - Win32 Debug"
 
+<<<<<<< ci0.dsp
+# Begin Custom Build - Compiling mask $(InputPath)...
+TargetDir=\U\Luca\R_02_02\exed
+=======
 # Begin Custom Build
 TargetDir=\u\R_02_02\exed
+>>>>>>> 1.5
 InputPath=..\ci\ci0400a.uml
 InputName=ci0400a