From c75b8ae05cff0994dafdf5cfd49217dff0f10303 Mon Sep 17 00:00:00 2001 From: alex Date: Thu, 21 Apr 2005 21:04:21 +0000 Subject: [PATCH] Patch level : 2.2 Files correlati : Ricompilazione Demo : [ ] Commento : MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Modlo contabilità industriale git-svn-id: svn://10.65.10.50/trunk@12985 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- projects/ci.dsp | 8 +-- projects/ci.dsw | 17 ++++- projects/ci0.dsp | 168 +++++++++++++-------------------------------- projects/ci0.rc | 133 +---------------------------------- projects/msk32.bat | 5 +- 5 files changed, 72 insertions(+), 259 deletions(-) diff --git a/projects/ci.dsp b/projects/ci.dsp index 8f87ded8f..4e78752d1 100755 --- a/projects/ci.dsp +++ b/projects/ci.dsp @@ -44,13 +44,13 @@ MTL=midl.exe # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "ci___Win32_Debug" -# PROP BASE Intermediate_Dir "ci___Win32_Debug" +# 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 Output_Dir "Debug" +# PROP Intermediate_Dir "Debug" # PROP Target_Dir "" !ENDIF diff --git a/projects/ci.dsw b/projects/ci.dsw index 863eeebfb..218a499d3 100755 --- a/projects/ci.dsw +++ b/projects/ci.dsw @@ -3,7 +3,19 @@ Microsoft Developer Studio Workspace File, Format Version 6.00 ############################################################################### -Project: "ci"=.\ci.dsp - Package Owner=<4> +Project: "AgaLib"=.\AgaLib.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + +Project: "ci"=.\ci\ci.dsp - Package Owner=<4> Package=<5> {{{ @@ -26,6 +38,9 @@ Package=<5> Package=<4> {{{ + Begin Project Dependency + Project_Dep_Name AgaLib + End Project Dependency }}} ############################################################################### diff --git a/projects/ci0.dsp b/projects/ci0.dsp index 43825ed56..1b5c7bdc4 100755 --- a/projects/ci0.dsp +++ b/projects/ci0.dsp @@ -38,12 +38,12 @@ RSC=rc.exe # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "../release" -# PROP Intermediate_Dir "../release" +# PROP Output_Dir "..\release" +# PROP Intermediate_Dir "..\release" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /MT /W3 /O2 /I "..\include" /I "..\xvaga" /I "..\xi" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "XVT" /FR /FD /c +# ADD CPP /nologo /MT /W3 /O2 /I "..\include" /I "..\xvaga" /I "..\xi" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "XVT" /FD /c # SUBTRACT CPP /YX # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 @@ -66,12 +66,12 @@ LINK32=link.exe # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "../debug" -# PROP Intermediate_Dir "../debug" +# PROP Output_Dir "..\debug" +# PROP Intermediate_Dir "..\debug" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /MTd /W3 /Gm /ZI /Od /I "..\include" /I "..\xvaga" /I "..\xi" /D "_DEBUG" /D "WIN32" /D "DBG" /D "_WINDOWS" /FR /FD /c +# ADD CPP /nologo /MTd /W3 /Gm /Gi /Zi /Od /I "..\include" /I "..\xvaga" /I "..\xi" /D "_DEBUG" /D "WIN32" /D "DBG" /D "_WINDOWS" /FR /FD /c # SUBTRACT CPP /YX # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 @@ -82,7 +82,7 @@ BSC32=bscmake.exe # 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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# ADD LINK32 version.lib wsock32.lib kernel32.lib gdi32.lib user32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib comctl32.lib rpcrt4.lib winspool.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libc.lib" /out:"..\exed\ci0.exe" /pdbtype:sept +# ADD LINK32 version.lib wsock32.lib kernel32.lib gdi32.lib user32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib comctl32.lib rpcrt4.lib winspool.lib /nologo /subsystem:windows /incremental:no /debug /machine:I386 /nodefaultlib:"libc.lib" /out:"..\exed\ci0.exe" /pdbtype:sept # SUBTRACT LINK32 /nodefaultlib !ENDIF @@ -93,155 +93,81 @@ LINK32=link.exe # Name "ci0 - Win32 Debug" # Begin Group "Sources" -# PROP Default_Filter "" +# PROP Default_Filter "cpp" # Begin Source File SOURCE=..\ci\ci0.cpp # End Source File # Begin Source File -SOURCE=..\ci\ci0300.cpp +SOURCE=..\ci\ci0400.cpp # End Source File # Begin Source File SOURCE=..\ci\cilib.cpp +# End Source File +# End Group +# Begin Group "Masks" + +# PROP Default_Filter "uml" +# Begin Source File + +SOURCE=..\ci\ci0400a.uml + +!IF "$(CFG)" == "ci0 - Win32 Release" + +!ELSEIF "$(CFG)" == "ci0 - Win32 Debug" + +# Begin Custom Build +TargetDir=\u\R_02_02\exed +InputPath=..\ci\ci0400a.uml +InputName=ci0400a + +"$(TargetDir)\$(InputName).msk" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + msk32 $(InputPath) $(TargetDir)\$(InputName).msk + +# End Custom Build + +!ENDIF + # End Source File # End Group # Begin Group "Headers" -# PROP Default_Filter "" +# PROP Default_Filter "h" # Begin Source File SOURCE=..\ci\ci0.h # End Source File # Begin Source File -SOURCE=..\ci\ci0300.h +SOURCE=..\ci\ci0400.h +# End Source File +# Begin Source File + +SOURCE=..\ci\ci0400a.h # End Source File # Begin Source File SOURCE=..\ci\cilib.h # End Source File # End Group -# Begin Group "Masks" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\ci\ci0300.uml -# End Source File -# End Group -# Begin Source File - -SOURCE=.\wx\msw\blank.cur -# End Source File -# Begin Source File - -SOURCE=.\wx\msw\bullseye.cur -# End Source File -# Begin Source File - -SOURCE=.\wx\msw\cdrom.ico -# End Source File # Begin Source File SOURCE=.\ci0.rc -# End Source File -# Begin Source File -SOURCE=.\wx\msw\colours.bmp -# End Source File -# Begin Source File +!IF "$(CFG)" == "ci0 - Win32 Release" -SOURCE=.\wx\msw\computer.ico -# End Source File -# Begin Source File +# ADD BASE RSC /l 0x410 +# ADD RSC /l 0x410 -SOURCE=.\wx\msw\csquery.bmp -# End Source File -# Begin Source File +!ELSEIF "$(CFG)" == "ci0 - Win32 Debug" -SOURCE=.\wx\msw\disable.bmp -# End Source File -# Begin Source File +# ADD BASE RSC /l 0x410 +# ADD RSC /l 0x410 /fo"..\Debug/ci0.res" -SOURCE=.\wx\msw\drive.ico -# End Source File -# Begin Source File +!ENDIF -SOURCE=..\exed\RES\exe.ico -# End Source File -# Begin Source File - -SOURCE=.\wx\msw\file1.ico -# End Source File -# Begin Source File - -SOURCE=.\wx\msw\floppy.ico -# End Source File -# Begin Source File - -SOURCE=.\wx\msw\folder1.ico -# End Source File -# Begin Source File - -SOURCE=.\wx\msw\folder2.ico -# End Source File -# Begin Source File - -SOURCE=.\wx\msw\hand.cur -# End Source File -# Begin Source File - -SOURCE=.\wx\msw\magnif1.cur -# End Source File -# Begin Source File - -SOURCE=.\wx\msw\noentry.cur -# End Source File -# Begin Source File - -SOURCE=.\wx\msw\pbrush.cur -# End Source File -# Begin Source File - -SOURCE=.\wx\msw\pencil.cur -# End Source File -# Begin Source File - -SOURCE=.\wx\msw\pntleft.cur -# End Source File -# Begin Source File - -SOURCE=.\wx\msw\pntright.cur -# End Source File -# Begin Source File - -SOURCE=.\wx\msw\query.cur -# End Source File -# Begin Source File - -SOURCE=.\wx\msw\removble.ico -# End Source File -# Begin Source File - -SOURCE=.\wx\msw\rightarr.cur -# End Source File -# Begin Source File - -SOURCE=.\wx\msw\roller.cur -# End Source File -# Begin Source File - -SOURCE=.\wx\msw\size.cur -# End Source File -# Begin Source File - -SOURCE=.\wx\msw\watch1.cur -# End Source File -# Begin Source File - -SOURCE=..\LIB\AgaLibD.lib # End Source File # End Target # End Project diff --git a/projects/ci0.rc b/projects/ci0.rc index 3c1a1121e..a40528ce1 100755 --- a/projects/ci0.rc +++ b/projects/ci0.rc @@ -1,132 +1,3 @@ -//Microsoft Developer Studio generated resource script. -// -#include "resource.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#define APSTUDIO_HIDDEN_SYMBOLS -#include "windows.h" -#undef APSTUDIO_HIDDEN_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// Italian (Italy) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ITA) -#ifdef _WIN32 -LANGUAGE LANG_ITALIAN, SUBLANG_ITALIAN -#pragma code_page(1252) -#endif //_WIN32 - -///////////////////////////////////////////////////////////////////////////// -// -// Icon -// - -// Icon with lowest ID value placed first to ensure application icon -// remains consistent on all systems. -"9012" ICON DISCARDABLE "../exed/res/exe.ico" -WXICON_SMALL_CLOSED_FOLDER ICON DISCARDABLE "wx/msw/folder1.ico" -WXICON_SMALL_OPEN_FOLDER ICON DISCARDABLE "wx/msw/folder2.ico" -WXICON_SMALL_FILE ICON DISCARDABLE "wx/msw/file1.ico" -WXICON_SMALL_COMPUTER ICON DISCARDABLE "wx/msw/computer.ico" -WXICON_SMALL_DRIVE ICON DISCARDABLE "wx/msw/drive.ico" -WXICON_SMALL_CDROM ICON DISCARDABLE "wx/msw/cdrom.ico" -WXICON_SMALL_FLOPPY ICON DISCARDABLE "wx/msw/floppy.ico" -WXICON_SMALL_REMOVEABLE ICON DISCARDABLE "wx/msw/removble.ico" - -///////////////////////////////////////////////////////////////////////////// -// -// Menu -// - -WXWINDOWMENU MENU DISCARDABLE -BEGIN - POPUP "&Window" - BEGIN - MENUITEM "&Cascade", 4002 - MENUITEM "Tile &Horizontally", 4001 - MENUITEM "Tile &Vertically", 4005 - MENUITEM "", 65535 - MENUITEM "&Arrange Icons", 4003 - MENUITEM "&Next", 4004 - END -END - - -///////////////////////////////////////////////////////////////////////////// -// -// Cursor -// - -WXCURSOR_HAND CURSOR DISCARDABLE "wx/msw/hand.cur" -WXCURSOR_BULLSEYE CURSOR DISCARDABLE "wx/msw/bullseye.cur" -WXCURSOR_PENCIL CURSOR DISCARDABLE "wx/msw/pencil.cur" -WXCURSOR_MAGNIFIER CURSOR DISCARDABLE "wx/msw/magnif1.cur" -WXCURSOR_NO_ENTRY CURSOR DISCARDABLE "wx/msw/noentry.cur" -WXCURSOR_SIZING CURSOR DISCARDABLE "wx/msw/size.cur" -WXCURSOR_ROLLER CURSOR DISCARDABLE "wx/msw/roller.cur" -WXCURSOR_WATCH CURSOR DISCARDABLE "wx/msw/watch1.cur" -WXCURSOR_PBRUSH CURSOR DISCARDABLE "wx/msw/pbrush.cur" -WXCURSOR_PLEFT CURSOR DISCARDABLE "wx/msw/pntleft.cur" -WXCURSOR_PRIGHT CURSOR DISCARDABLE "wx/msw/pntright.cur" -WXCURSOR_QARROW CURSOR DISCARDABLE "wx/msw/query.cur" -WXCURSOR_BLANK CURSOR DISCARDABLE "wx/msw/blank.cur" -WXCURSOR_RIGHT_ARROW CURSOR DISCARDABLE "wx/msw/rightarr.cur" - -///////////////////////////////////////////////////////////////////////////// -// -// Bitmap -// - -WXDISABLE_BUTTON_BITMAP BITMAP MOVEABLE PURE "wx/msw/disable.bmp" -CSQUERY BITMAP MOVEABLE PURE "wx/msw/csquery.bmp" -WXBITMAP_STD_COLOURS BITMAP MOVEABLE PURE "wx/msw/colours.bmp" - -#ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// - -1 TEXTINCLUDE DISCARDABLE -BEGIN - "resource.h\0" -END - -2 TEXTINCLUDE DISCARDABLE -BEGIN - "#define APSTUDIO_HIDDEN_SYMBOLS\r\n" - "#include ""windows.h""\r\n" - "#undef APSTUDIO_HIDDEN_SYMBOLS\r\n" - "\0" -END - -3 TEXTINCLUDE DISCARDABLE -BEGIN - "\r\n" - "\0" -END - -#endif // APSTUDIO_INVOKED - -#endif // Italian (Italy) resources -///////////////////////////////////////////////////////////////////////////// - - - -#ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 3 resource. -// - - -///////////////////////////////////////////////////////////////////////////// -#endif // not APSTUDIO_INVOKED +"9012" ICON DISCARDABLE "../exed/res/exe.ico" +rcinclude ../../wx240/include/wx/msw/wx.rc \ No newline at end of file diff --git a/projects/msk32.bat b/projects/msk32.bat index ee8cb328c..9e99f7b46 100755 --- a/projects/msk32.bat +++ b/projects/msk32.bat @@ -1,9 +1,9 @@ -rem @echo off +rem @echo off echo Compiling %1 into %2 copy ..\include\uml.h+%1 %TMP%\tmp.tmp set oldinc=%include -set include=;..\include;..\ab;..\aec;..\at;..\ba;..\ca;..\ci;..\ce;..\cg;..\cm;..\db;..\dl;..\ef;..\in;..\m770;..\mg;..\mr;..\or;..\pr;..\ps;..\sc;..\si;..\sv;..\ve;..\xvaga +set include=..\include;..\ab;..\aec;..\at;..\ba;..\ce;..\ci;..\cg;..\cm;..\db;..\dl;..\ef;..\in;..\li;..\m770;..\mg;..\mr;..\or;..\pr;..\ps;..\sc;..\si;..\sv;..\ve;..\xvaga cl /nologo /EP %TMP%\tmp.tmp >%TMP%\tmp.msk set include=%oldinc set oldinc= @@ -13,3 +13,4 @@ del %TMP%\tmp.msk del %TMP%\tmp1.msk del %TMP%\tmp.tmp +