Changeset 1d84e57 in nscp


Ignore:
Timestamp:
02/24/08 09:56:38 (5 years ago)
Author:
Michael Medin <michael@…>
Branches:
master, 0.4.0, 0.4.1, 0.4.2, stable
Children:
a5b746d
Parents:
252c016
Message:

x64 build fixes (as well as bundling of some libraries)

Files:
2 added
10 edited

Legend:

Unmodified
Added
Removed
  • AutoBuild.h

    r5b9d247 r1d84e57  
    33// change the FALSE to TRUE for autoincrement of build number 
    44#define INCREMENT_VERSION TRUE 
    5 #define FILEVER        0,3,0,61 
    6 #define PRODUCTVER     0,3,0,61 
    7 #define STRFILEVER     _T("0.3.0.61") 
    8 #define STRPRODUCTVER  _T("0.3.0.61") 
    9 #define STRPRODUCTDATE  _T("2008-02-20") 
     5#define FILEVER        0,3,0,65 
     6#define PRODUCTVER     0,3,0,65 
     7#define STRFILEVER     _T("0.3.0.65") 
     8#define STRPRODUCTVER  _T("0.3.0.65") 
     9#define STRPRODUCTDATE  _T("2008-02-23") 
    1010#endif // AUTOBUILD_H 
  • NSClient++-2005.sln

    r394f7a1 r1d84e57  
    4747  EndProjectSection 
    4848EndProject 
    49 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LUA", "..\..\LUA\LUA\LUA.vcproj", "{B6D08289-B8AE-4391-9D07-93B22618BE58}" 
    50 EndProject 
    5149Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CheckExternalScripts", "modules\CheckExternalScripts\CheckExternalScripts-2005.vcproj", "{0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}" 
    5250EndProject 
    53 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Crypt++", "..\Crypt++\Crypt++.vcproj", "{630857C0-6AD8-4CEE-B5F7-CA1DF620CA9A}" 
    54 EndProject 
    5551Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NRPEClient", "modules\NRPEClient\NRPEClient-2005.vcproj", "{4241C6CF-EC01-4AD9-89B0-B75EBA8A5996}" 
     52EndProject 
     53Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "lib-src", "lib-src", "{C8DCE3D7-A802-4C5D-ABB1-B478F545B6E5}" 
     54EndProject 
     55Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Crypto++", "lib-source\Crypto++\Crypto++.vcproj", "{630857C0-6AD8-4CEE-B5F7-CA1DF620CA9A}" 
     56EndProject 
     57Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LUA", "lib-source\LUA\LUA.vcproj", "{B6D08289-B8AE-4391-9D07-93B22618BE58}" 
     58EndProject 
     59Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "modules", "modules", "{9757464B-C125-4307-A84A-F4181AE6A081}" 
     60EndProject 
     61Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "helpers", "helpers", "{9A087442-7BB2-4CF0-9F58-5D1BC3C32CD2}" 
    5662EndProject 
    5763Global 
     
    496502    {0E2B21D9-F432-4127-8E92-7716B1072510}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 
    497503    {0E2B21D9-F432-4127-8E92-7716B1072510}.Debug|Any CPU.Build.0 = Debug|Any CPU 
    498     {0E2B21D9-F432-4127-8E92-7716B1072510}.Debug|Itanium.ActiveCfg = Debug|Itanium 
    499     {0E2B21D9-F432-4127-8E92-7716B1072510}.Debug|Itanium.Build.0 = Debug|Itanium 
    500     {0E2B21D9-F432-4127-8E92-7716B1072510}.Debug|Mixed Platforms.ActiveCfg = Debug|Itanium 
    501     {0E2B21D9-F432-4127-8E92-7716B1072510}.Debug|Mixed Platforms.Build.0 = Debug|Itanium 
    502     {0E2B21D9-F432-4127-8E92-7716B1072510}.Debug|Win32.ActiveCfg = Debug|Itanium 
    503     {0E2B21D9-F432-4127-8E92-7716B1072510}.Debug|x64.ActiveCfg = Debug|Itanium 
     504    {0E2B21D9-F432-4127-8E92-7716B1072510}.Debug|Itanium.ActiveCfg = Debug|Any CPU 
     505    {0E2B21D9-F432-4127-8E92-7716B1072510}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU 
     506    {0E2B21D9-F432-4127-8E92-7716B1072510}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU 
     507    {0E2B21D9-F432-4127-8E92-7716B1072510}.Debug|Win32.ActiveCfg = Debug|Any CPU 
     508    {0E2B21D9-F432-4127-8E92-7716B1072510}.Debug|x64.ActiveCfg = Debug|Any CPU 
    504509    {0E2B21D9-F432-4127-8E92-7716B1072510}.Debug-MemCheck|Any CPU.ActiveCfg = Debug-MemCheck|Any CPU 
    505510    {0E2B21D9-F432-4127-8E92-7716B1072510}.Debug-MemCheck|Any CPU.Build.0 = Debug-MemCheck|Any CPU 
    506     {0E2B21D9-F432-4127-8E92-7716B1072510}.Debug-MemCheck|Itanium.ActiveCfg = Debug-MemCheck|Itanium 
    507     {0E2B21D9-F432-4127-8E92-7716B1072510}.Debug-MemCheck|Itanium.Build.0 = Debug-MemCheck|Itanium 
    508     {0E2B21D9-F432-4127-8E92-7716B1072510}.Debug-MemCheck|Mixed Platforms.ActiveCfg = Debug-MemCheck|Itanium 
    509     {0E2B21D9-F432-4127-8E92-7716B1072510}.Debug-MemCheck|Mixed Platforms.Build.0 = Debug-MemCheck|Itanium 
    510     {0E2B21D9-F432-4127-8E92-7716B1072510}.Debug-MemCheck|Win32.ActiveCfg = Debug-MemCheck|Itanium 
    511     {0E2B21D9-F432-4127-8E92-7716B1072510}.Debug-MemCheck|x64.ActiveCfg = Debug-MemCheck|Itanium 
    512     {0E2B21D9-F432-4127-8E92-7716B1072510}.Distribution|Any CPU.ActiveCfg = Debug-MemCheck|Itanium 
    513     {0E2B21D9-F432-4127-8E92-7716B1072510}.Distribution|Itanium.ActiveCfg = Debug-MemCheck|Itanium 
    514     {0E2B21D9-F432-4127-8E92-7716B1072510}.Distribution|Itanium.Build.0 = Debug-MemCheck|Itanium 
    515     {0E2B21D9-F432-4127-8E92-7716B1072510}.Distribution|Mixed Platforms.ActiveCfg = Debug-MemCheck|Itanium 
    516     {0E2B21D9-F432-4127-8E92-7716B1072510}.Distribution|Mixed Platforms.Build.0 = Debug-MemCheck|Itanium 
    517     {0E2B21D9-F432-4127-8E92-7716B1072510}.Distribution|Win32.ActiveCfg = Debug-MemCheck|Itanium 
    518     {0E2B21D9-F432-4127-8E92-7716B1072510}.Distribution|x64.ActiveCfg = Debug-MemCheck|Itanium 
    519     {0E2B21D9-F432-4127-8E92-7716B1072510}.Nightly|Any CPU.ActiveCfg = Debug-MemCheck|Itanium 
    520     {0E2B21D9-F432-4127-8E92-7716B1072510}.Nightly|Itanium.ActiveCfg = Debug-MemCheck|Itanium 
    521     {0E2B21D9-F432-4127-8E92-7716B1072510}.Nightly|Itanium.Build.0 = Debug-MemCheck|Itanium 
    522     {0E2B21D9-F432-4127-8E92-7716B1072510}.Nightly|Mixed Platforms.ActiveCfg = Debug-MemCheck|Itanium 
    523     {0E2B21D9-F432-4127-8E92-7716B1072510}.Nightly|Mixed Platforms.Build.0 = Debug-MemCheck|Itanium 
    524     {0E2B21D9-F432-4127-8E92-7716B1072510}.Nightly|Win32.ActiveCfg = Debug-MemCheck|Itanium 
     511    {0E2B21D9-F432-4127-8E92-7716B1072510}.Debug-MemCheck|Itanium.ActiveCfg = Debug-MemCheck|Any CPU 
     512    {0E2B21D9-F432-4127-8E92-7716B1072510}.Debug-MemCheck|Mixed Platforms.ActiveCfg = Debug-MemCheck|Any CPU 
     513    {0E2B21D9-F432-4127-8E92-7716B1072510}.Debug-MemCheck|Mixed Platforms.Build.0 = Debug-MemCheck|Any CPU 
     514    {0E2B21D9-F432-4127-8E92-7716B1072510}.Debug-MemCheck|Win32.ActiveCfg = Debug-MemCheck|Any CPU 
     515    {0E2B21D9-F432-4127-8E92-7716B1072510}.Debug-MemCheck|x64.ActiveCfg = Debug-MemCheck|Any CPU 
     516    {0E2B21D9-F432-4127-8E92-7716B1072510}.Distribution|Any CPU.ActiveCfg = Debug-MemCheck|Any CPU 
     517    {0E2B21D9-F432-4127-8E92-7716B1072510}.Distribution|Any CPU.Build.0 = Debug-MemCheck|Any CPU 
     518    {0E2B21D9-F432-4127-8E92-7716B1072510}.Distribution|Itanium.ActiveCfg = Debug-MemCheck|Any CPU 
     519    {0E2B21D9-F432-4127-8E92-7716B1072510}.Distribution|Mixed Platforms.ActiveCfg = Debug-MemCheck|Any CPU 
     520    {0E2B21D9-F432-4127-8E92-7716B1072510}.Distribution|Mixed Platforms.Build.0 = Debug-MemCheck|Any CPU 
     521    {0E2B21D9-F432-4127-8E92-7716B1072510}.Distribution|Win32.ActiveCfg = Debug-MemCheck|Any CPU 
     522    {0E2B21D9-F432-4127-8E92-7716B1072510}.Distribution|x64.ActiveCfg = Debug-MemCheck|Any CPU 
     523    {0E2B21D9-F432-4127-8E92-7716B1072510}.Nightly|Any CPU.ActiveCfg = Debug-MemCheck|Any CPU 
     524    {0E2B21D9-F432-4127-8E92-7716B1072510}.Nightly|Any CPU.Build.0 = Debug-MemCheck|Any CPU 
     525    {0E2B21D9-F432-4127-8E92-7716B1072510}.Nightly|Itanium.ActiveCfg = Debug-MemCheck|Any CPU 
     526    {0E2B21D9-F432-4127-8E92-7716B1072510}.Nightly|Mixed Platforms.ActiveCfg = Debug-MemCheck|Any CPU 
     527    {0E2B21D9-F432-4127-8E92-7716B1072510}.Nightly|Mixed Platforms.Build.0 = Debug-MemCheck|Any CPU 
     528    {0E2B21D9-F432-4127-8E92-7716B1072510}.Nightly|Win32.ActiveCfg = Debug-MemCheck|Any CPU 
    525529    {0E2B21D9-F432-4127-8E92-7716B1072510}.Nightly|x64.ActiveCfg = Debug-MemCheck|Any CPU 
    526530    {0E2B21D9-F432-4127-8E92-7716B1072510}.Release|Any CPU.ActiveCfg = Release|Any CPU 
    527531    {0E2B21D9-F432-4127-8E92-7716B1072510}.Release|Any CPU.Build.0 = Release|Any CPU 
    528     {0E2B21D9-F432-4127-8E92-7716B1072510}.Release|Itanium.ActiveCfg = Release|Itanium 
    529     {0E2B21D9-F432-4127-8E92-7716B1072510}.Release|Itanium.Build.0 = Release|Itanium 
    530     {0E2B21D9-F432-4127-8E92-7716B1072510}.Release|Mixed Platforms.ActiveCfg = Release|Itanium 
    531     {0E2B21D9-F432-4127-8E92-7716B1072510}.Release|Mixed Platforms.Build.0 = Release|Itanium 
     532    {0E2B21D9-F432-4127-8E92-7716B1072510}.Release|Itanium.ActiveCfg = Release|Any CPU 
     533    {0E2B21D9-F432-4127-8E92-7716B1072510}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU 
     534    {0E2B21D9-F432-4127-8E92-7716B1072510}.Release|Mixed Platforms.Build.0 = Release|Any CPU 
    532535    {0E2B21D9-F432-4127-8E92-7716B1072510}.Release|Win32.ActiveCfg = Release|Any CPU 
    533     {0E2B21D9-F432-4127-8E92-7716B1072510}.Release|x64.ActiveCfg = Release|Itanium 
     536    {0E2B21D9-F432-4127-8E92-7716B1072510}.Release|x64.ActiveCfg = Release|Any CPU 
    534537    {6F55C9BF-57F6-4A15-A058-C83A52F539EE}.Debug|Any CPU.ActiveCfg = Debug|x64 
    535538    {6F55C9BF-57F6-4A15-A058-C83A52F539EE}.Debug|Itanium.ActiveCfg = Debug|x64 
     
    612615    {26B84883-BE52-40E6-9BEE-55AD056D5751}.Release|x64.ActiveCfg = Release|x64 
    613616    {26B84883-BE52-40E6-9BEE-55AD056D5751}.Release|x64.Build.0 = Release|x64 
    614     {B6D08289-B8AE-4391-9D07-93B22618BE58}.Debug|Any CPU.ActiveCfg = Debug|Win32 
    615     {B6D08289-B8AE-4391-9D07-93B22618BE58}.Debug|Itanium.ActiveCfg = Debug|Win32 
    616     {B6D08289-B8AE-4391-9D07-93B22618BE58}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 
    617     {B6D08289-B8AE-4391-9D07-93B22618BE58}.Debug|Mixed Platforms.Build.0 = Debug|Win32 
    618     {B6D08289-B8AE-4391-9D07-93B22618BE58}.Debug|Win32.ActiveCfg = Debug|Win32 
    619     {B6D08289-B8AE-4391-9D07-93B22618BE58}.Debug|Win32.Build.0 = Debug|Win32 
    620     {B6D08289-B8AE-4391-9D07-93B22618BE58}.Debug|x64.ActiveCfg = Debug|Win32 
    621     {B6D08289-B8AE-4391-9D07-93B22618BE58}.Debug-MemCheck|Any CPU.ActiveCfg = Debug|Win32 
    622     {B6D08289-B8AE-4391-9D07-93B22618BE58}.Debug-MemCheck|Itanium.ActiveCfg = Debug|Win32 
    623     {B6D08289-B8AE-4391-9D07-93B22618BE58}.Debug-MemCheck|Mixed Platforms.ActiveCfg = Debug|Win32 
    624     {B6D08289-B8AE-4391-9D07-93B22618BE58}.Debug-MemCheck|Mixed Platforms.Build.0 = Debug|Win32 
    625     {B6D08289-B8AE-4391-9D07-93B22618BE58}.Debug-MemCheck|Win32.ActiveCfg = Debug|Win32 
    626     {B6D08289-B8AE-4391-9D07-93B22618BE58}.Debug-MemCheck|Win32.Build.0 = Debug|Win32 
    627     {B6D08289-B8AE-4391-9D07-93B22618BE58}.Debug-MemCheck|x64.ActiveCfg = Debug|Win32 
    628     {B6D08289-B8AE-4391-9D07-93B22618BE58}.Distribution|Any CPU.ActiveCfg = Debug|Win32 
    629     {B6D08289-B8AE-4391-9D07-93B22618BE58}.Distribution|Itanium.ActiveCfg = Debug|Win32 
    630     {B6D08289-B8AE-4391-9D07-93B22618BE58}.Distribution|Mixed Platforms.ActiveCfg = Debug|Win32 
    631     {B6D08289-B8AE-4391-9D07-93B22618BE58}.Distribution|Mixed Platforms.Build.0 = Debug|Win32 
    632     {B6D08289-B8AE-4391-9D07-93B22618BE58}.Distribution|Win32.ActiveCfg = Debug|Win32 
    633     {B6D08289-B8AE-4391-9D07-93B22618BE58}.Distribution|Win32.Build.0 = Debug|Win32 
    634     {B6D08289-B8AE-4391-9D07-93B22618BE58}.Distribution|x64.ActiveCfg = Debug|Win32 
    635     {B6D08289-B8AE-4391-9D07-93B22618BE58}.Nightly|Any CPU.ActiveCfg = Release|Win32 
    636     {B6D08289-B8AE-4391-9D07-93B22618BE58}.Nightly|Itanium.ActiveCfg = Release|Win32 
    637     {B6D08289-B8AE-4391-9D07-93B22618BE58}.Nightly|Mixed Platforms.ActiveCfg = Release|Win32 
    638     {B6D08289-B8AE-4391-9D07-93B22618BE58}.Nightly|Mixed Platforms.Build.0 = Release|Win32 
    639     {B6D08289-B8AE-4391-9D07-93B22618BE58}.Nightly|Win32.ActiveCfg = Release|Win32 
    640     {B6D08289-B8AE-4391-9D07-93B22618BE58}.Nightly|Win32.Build.0 = Release|Win32 
    641     {B6D08289-B8AE-4391-9D07-93B22618BE58}.Nightly|x64.ActiveCfg = Release|Win32 
    642     {B6D08289-B8AE-4391-9D07-93B22618BE58}.Release|Any CPU.ActiveCfg = Release|Win32 
    643     {B6D08289-B8AE-4391-9D07-93B22618BE58}.Release|Itanium.ActiveCfg = Release|Win32 
    644     {B6D08289-B8AE-4391-9D07-93B22618BE58}.Release|Mixed Platforms.ActiveCfg = Release|Win32 
    645     {B6D08289-B8AE-4391-9D07-93B22618BE58}.Release|Mixed Platforms.Build.0 = Release|Win32 
    646     {B6D08289-B8AE-4391-9D07-93B22618BE58}.Release|Win32.ActiveCfg = Release|Win32 
    647     {B6D08289-B8AE-4391-9D07-93B22618BE58}.Release|Win32.Build.0 = Release|Win32 
    648     {B6D08289-B8AE-4391-9D07-93B22618BE58}.Release|x64.ActiveCfg = Release|Win32 
    649617    {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Debug|Any CPU.ActiveCfg = Debug|x64 
    650618    {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Debug|Itanium.ActiveCfg = Debug|x64 
     
    687655    {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Release|x64.ActiveCfg = Release|x64 
    688656    {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Release|x64.Build.0 = Release|x64 
    689     {630857C0-6AD8-4CEE-B5F7-CA1DF620CA9A}.Debug|Any CPU.ActiveCfg = Debug|Win32 
    690     {630857C0-6AD8-4CEE-B5F7-CA1DF620CA9A}.Debug|Itanium.ActiveCfg = Debug|Win32 
    691     {630857C0-6AD8-4CEE-B5F7-CA1DF620CA9A}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 
    692     {630857C0-6AD8-4CEE-B5F7-CA1DF620CA9A}.Debug|Mixed Platforms.Build.0 = Debug|Win32 
    693     {630857C0-6AD8-4CEE-B5F7-CA1DF620CA9A}.Debug|Win32.ActiveCfg = Debug|Win32 
    694     {630857C0-6AD8-4CEE-B5F7-CA1DF620CA9A}.Debug|Win32.Build.0 = Debug|Win32 
    695     {630857C0-6AD8-4CEE-B5F7-CA1DF620CA9A}.Debug|x64.ActiveCfg = Debug|Win32 
    696     {630857C0-6AD8-4CEE-B5F7-CA1DF620CA9A}.Debug-MemCheck|Any CPU.ActiveCfg = Debug|Win32 
    697     {630857C0-6AD8-4CEE-B5F7-CA1DF620CA9A}.Debug-MemCheck|Itanium.ActiveCfg = Debug|Win32 
    698     {630857C0-6AD8-4CEE-B5F7-CA1DF620CA9A}.Debug-MemCheck|Mixed Platforms.ActiveCfg = Debug|Win32 
    699     {630857C0-6AD8-4CEE-B5F7-CA1DF620CA9A}.Debug-MemCheck|Mixed Platforms.Build.0 = Debug|Win32 
    700     {630857C0-6AD8-4CEE-B5F7-CA1DF620CA9A}.Debug-MemCheck|Win32.ActiveCfg = Debug|Win32 
    701     {630857C0-6AD8-4CEE-B5F7-CA1DF620CA9A}.Debug-MemCheck|Win32.Build.0 = Debug|Win32 
    702     {630857C0-6AD8-4CEE-B5F7-CA1DF620CA9A}.Debug-MemCheck|x64.ActiveCfg = Debug|Win32 
    703     {630857C0-6AD8-4CEE-B5F7-CA1DF620CA9A}.Distribution|Any CPU.ActiveCfg = Debug|Win32 
    704     {630857C0-6AD8-4CEE-B5F7-CA1DF620CA9A}.Distribution|Itanium.ActiveCfg = Debug|Win32 
    705     {630857C0-6AD8-4CEE-B5F7-CA1DF620CA9A}.Distribution|Mixed Platforms.ActiveCfg = Debug|Win32 
    706     {630857C0-6AD8-4CEE-B5F7-CA1DF620CA9A}.Distribution|Mixed Platforms.Build.0 = Debug|Win32 
    707     {630857C0-6AD8-4CEE-B5F7-CA1DF620CA9A}.Distribution|Win32.ActiveCfg = Debug|Win32 
    708     {630857C0-6AD8-4CEE-B5F7-CA1DF620CA9A}.Distribution|Win32.Build.0 = Debug|Win32 
    709     {630857C0-6AD8-4CEE-B5F7-CA1DF620CA9A}.Distribution|x64.ActiveCfg = Debug|Win32 
    710     {630857C0-6AD8-4CEE-B5F7-CA1DF620CA9A}.Nightly|Any CPU.ActiveCfg = Release|Win32 
    711     {630857C0-6AD8-4CEE-B5F7-CA1DF620CA9A}.Nightly|Itanium.ActiveCfg = Release|Win32 
    712     {630857C0-6AD8-4CEE-B5F7-CA1DF620CA9A}.Nightly|Mixed Platforms.ActiveCfg = Release|Win32 
    713     {630857C0-6AD8-4CEE-B5F7-CA1DF620CA9A}.Nightly|Mixed Platforms.Build.0 = Release|Win32 
    714     {630857C0-6AD8-4CEE-B5F7-CA1DF620CA9A}.Nightly|Win32.ActiveCfg = Nightly|Win32 
    715     {630857C0-6AD8-4CEE-B5F7-CA1DF620CA9A}.Nightly|Win32.Build.0 = Nightly|Win32 
    716     {630857C0-6AD8-4CEE-B5F7-CA1DF620CA9A}.Nightly|x64.ActiveCfg = Release|Win32 
    717     {630857C0-6AD8-4CEE-B5F7-CA1DF620CA9A}.Release|Any CPU.ActiveCfg = Release|Win32 
    718     {630857C0-6AD8-4CEE-B5F7-CA1DF620CA9A}.Release|Itanium.ActiveCfg = Release|Win32 
    719     {630857C0-6AD8-4CEE-B5F7-CA1DF620CA9A}.Release|Mixed Platforms.ActiveCfg = Release|Win32 
    720     {630857C0-6AD8-4CEE-B5F7-CA1DF620CA9A}.Release|Mixed Platforms.Build.0 = Release|Win32 
    721     {630857C0-6AD8-4CEE-B5F7-CA1DF620CA9A}.Release|Win32.ActiveCfg = Release|Win32 
    722     {630857C0-6AD8-4CEE-B5F7-CA1DF620CA9A}.Release|Win32.Build.0 = Release|Win32 
    723     {630857C0-6AD8-4CEE-B5F7-CA1DF620CA9A}.Release|x64.ActiveCfg = Release|Win32 
    724657    {4241C6CF-EC01-4AD9-89B0-B75EBA8A5996}.Debug|Any CPU.ActiveCfg = Debug|x64 
    725658    {4241C6CF-EC01-4AD9-89B0-B75EBA8A5996}.Debug|Itanium.ActiveCfg = Debug|x64 
     
    762695    {4241C6CF-EC01-4AD9-89B0-B75EBA8A5996}.Release|x64.ActiveCfg = Release|x64 
    763696    {4241C6CF-EC01-4AD9-89B0-B75EBA8A5996}.Release|x64.Build.0 = Release|x64 
     697    {630857C0-6AD8-4CEE-B5F7-CA1DF620CA9A}.Debug|Any CPU.ActiveCfg = Debug|x64 
     698    {630857C0-6AD8-4CEE-B5F7-CA1DF620CA9A}.Debug|Itanium.ActiveCfg = Debug|x64 
     699    {630857C0-6AD8-4CEE-B5F7-CA1DF620CA9A}.Debug|Mixed Platforms.ActiveCfg = Debug|x64 
     700    {630857C0-6AD8-4CEE-B5F7-CA1DF620CA9A}.Debug|Mixed Platforms.Build.0 = Debug|x64 
     701    {630857C0-6AD8-4CEE-B5F7-CA1DF620CA9A}.Debug|Win32.ActiveCfg = Debug|Win32 
     702    {630857C0-6AD8-4CEE-B5F7-CA1DF620CA9A}.Debug|Win32.Build.0 = Debug|Win32 
     703    {630857C0-6AD8-4CEE-B5F7-CA1DF620CA9A}.Debug|x64.ActiveCfg = Debug|x64 
     704    {630857C0-6AD8-4CEE-B5F7-CA1DF620CA9A}.Debug|x64.Build.0 = Debug|x64 
     705    {630857C0-6AD8-4CEE-B5F7-CA1DF620CA9A}.Debug-MemCheck|Any CPU.ActiveCfg = Debug|x64 
     706    {630857C0-6AD8-4CEE-B5F7-CA1DF620CA9A}.Debug-MemCheck|Itanium.ActiveCfg = Debug|x64 
     707    {630857C0-6AD8-4CEE-B5F7-CA1DF620CA9A}.Debug-MemCheck|Mixed Platforms.ActiveCfg = Debug|x64 
     708    {630857C0-6AD8-4CEE-B5F7-CA1DF620CA9A}.Debug-MemCheck|Mixed Platforms.Build.0 = Debug|x64 
     709    {630857C0-6AD8-4CEE-B5F7-CA1DF620CA9A}.Debug-MemCheck|Win32.ActiveCfg = Debug|x64 
     710    {630857C0-6AD8-4CEE-B5F7-CA1DF620CA9A}.Debug-MemCheck|x64.ActiveCfg = Debug|x64 
     711    {630857C0-6AD8-4CEE-B5F7-CA1DF620CA9A}.Debug-MemCheck|x64.Build.0 = Debug|x64 
     712    {630857C0-6AD8-4CEE-B5F7-CA1DF620CA9A}.Distribution|Any CPU.ActiveCfg = Debug|x64 
     713    {630857C0-6AD8-4CEE-B5F7-CA1DF620CA9A}.Distribution|Itanium.ActiveCfg = Debug|x64 
     714    {630857C0-6AD8-4CEE-B5F7-CA1DF620CA9A}.Distribution|Mixed Platforms.ActiveCfg = Debug|x64 
     715    {630857C0-6AD8-4CEE-B5F7-CA1DF620CA9A}.Distribution|Mixed Platforms.Build.0 = Debug|x64 
     716    {630857C0-6AD8-4CEE-B5F7-CA1DF620CA9A}.Distribution|Win32.ActiveCfg = Debug|x64 
     717    {630857C0-6AD8-4CEE-B5F7-CA1DF620CA9A}.Distribution|x64.ActiveCfg = Debug|x64 
     718    {630857C0-6AD8-4CEE-B5F7-CA1DF620CA9A}.Distribution|x64.Build.0 = Debug|x64 
     719    {630857C0-6AD8-4CEE-B5F7-CA1DF620CA9A}.Nightly|Any CPU.ActiveCfg = Nightly|x64 
     720    {630857C0-6AD8-4CEE-B5F7-CA1DF620CA9A}.Nightly|Itanium.ActiveCfg = Nightly|x64 
     721    {630857C0-6AD8-4CEE-B5F7-CA1DF620CA9A}.Nightly|Mixed Platforms.ActiveCfg = Nightly|x64 
     722    {630857C0-6AD8-4CEE-B5F7-CA1DF620CA9A}.Nightly|Mixed Platforms.Build.0 = Nightly|x64 
     723    {630857C0-6AD8-4CEE-B5F7-CA1DF620CA9A}.Nightly|Win32.ActiveCfg = Nightly|Win32 
     724    {630857C0-6AD8-4CEE-B5F7-CA1DF620CA9A}.Nightly|Win32.Build.0 = Nightly|Win32 
     725    {630857C0-6AD8-4CEE-B5F7-CA1DF620CA9A}.Nightly|x64.ActiveCfg = Nightly|x64 
     726    {630857C0-6AD8-4CEE-B5F7-CA1DF620CA9A}.Nightly|x64.Build.0 = Nightly|x64 
     727    {630857C0-6AD8-4CEE-B5F7-CA1DF620CA9A}.Release|Any CPU.ActiveCfg = Release|x64 
     728    {630857C0-6AD8-4CEE-B5F7-CA1DF620CA9A}.Release|Itanium.ActiveCfg = Release|x64 
     729    {630857C0-6AD8-4CEE-B5F7-CA1DF620CA9A}.Release|Mixed Platforms.ActiveCfg = Release|x64 
     730    {630857C0-6AD8-4CEE-B5F7-CA1DF620CA9A}.Release|Mixed Platforms.Build.0 = Release|x64 
     731    {630857C0-6AD8-4CEE-B5F7-CA1DF620CA9A}.Release|Win32.ActiveCfg = Release|Win32 
     732    {630857C0-6AD8-4CEE-B5F7-CA1DF620CA9A}.Release|Win32.Build.0 = Release|Win32 
     733    {630857C0-6AD8-4CEE-B5F7-CA1DF620CA9A}.Release|x64.ActiveCfg = Release|x64 
     734    {630857C0-6AD8-4CEE-B5F7-CA1DF620CA9A}.Release|x64.Build.0 = Release|x64 
     735    {B6D08289-B8AE-4391-9D07-93B22618BE58}.Debug|Any CPU.ActiveCfg = Debug|x64 
     736    {B6D08289-B8AE-4391-9D07-93B22618BE58}.Debug|Itanium.ActiveCfg = Debug|x64 
     737    {B6D08289-B8AE-4391-9D07-93B22618BE58}.Debug|Mixed Platforms.ActiveCfg = Debug|x64 
     738    {B6D08289-B8AE-4391-9D07-93B22618BE58}.Debug|Mixed Platforms.Build.0 = Debug|x64 
     739    {B6D08289-B8AE-4391-9D07-93B22618BE58}.Debug|Win32.ActiveCfg = Debug|Win32 
     740    {B6D08289-B8AE-4391-9D07-93B22618BE58}.Debug|Win32.Build.0 = Debug|Win32 
     741    {B6D08289-B8AE-4391-9D07-93B22618BE58}.Debug|x64.ActiveCfg = Debug|x64 
     742    {B6D08289-B8AE-4391-9D07-93B22618BE58}.Debug|x64.Build.0 = Debug|x64 
     743    {B6D08289-B8AE-4391-9D07-93B22618BE58}.Debug-MemCheck|Any CPU.ActiveCfg = Debug|x64 
     744    {B6D08289-B8AE-4391-9D07-93B22618BE58}.Debug-MemCheck|Itanium.ActiveCfg = Debug|x64 
     745    {B6D08289-B8AE-4391-9D07-93B22618BE58}.Debug-MemCheck|Mixed Platforms.ActiveCfg = Debug|x64 
     746    {B6D08289-B8AE-4391-9D07-93B22618BE58}.Debug-MemCheck|Mixed Platforms.Build.0 = Debug|x64 
     747    {B6D08289-B8AE-4391-9D07-93B22618BE58}.Debug-MemCheck|Win32.ActiveCfg = Debug|x64 
     748    {B6D08289-B8AE-4391-9D07-93B22618BE58}.Debug-MemCheck|x64.ActiveCfg = Debug|x64 
     749    {B6D08289-B8AE-4391-9D07-93B22618BE58}.Debug-MemCheck|x64.Build.0 = Debug|x64 
     750    {B6D08289-B8AE-4391-9D07-93B22618BE58}.Distribution|Any CPU.ActiveCfg = Debug|x64 
     751    {B6D08289-B8AE-4391-9D07-93B22618BE58}.Distribution|Itanium.ActiveCfg = Debug|x64 
     752    {B6D08289-B8AE-4391-9D07-93B22618BE58}.Distribution|Mixed Platforms.ActiveCfg = Debug|x64 
     753    {B6D08289-B8AE-4391-9D07-93B22618BE58}.Distribution|Mixed Platforms.Build.0 = Debug|x64 
     754    {B6D08289-B8AE-4391-9D07-93B22618BE58}.Distribution|Win32.ActiveCfg = Debug|x64 
     755    {B6D08289-B8AE-4391-9D07-93B22618BE58}.Distribution|x64.ActiveCfg = Debug|x64 
     756    {B6D08289-B8AE-4391-9D07-93B22618BE58}.Distribution|x64.Build.0 = Debug|x64 
     757    {B6D08289-B8AE-4391-9D07-93B22618BE58}.Nightly|Any CPU.ActiveCfg = Release|x64 
     758    {B6D08289-B8AE-4391-9D07-93B22618BE58}.Nightly|Itanium.ActiveCfg = Release|x64 
     759    {B6D08289-B8AE-4391-9D07-93B22618BE58}.Nightly|Mixed Platforms.ActiveCfg = Release|x64 
     760    {B6D08289-B8AE-4391-9D07-93B22618BE58}.Nightly|Mixed Platforms.Build.0 = Release|x64 
     761    {B6D08289-B8AE-4391-9D07-93B22618BE58}.Nightly|Win32.ActiveCfg = Release|x64 
     762    {B6D08289-B8AE-4391-9D07-93B22618BE58}.Nightly|x64.ActiveCfg = Nightly|x64 
     763    {B6D08289-B8AE-4391-9D07-93B22618BE58}.Nightly|x64.Build.0 = Nightly|x64 
     764    {B6D08289-B8AE-4391-9D07-93B22618BE58}.Release|Any CPU.ActiveCfg = Release|x64 
     765    {B6D08289-B8AE-4391-9D07-93B22618BE58}.Release|Itanium.ActiveCfg = Release|x64 
     766    {B6D08289-B8AE-4391-9D07-93B22618BE58}.Release|Mixed Platforms.ActiveCfg = Release|x64 
     767    {B6D08289-B8AE-4391-9D07-93B22618BE58}.Release|Mixed Platforms.Build.0 = Release|x64 
     768    {B6D08289-B8AE-4391-9D07-93B22618BE58}.Release|Win32.ActiveCfg = Release|Win32 
     769    {B6D08289-B8AE-4391-9D07-93B22618BE58}.Release|Win32.Build.0 = Release|Win32 
     770    {B6D08289-B8AE-4391-9D07-93B22618BE58}.Release|x64.ActiveCfg = Release|x64 
     771    {B6D08289-B8AE-4391-9D07-93B22618BE58}.Release|x64.Build.0 = Release|x64 
    764772  EndGlobalSection 
    765773  GlobalSection(SolutionProperties) = preSolution 
    766774    HideSolutionNode = FALSE 
     775  EndGlobalSection 
     776  GlobalSection(NestedProjects) = preSolution 
     777    {62B685D7-3A2E-4F3E-B2B8-B17F20C0217F} = {9757464B-C125-4307-A84A-F4181AE6A081} 
     778    {BA246C01-063A-4548-8957-32D5CC76171B} = {9757464B-C125-4307-A84A-F4181AE6A081} 
     779    {E6E588AB-EFEF-481C-9AF7-DCDCB95CFF45} = {9757464B-C125-4307-A84A-F4181AE6A081} 
     780    {2FF60AF6-09AA-49AB-B414-2E8FD01655C6} = {9757464B-C125-4307-A84A-F4181AE6A081} 
     781    {08D6246D-1B4A-47A3-965D-296DCC54A4E8} = {9757464B-C125-4307-A84A-F4181AE6A081} 
     782    {2FCAF54B-AAD3-4F59-895A-8F9CEAFDC65D} = {9757464B-C125-4307-A84A-F4181AE6A081} 
     783    {8F1C3E39-D6C6-4414-AAD2-FE03C9A8655F} = {9757464B-C125-4307-A84A-F4181AE6A081} 
     784    {05DE66AC-E55C-43B3-849F-7EC695D8B8D0} = {9757464B-C125-4307-A84A-F4181AE6A081} 
     785    {626EB00E-A4D2-4B02-9BF4-4C655CA2B7E4} = {9757464B-C125-4307-A84A-F4181AE6A081} 
     786    {6F55C9BF-57F6-4A15-A058-C83A52F539EE} = {9757464B-C125-4307-A84A-F4181AE6A081} 
     787    {26B84883-BE52-40E6-9BEE-55AD056D5751} = {9757464B-C125-4307-A84A-F4181AE6A081} 
     788    {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129} = {9757464B-C125-4307-A84A-F4181AE6A081} 
     789    {4241C6CF-EC01-4AD9-89B0-B75EBA8A5996} = {9757464B-C125-4307-A84A-F4181AE6A081} 
     790    {BBFF8362-C626-4838-B0A2-F695D638AD24} = {9757464B-C125-4307-A84A-F4181AE6A081} 
     791    {0E2B21D9-F432-4127-8E92-7716B1072510} = {9A087442-7BB2-4CF0-9F58-5D1BC3C32CD2} 
     792    {630857C0-6AD8-4CEE-B5F7-CA1DF620CA9A} = {C8DCE3D7-A802-4C5D-ABB1-B478F545B6E5} 
     793    {B6D08289-B8AE-4391-9D07-93B22618BE58} = {C8DCE3D7-A802-4C5D-ABB1-B478F545B6E5} 
    767794  EndGlobalSection 
    768795  GlobalSection(DPCodeReviewSolutionGUID) = preSolution 
  • NSClient++-2005.vcproj

    r7a156f4 r1d84e57  
    31233123      > 
    31243124    </File> 
    3125     <File 
    3126       RelativePath=".\scripts\test.lua" 
    3127       > 
    3128     </File> 
    31293125  </Files> 
    31303126  <Globals> 
  • include/SSLSocket.cpp

    r2f01f93 r1d84e57  
    135135 
    136136int simpleSSL::Socket::connect_() { 
    137   simpleSSL::SSL_init(); 
    138  
    139137  Context context; 
    140138  context.createSSLv23Client(); 
  • include/luna.h

    rf6edbcd r1d84e57  
    11//extern "C" { 
    2 #include "lua.h" 
    3 #include "lauxlib.h" 
     2#include "LUA/lua.h" 
     3#include "LUA/lauxlib.h" 
    44//} 
    55 
  • include/program_options_ex.hpp

    r5b9d247 r1d84e57  
    3131      ) 
    3232    {} 
     33    basic_command_line_parser_ex(const std::wstring args)  
     34      : boost::program_options::basic_command_line_parser<charT>(boost::program_options::split_winmain(args)) 
     35    {} 
    3336 
    3437}; 
  • modules/LUAScript/script_wrapper.hpp

    r5ac88c0a r1d84e57  
    44 
    55extern "C" { 
    6 #include "lua.h" 
    7 #include "lauxlib.h" 
    8 #include "lualib.h" 
     6#include "LUA/lua.h" 
     7#include "LUA/lauxlib.h" 
     8#include "LUA/lualib.h" 
    99} 
    1010#include "luna.h" 
  • modules/NRPEClient/NRPEClient.cpp

    r252c016 r1d84e57  
    3636} 
    3737 
    38 NRPEClient::NRPEClient() : buffer_length_(0) { 
     38NRPEClient::NRPEClient() : buffer_length_(0), bInitSSL(false) { 
    3939} 
    4040 
     
    5757  } 
    5858  return true; 
     59} 
     60void NRPEClient::initSSL() { 
     61  if (bInitSSL) 
     62    return; 
     63  simpleSSL::SSL_init(); 
     64  bInitSSL = true; 
    5965} 
    6066 
     
    188194NRPEPacket NRPEClient::send_ssl(std::wstring host, int port, int timeout, NRPEPacket packet) 
    189195{ 
     196  initSSL(); 
    190197  simpleSSL::Socket socket(true); 
    191198  socket.connect(host, port); 
  • modules/NRPEClient/NRPEClient.h

    r4c8d44d r1d84e57  
    4343    bool ssl; 
    4444    nrpe_connection_data(unsigned int buffer_length_ = 1024)  
    45       : host(_T("localhost")),  
     45      : host(_T("127.0.0.1")),  
    4646      port(5666),  
    4747      timeout(10),  
     
    7878  command_list commands; 
    7979  unsigned int buffer_length_; 
     80  bool bInitSSL; 
    8081 
    8182public: 
     
    108109  NRPEPacket send_nossl(std::wstring host, int port, int timeout, NRPEPacket packet); 
    109110  NRPEPacket send_ssl(std::wstring host, int port, int timeout, NRPEPacket packet); 
     111  void initSSL(); 
    110112 
    111113  boost::program_options::options_description NRPEClient::get_optionDesc(); 
  • modules/NSCAAgent/NSCAAgent-2005.vcproj

    rce57b1b r1d84e57  
    6969      <Tool 
    7070        Name="VCLinkerTool" 
    71         AdditionalDependencies="ws2_32.lib Crypt++.lib" 
     71        AdditionalDependencies="ws2_32.lib Crypto++.lib" 
    7272        OutputFile="../../Debug/modules/$(ProjectName).dll" 
    7373        LinkIncremental="2" 
     
    153153      <Tool 
    154154        Name="VCLinkerTool" 
    155         AdditionalDependencies="ws2_32.lib Crypt++.lib" 
     155        AdditionalDependencies="ws2_32.lib Crypto++.lib" 
    156156        OutputFile="$(OutDir)\$(ProjectName).dll" 
    157157        LinkIncremental="2" 
     
    233233      <Tool 
    234234        Name="VCLinkerTool" 
    235         AdditionalDependencies="ws2_32.lib Crypt++.lib" 
     235        AdditionalDependencies="ws2_32.lib Crypto++.lib" 
    236236        OutputFile="$(OutDir)\$(ProjectName).dll" 
    237237        LinkIncremental="1" 
     
    315315      <Tool 
    316316        Name="VCLinkerTool" 
    317         AdditionalDependencies="ws2_32.lib Crypt++.lib" 
     317        AdditionalDependencies="ws2_32.lib Crypto++.lib" 
    318318        OutputFile="$(OutDir)\$(ProjectName).dll" 
    319319        LinkIncremental="1" 
     
    396396      <Tool 
    397397        Name="VCLinkerTool" 
    398         AdditionalDependencies="ws2_32.lib Crypt++.lib" 
     398        AdditionalDependencies="ws2_32.lib Crypto++.lib" 
    399399        OutputFile="$(OutDir)\$(ProjectName).dll" 
    400400        LinkIncremental="1" 
     
    478478      <Tool 
    479479        Name="VCLinkerTool" 
    480         AdditionalDependencies="ws2_32.lib Crypt++.lib" 
     480        AdditionalDependencies="ws2_32.lib Crypto++.lib" 
    481481        OutputFile="$(OutDir)\$(ProjectName).dll" 
    482482        LinkIncremental="1" 
     
    559559      <Tool 
    560560        Name="VCLinkerTool" 
    561         AdditionalDependencies="ws2_32.lib Crypt++.lib" 
     561        AdditionalDependencies="ws2_32.lib Crypto++.lib" 
    562562        OutputFile="$(OutDir)\$(ProjectName).dll" 
    563563        LinkIncremental="1" 
     
    641641      <Tool 
    642642        Name="VCLinkerTool" 
    643         AdditionalDependencies="ws2_32.lib Crypt++.lib" 
     643        AdditionalDependencies="ws2_32.lib Crypto++.lib" 
    644644        OutputFile="$(OutDir)\$(ProjectName).dll" 
    645645        LinkIncremental="1" 
     
    650650        OptimizeReferences="2" 
    651651        EnableCOMDATFolding="2" 
    652         ImportLibrary="$(TargetDir)$(TargetName).lib" 
     652        ImportLibrary="" 
    653653        TargetMachine="17" 
    654654      /> 
     
    725725      <Tool 
    726726        Name="VCLinkerTool" 
    727         AdditionalDependencies="ws2_32.lib Crypt++.lib" 
     727        AdditionalDependencies="ws2_32.lib Crypto++.lib" 
    728728        OutputFile="$(OutDir)\$(ProjectName).dll" 
    729729        LinkIncremental="2" 
     
    809809      <Tool 
    810810        Name="VCLinkerTool" 
    811         AdditionalDependencies="ws2_32.lib Crypt++.lib" 
     811        AdditionalDependencies="ws2_32.lib Crypto++.lib" 
    812812        OutputFile="$(OutDir)\$(ProjectName).dll" 
    813813        LinkIncremental="2" 
Note: See TracChangeset for help on using the changeset viewer.