From b841ba91d72f5120b7bd35630a40502fd9874369 Mon Sep 17 00:00:00 2001 From: luca Date: Wed, 11 Jan 2006 17:01:47 +0000 Subject: [PATCH] Patch level :2.2 nopatch Files correlati : Ricompilazione Demo : [ ] Commento :modificati progetti ve e cambiato a mano installa.rc avendo inserito le immagini delle chiavi hardware che devono apparire in fase di installazione git-svn-id: svn://10.65.10.50/trunk@13685 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- projects/installa.rc | 39 ++++++++++++++++++++++++++++++++++++++- projects/ve1.dsp | 4 ++++ projects/ve_maskrighe.dsp | 31 +++++++++++++++++++++++++++++++ 3 files changed, 73 insertions(+), 1 deletion(-) diff --git a/projects/installa.rc b/projects/installa.rc index 45390ac93..d4b338fee 100755 --- a/projects/installa.rc +++ b/projects/installa.rc @@ -1,3 +1,40 @@ -"9012" ICON DISCARDABLE "../exed/res/setup.ico" +#include "windows.h" +///////////////////////////////////////////////////////////////////////////// +// +// Icon +// + +// Icon with lowest ID value placed first to ensure application icon +// remains consistent on all systems. +9012 ICON DISCARDABLE "../res/setup.ico" + +///////////////////////////////////////////////////////////////////////////// +// +// Bitmap +// + +1000 BITMAP DISCARDABLE "../res/eutron.bmp" +1001 BITMAP DISCARDABLE "../res/hardlock.bmp" + +///////////////////////////////////////////////////////////////////////////// +// +// Dialog +// + +DONGLE DIALOG DISCARDABLE 256, 200, 178, 86 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_CHILD +CAPTION "Tipo chiave" +FONT 8, "MS Sans Serif" +BEGIN + DEFPUSHBUTTON "OK",IDOK,26,64,50,14 + PUSHBUTTON "Cancel",IDCANCEL,103,64,50,14 + CONTROL 1000,1000,"Static",SS_BITMAP,8,8,93,25 + CONTROL 1001,1001,"Static",SS_BITMAP,131,8,35,25 + CONTROL "Eutron",100,"Button",BS_AUTORADIOBUTTON | WS_GROUP | + WS_TABSTOP,32,40,37,10 + CONTROL "Hardlock",101,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP, + 127,40,45,10 +END +///////////////////////////////////////////////////////////////////////////// diff --git a/projects/ve1.dsp b/projects/ve1.dsp index 8c108d1b7..acf9a153b 100755 --- a/projects/ve1.dsp +++ b/projects/ve1.dsp @@ -96,6 +96,10 @@ LINK32=link.exe # PROP Default_Filter "cpp" # Begin Source File +SOURCE=..\ba\ba8500.cpp +# End Source File +# Begin Source File + SOURCE=..\cg\cgsaldac.cpp # End Source File # Begin Source File diff --git a/projects/ve_maskrighe.dsp b/projects/ve_maskrighe.dsp index be984347d..85ad6b015 100755 --- a/projects/ve_maskrighe.dsp +++ b/projects/ve_maskrighe.dsp @@ -527,6 +527,37 @@ InputName=verig14 !ENDIF +# End Source File +# Begin Source File + +SOURCE=..\ve\verig15.uml + +!IF "$(CFG)" == "ve_maskrighe - Win32 Release" + +# Begin Custom Build - Compiling line mask $(InputPath)... +TargetDir=D:\Release\Campo22 +InputPath=..\ve\verig15.uml +InputName=verig15 + +"$(TargetDir)\$(InputName).msk" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + msk232 $(InputPath) $(TargetDir)\$(InputName).msk + +# End Custom Build + +!ELSEIF "$(CFG)" == "ve_maskrighe - Win32 Debug" + +# Begin Custom Build - Compiling line mask $(InputPath)... +TargetDir=\U\Luca\R_02_02\exed +InputPath=..\ve\verig15.uml +InputName=verig15 + +"$(TargetDir)\$(InputName).msk" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + msk232 $(InputPath) $(TargetDir)\$(InputName).msk + +# End Custom Build + +!ENDIF + # End Source File # End Group # End Target