diff --git a/Corman Lisp 2.0.ism b/Corman Lisp 2.0.ism deleted file mode 100644 index 6e53aa6..0000000 Binary files a/Corman Lisp 2.0.ism and /dev/null differ diff --git a/Corman Lisp 2.01.ism b/Corman Lisp 2.01.ism deleted file mode 100644 index 939bdf2..0000000 Binary files a/Corman Lisp 2.01.ism and /dev/null differ diff --git a/Corman Lisp 2.2.ism b/Corman Lisp 2.2.ism deleted file mode 100644 index 4f70a1c..0000000 Binary files a/Corman Lisp 2.2.ism and /dev/null differ diff --git a/Corman Lisp 2.5.ise b/Corman Lisp 2.5.ise deleted file mode 100644 index 5026589..0000000 Binary files a/Corman Lisp 2.5.ise and /dev/null differ diff --git a/Corman Lisp 2.5.ism b/Corman Lisp 2.5.ism deleted file mode 100644 index a1bdd54..0000000 Binary files a/Corman Lisp 2.5.ism and /dev/null differ diff --git a/Corman Lisp 2.6.ise b/Corman Lisp 2.6.ise deleted file mode 100644 index b1769a0..0000000 Binary files a/Corman Lisp 2.6.ise and /dev/null differ diff --git a/Corman Lisp 3.02.ism b/Corman Lisp 3.02.ism new file mode 100644 index 0000000..4c0f95a Binary files /dev/null and b/Corman Lisp 3.02.ism differ diff --git a/CormanLisp.exe.manifest b/CormanLisp.exe.manifest index 61ac2b9..d45dcc3 100644 --- a/CormanLisp.exe.manifest +++ b/CormanLisp.exe.manifest @@ -2,12 +2,12 @@ - + - + diff --git a/CormanLispIDE/.DS_Store b/CormanLispIDE/.DS_Store deleted file mode 100644 index 03fbd1a..0000000 Binary files a/CormanLispIDE/.DS_Store and /dev/null differ diff --git a/CormanLispIDE/CormanLisp.rc b/CormanLispIDE/CormanLisp.rc index 71e1db0..5c5fdaa 100644 --- a/CormanLispIDE/CormanLisp.rc +++ b/CormanLispIDE/CormanLisp.rc @@ -269,15 +269,15 @@ BEGIN LTEXT "Santa Rosa, CA 95404 USA",IDC_STATIC,201,86,100,9 LTEXT "Name:",IDC_STATIC,170,99,34,8 LTEXT "Organization:",IDC_STATIC,170,112,41,8 - LTEXT "Registration Code:",IDC_STATIC,170,125,60,8 + //LTEXT "Registration Code:",IDC_STATIC,170,125,60,8 DEFPUSHBUTTON "Not Yet",IDCANCEL,308,154,50,14 EDITTEXT IDC_EDITNAME,240,96,113,12,ES_AUTOHSCROLL EDITTEXT IDC_EDITORG,240,109,113,12,ES_AUTOHSCROLL - EDITTEXT IDC_EDITREGCODE,240,122,113,12,ES_AUTOHSCROLL + //EDITTEXT IDC_EDITREGCODE,240,122,113,12,ES_AUTOHSCROLL LTEXT "Version:",IDC_STATIC,7,148,34,9 LTEXT "CormanLisp 3.0",IDC_REGVERSION,102,148,56,10 - LTEXT "Evaluation days remaining:",IDC_STATIC,7,160,85,8 - LTEXT "0",IDC_DAYSREMAINING,101,160,51,8 + //LTEXT "Evaluation days remaining:",IDC_STATIC,7,160,85,8 + //LTEXT "0",IDC_DAYSREMAINING,101,160,51,8 PUSHBUTTON "Legal Information",ID_LEGAL_INFO,161,154,64,14 END diff --git a/CormanLispIDE/CormanLisp.vcproj b/CormanLispIDE/CormanLisp.vcproj index a8262f2..c5b3e8a 100644 --- a/CormanLispIDE/CormanLisp.vcproj +++ b/CormanLispIDE/CormanLisp.vcproj @@ -82,7 +82,7 @@ OutputFile="..\CormanLisp.exe" LinkIncremental="1" SuppressStartupBanner="true" - GenerateManifest="false" + GenerateManifest="true" ManifestFile="..\CormanLisp.exe.manifest" IgnoreDefaultLibraryNames="oleacc.lib" GenerateDebugInformation="true" diff --git a/CormanLispIDE/CormanLisp.vcxproj b/CormanLispIDE/CormanLisp.vcxproj new file mode 100644 index 0000000..4449c0b --- /dev/null +++ b/CormanLispIDE/CormanLisp.vcxproj @@ -0,0 +1,174 @@ + + + + + Standard + Win32 + + + + {FF6CFCF2-F424-4B17-93FF-469DEAD1D723} + CormanLisp + MFCProj + + + + Application + v120_xp + Dynamic + NotSet + + + + + + + + + + + <_ProjectFileVersion>12.0.30501.0 + + + .\bin\ + .\bin\ + false + false + + + + _DEBUG;%(PreprocessorDefinitions) + true + true + Win32 + .\bin/CormanLisp.tlb + + + /I../include %(AdditionalOptions) + Disabled + .\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + MultiThreadedDLL + + stdafx.h + .\bin/CormanLisp.pch + .\bin/ + .\bin/ + .\bin/ + Level3 + true + ProgramDatabase + Default + + + _AFXDLL;_DEBUG;%(PreprocessorDefinitions) + 0x0409 + .\include;%(AdditionalIncludeDirectories) + + + /MACHINE:I386 %(AdditionalOptions) + ..\CormanLispServer\bin\CormanLispServer.lib;ole32.lib;..\license.lib;%(AdditionalDependencies) + ..\CormanLisp.exe + true + ..\CormanLisp.exe.manifest + oleacc.lib;%(IgnoreSpecificDefaultLibraries) + true + ..\CormanLisp.pdb + Windows + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {f914cf4d-5904-477f-a388-00c05e749d18} + false + + + {de479e27-e406-43a8-bcbd-8506ebc31038} + false + + + {e21ce9f1-f1af-487a-8c01-23a4d8a23cc7} + false + + + {99bd3558-deee-4f99-913e-dac97a12926e} + false + + + + + + \ No newline at end of file diff --git a/CormanLispIDE/CormanLisp.vcxproj.filters b/CormanLispIDE/CormanLisp.vcxproj.filters new file mode 100644 index 0000000..b8d2992 --- /dev/null +++ b/CormanLispIDE/CormanLisp.vcxproj.filters @@ -0,0 +1,220 @@ + + + + + {ebb8c28d-1fb1-4dba-8b69-7ac595019c2c} + cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90 + + + {f0eacdc0-f9ea-4099-9212-a91b7a214344} + h;hpp;hxx;hm;inl;fi;fd + + + {cbe399e0-4a35-4ded-bacc-93c776d113c9} + ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe + + + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + + + src + + + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + \ No newline at end of file diff --git a/CormanLispIDE/CormanLisp_vc9.sln b/CormanLispIDE/CormanLisp_vc9.sln deleted file mode 100644 index 43bf5b6..0000000 --- a/CormanLispIDE/CormanLisp_vc9.sln +++ /dev/null @@ -1,17 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual Studio 2008 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CormanLisp_vc9", "CormanLisp_vc9.vcproj", "{FF6CFCF2-F424-4B17-93FF-469DEAD1D723}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Standard|Win32 = Standard|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {FF6CFCF2-F424-4B17-93FF-469DEAD1D723}.Standard|Win32.ActiveCfg = Standard|Win32 - {FF6CFCF2-F424-4B17-93FF-469DEAD1D723}.Standard|Win32.Build.0 = Standard|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/CormanLispIDE/CormanLisp_vc9.vcproj b/CormanLispIDE/CormanLisp_vc9.vcproj deleted file mode 100644 index 31f3217..0000000 --- a/CormanLispIDE/CormanLisp_vc9.vcproj +++ /dev/null @@ -1,399 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/CormanLispIDE/RES/.DS_Store b/CormanLispIDE/RES/.DS_Store deleted file mode 100644 index 81d76c2..0000000 Binary files a/CormanLispIDE/RES/.DS_Store and /dev/null differ diff --git a/CormanLispIDE/include/RegistrationDialog.h b/CormanLispIDE/include/RegistrationDialog.h index ebeaf87..2274e8a 100644 --- a/CormanLispIDE/include/RegistrationDialog.h +++ b/CormanLispIDE/include/RegistrationDialog.h @@ -40,9 +40,9 @@ class RegistrationDialog : public CDialog CEdit* m_name; CEdit* m_organization; - CEdit* m_registrationCode; +// CEdit* m_registrationCode; bool m_registrationApproved; - CTime m_expirationDate; +// CTime m_expirationDate; }; class AboutDialog : public CDialog diff --git a/CormanLispIDE/include/Stdafx.h b/CormanLispIDE/include/Stdafx.h index bec4c4c..6029ec3 100644 --- a/CormanLispIDE/include/Stdafx.h +++ b/CormanLispIDE/include/Stdafx.h @@ -10,6 +10,6 @@ // #define VC_EXTRALEAN -#define WINVER 0x500 // require Windows 2000 or later +#define WINVER 0x0501 // require Windows XP or later #include // MFC core and standard components \ No newline at end of file diff --git a/CormanLispIDE/src/RegistrationDialog.cpp b/CormanLispIDE/src/RegistrationDialog.cpp index d4f5efd..4e11469 100644 --- a/CormanLispIDE/src/RegistrationDialog.cpp +++ b/CormanLispIDE/src/RegistrationDialog.cpp @@ -37,7 +37,7 @@ BOOL RegistrationDialog::OnInitDialog() } m_name = (CEdit*)GetDlgItem(IDC_EDITNAME); m_organization = (CEdit*)GetDlgItem(IDC_EDITORG); - m_registrationCode = (CEdit*)GetDlgItem(IDC_EDITREGCODE); +// m_registrationCode = (CEdit*)GetDlgItem(IDC_EDITREGCODE); char namebuf[256]; unsigned long length = 256; @@ -54,7 +54,7 @@ BOOL RegistrationDialog::OnInitDialog() RegistrationInfo info; GetRegistrationInfo(&info); - +/* if (!(info.isRegistered)) { item = GetDlgItem(IDC_DAYSREMAINING); @@ -81,7 +81,7 @@ BOOL RegistrationDialog::OnInitDialog() item->SetWindowText(buf); } } - +*/ return FALSE; } @@ -90,6 +90,8 @@ void RegistrationDialog::OnChar(UINT nChar, UINT nRepCnt, UINT nFlags) CDialog::OnChar(nChar, nRepCnt, nFlags); } +#define EncryptionKey_3_0 "EmitIdy" + void RegistrationDialog::OnOK() { CString name; @@ -97,7 +99,21 @@ void RegistrationDialog::OnOK() CString registrationCode; m_name->GetWindowText(name); m_organization->GetWindowText(organization); - m_registrationCode->GetWindowText(registrationCode); +// m_registrationCode->GetWindowText(registrationCode); + + HMODULE module = LoadLibrary("license.dll"); + long code; + + if (module) + { + FARPROC proc = GetProcAddress(module, "generateRegistrationCode"); + if (proc) + { + code = reinterpret_cast(proc)(name, organization, EncryptionKey_3_0); + } + } + + registrationCode.Format("%ld", code); if (!registrationOK(name, organization, registrationCode)) { diff --git a/CormanLispServer/CormanLispServer.vcxproj b/CormanLispServer/CormanLispServer.vcxproj new file mode 100644 index 0000000..fb3b85e --- /dev/null +++ b/CormanLispServer/CormanLispServer.vcxproj @@ -0,0 +1,135 @@ + + + + + Standard + Win32 + + + + {F914CF4D-5904-477F-A388-00C05E749D18} + CormanLispServer + + + + DynamicLibrary + v120_xp + false + + + + + + + + + + + <_ProjectFileVersion>12.0.30501.0 + + + .\bin\ + .\bin\ + false + false + false + + + + makestaticlib + + .\bin\CormanLispStatic.lib;%(Outputs) + + + _DEBUG;%(PreprocessorDefinitions) + true + true + Win32 + .\./bin/CormanLispServer.tlb + + + /I./include /I../include %(AdditionalOptions) + Disabled + WIN32;NDEBUG;_WINDOWS;_CormanLispServer;%(PreprocessorDefinitions) + MultiThreadedDLL + false + + stdafx.h + .\./bin/CormanLispServer.pch + .\./bin/ + .\./bin/ + .\./bin/ + Level3 + true + ProgramDatabase + + + 0x0409 + + + /MACHINE:I386 /safeseh:no %(AdditionalOptions) + ../zlib/zlib.lib;odbc32.lib;odbccp32.lib;msvcrt.lib;%(AdditionalDependencies) + ../CormanLispServer.dll + true + + true + .\CormanLispServer.def + true + ../CormanLispServer.pdb + Windows + .\./bin/CormanLispServer.lib + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + res + + + + + {99bd3558-deee-4f99-913e-dac97a12926e} + false + + + + + + \ No newline at end of file diff --git a/CormanLispServer/CormanLispServer.vcxproj.filters b/CormanLispServer/CormanLispServer.vcxproj.filters new file mode 100644 index 0000000..874edd9 --- /dev/null +++ b/CormanLispServer/CormanLispServer.vcxproj.filters @@ -0,0 +1,118 @@ + + + + + {e39c1959-4e56-4432-8b89-9ff155c2d005} + *.h + + + {1cf6f487-b5da-4bb2-8ba7-8456720debd0} + *.cpp + + + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + + + include + + + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + + + + \ No newline at end of file diff --git a/CormanLispServer/CormanLispServer_vc9.sln b/CormanLispServer/CormanLispServer_vc9.sln deleted file mode 100644 index a450470..0000000 --- a/CormanLispServer/CormanLispServer_vc9.sln +++ /dev/null @@ -1,17 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual Studio 2008 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CormanLispServer_vc9", "CormanLispServer_vc9.vcproj", "{F914CF4D-5904-477F-A388-00C05E749D18}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Standard|Win32 = Standard|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {F914CF4D-5904-477F-A388-00C05E749D18}.Standard|Win32.ActiveCfg = Standard|Win32 - {F914CF4D-5904-477F-A388-00C05E749D18}.Standard|Win32.Build.0 = Standard|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/CormanLispServer/CormanLispServer_vc9.vcproj b/CormanLispServer/CormanLispServer_vc9.vcproj deleted file mode 100644 index 9f78a85..0000000 --- a/CormanLispServer/CormanLispServer_vc9.vcproj +++ /dev/null @@ -1,274 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/CormanLispServer/src/Gc.cpp b/CormanLispServer/src/Gc.cpp index 480d2de..875f881 100644 --- a/CormanLispServer/src/Gc.cpp +++ b/CormanLispServer/src/Gc.cpp @@ -3313,7 +3313,7 @@ void writeHeap(FILE* writeHeap_os) header.pageMapSize = pageTableSize; header.foreignBlocksStart = header.pageMapStart + header.pageMapSize; header.foreignBlocksSize = CHeapBlocksSize; - strcpy_s(header.copyright, sizeof(header.copyright), LispImageCopyright); + strncpy_s(header.copyright, sizeof(header.copyright), LispImageCopyright, _TRUNCATE); header.compressionType = 0; header.compressedSize = 0; header.uncompressedSize = staticSize + sizeof(heapAddress) diff --git a/Microsoft.VC80.CRT/Microsoft.VC80.CRT.manifest b/Microsoft.VC80.CRT/Microsoft.VC80.CRT.manifest new file mode 100644 index 0000000..6a8a0e2 --- /dev/null +++ b/Microsoft.VC80.CRT/Microsoft.VC80.CRT.manifest @@ -0,0 +1,8 @@ + + + + + n9On8FItNsK/DmT8UQxu6jYDtWQ= + 0KJ/VTwP4OUHx98HlIW2AdW1kuY= + YJuB+9Os2oxW4mY+2oC/r8lICZE= + \ No newline at end of file diff --git a/Microsoft.VC80.CRT/msvcm80.dll b/Microsoft.VC80.CRT/msvcm80.dll new file mode 100644 index 0000000..c751385 Binary files /dev/null and b/Microsoft.VC80.CRT/msvcm80.dll differ diff --git a/Microsoft.VC80.CRT/msvcp80.dll b/Microsoft.VC80.CRT/msvcp80.dll new file mode 100644 index 0000000..f0b52eb Binary files /dev/null and b/Microsoft.VC80.CRT/msvcp80.dll differ diff --git a/Microsoft.VC80.CRT/msvcr80.dll b/Microsoft.VC80.CRT/msvcr80.dll new file mode 100644 index 0000000..53c005e Binary files /dev/null and b/Microsoft.VC80.CRT/msvcr80.dll differ diff --git a/Microsoft.VC80.MFC/Microsoft.VC80.MFC.manifest b/Microsoft.VC80.MFC/Microsoft.VC80.MFC.manifest new file mode 100644 index 0000000..a5124e7 --- /dev/null +++ b/Microsoft.VC80.MFC/Microsoft.VC80.MFC.manifest @@ -0,0 +1,9 @@ + + + + + 1ojXfwyqiX5uwu0seJ53tIMEcB8= + AltS/xFid2D3AGUQ6aUhtVQjD+4= + Y8H6ZS9/W9H8y+NhgWOxGaeaORw= + xsOzrzfyAgJe47nMR3YRxsX7R8I= + \ No newline at end of file diff --git a/Microsoft.VC80.MFC/mfc80.dll b/Microsoft.VC80.MFC/mfc80.dll new file mode 100644 index 0000000..712c07b Binary files /dev/null and b/Microsoft.VC80.MFC/mfc80.dll differ diff --git a/Microsoft.VC80.MFC/mfc80u.dll b/Microsoft.VC80.MFC/mfc80u.dll new file mode 100644 index 0000000..7fcaf42 Binary files /dev/null and b/Microsoft.VC80.MFC/mfc80u.dll differ diff --git a/Microsoft.VC80.MFC/mfcm80.dll b/Microsoft.VC80.MFC/mfcm80.dll new file mode 100644 index 0000000..0a34411 Binary files /dev/null and b/Microsoft.VC80.MFC/mfcm80.dll differ diff --git a/Microsoft.VC80.MFC/mfcm80u.dll b/Microsoft.VC80.MFC/mfcm80u.dll new file mode 100644 index 0000000..981b82a Binary files /dev/null and b/Microsoft.VC80.MFC/mfcm80u.dll differ diff --git a/clboot/clboot.vcxproj b/clboot/clboot.vcxproj new file mode 100644 index 0000000..3c4cf49 --- /dev/null +++ b/clboot/clboot.vcxproj @@ -0,0 +1,101 @@ + + + + + Standard + Win32 + + + + {95914474-F1BA-4190-8FF3-4F03386FC8D6} + clboot + + + + Application + v120_xp + false + + + + + + + + + + + <_ProjectFileVersion>12.0.30501.0 + + + .\bin\ + .\bin\ + false + false + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + Win32 + .\Release/clboot.tlb + + + OnlyExplicitInline + ../include/;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + + .\Release/clboot.pch + .\Release/ + .\Release/ + .\Release/ + Level3 + true + Default + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + /MACHINE:I386 %(AdditionalOptions) + odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + ../clboot.exe + true + ..\clboot.exe.manifest + .\Release/clboot.pdb + Windows + + + clboot.exe.manifest;%(AdditionalManifestFiles) + + + Adding manifest. + mt /outputresource:"../clboot.exe%3b#1" /manifest clboot.exe.manifest + + + + + + + + {f914cf4d-5904-477f-a388-00c05e749d18} + false + + + {e21ce9f1-f1af-487a-8c01-23a4d8a23cc7} + false + + + {99bd3558-deee-4f99-913e-dac97a12926e} + false + + + + + + \ No newline at end of file diff --git a/clboot/clboot_vc9.sln b/clboot/clboot_vc9.sln deleted file mode 100644 index 85c1a0a..0000000 --- a/clboot/clboot_vc9.sln +++ /dev/null @@ -1,17 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual Studio 2008 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "clboot_vc9", "clboot_vc9.vcproj", "{95914474-F1BA-4190-8FF3-4F03386FC8D6}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Standard|Win32 = Standard|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {95914474-F1BA-4190-8FF3-4F03386FC8D6}.Standard|Win32.ActiveCfg = Standard|Win32 - {95914474-F1BA-4190-8FF3-4F03386FC8D6}.Standard|Win32.Build.0 = Standard|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/clboot/clboot_vc9.vcproj b/clboot/clboot_vc9.vcproj deleted file mode 100644 index dda49e9..0000000 --- a/clboot/clboot_vc9.vcproj +++ /dev/null @@ -1,125 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/clbootapp/clbootapp.vcxproj b/clbootapp/clbootapp.vcxproj new file mode 100644 index 0000000..51829ac --- /dev/null +++ b/clbootapp/clbootapp.vcxproj @@ -0,0 +1,102 @@ + + + + + Standard + Win32 + + + + {AE675399-2236-4F77-BBAD-B665F9C1022C} + clbootapp + + + + Application + v120_xp + false + MultiByte + + + + + + + + + + + <_ProjectFileVersion>12.0.30501.0 + + + .\bin\ + .\bin\ + false + false + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + Win32 + .\Release/clbootapp.tlb + + + OnlyExplicitInline + ../include/;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + + .\Release/clbootapp.pch + .\Release/ + .\Release/ + .\Release/ + Level3 + true + Default + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + /MACHINE:I386 %(AdditionalOptions) + ../CormanLispServer/bin/cormanlispstatic.lib;../zlib/zlib.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + ../clbootapp.exe + true + ..\clbootapp.exe.manifest + .\Release/clbootapp.pdb + Windows + + + clbootapp.exe.manifest;%(AdditionalManifestFiles) + + + Adding manifest. + mt /outputresource:"../clbootapp.exe%3b#1" /manifest clbootapp.exe.manifest + + + + + + + + {f914cf4d-5904-477f-a388-00c05e749d18} + false + + + {e21ce9f1-f1af-487a-8c01-23a4d8a23cc7} + false + + + {99bd3558-deee-4f99-913e-dac97a12926e} + false + + + + + + \ No newline at end of file diff --git a/clbootapp/clbootapp.vcxproj.filters b/clbootapp/clbootapp.vcxproj.filters new file mode 100644 index 0000000..75d80c3 --- /dev/null +++ b/clbootapp/clbootapp.vcxproj.filters @@ -0,0 +1,22 @@ + + + + + {6cf21a25-e318-4810-b687-f975d7629683} + cpp;c;cxx;rc;def;r;odl;idl;hpj;bat + + + {937d265b-9feb-49e8-a1d1-a9bba24b2424} + h;hpp;hxx;hm;inl + + + {be29efc9-14be-4ebb-95cc-1ae4d3d16d7d} + ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe + + + + + Source Files + + + \ No newline at end of file diff --git a/clbootapp/clbootapp_vc9.sln b/clbootapp/clbootapp_vc9.sln deleted file mode 100644 index 8d1da0f..0000000 --- a/clbootapp/clbootapp_vc9.sln +++ /dev/null @@ -1,17 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual Studio 2008 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "clbootapp_vc9", "clbootapp_vc9.vcproj", "{AE675399-2236-4F77-BBAD-B665F9C1022C}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Standard|Win32 = Standard|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {AE675399-2236-4F77-BBAD-B665F9C1022C}.Standard|Win32.ActiveCfg = Standard|Win32 - {AE675399-2236-4F77-BBAD-B665F9C1022C}.Standard|Win32.Build.0 = Standard|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/clbootapp/clbootapp_vc9.vcproj b/clbootapp/clbootapp_vc9.vcproj deleted file mode 100644 index b09c09b..0000000 --- a/clbootapp/clbootapp_vc9.vcproj +++ /dev/null @@ -1,141 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/clconsole/clconsole.vcxproj b/clconsole/clconsole.vcxproj new file mode 100644 index 0000000..bdc30c9 --- /dev/null +++ b/clconsole/clconsole.vcxproj @@ -0,0 +1,104 @@ + + + + + Standard + Win32 + + + + {EE43A1A5-ED5E-4247-B0CF-FB5F3EC80A03} + clconsole + + + + Application + v120_xp + false + MultiByte + + + + + + + + + + + <_ProjectFileVersion>12.0.30501.0 + + + .\bin\ + .\bin\ + false + false + true + + + + + + + + .\Release/clconsole.tlb + + + OnlyExplicitInline + ../include/;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + .\Release/clconsole.pch + .\Release/ + .\Release/ + .\Release/ + Level3 + true + ProgramDatabase + Default + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + /MACHINE:I386 %(AdditionalOptions) + odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + ../clconsole.exe + true + clconsole.exe.manifest + true + ../clconsole.pdb + Console + + + clconsole.exe.manifest;%(AdditionalManifestFiles) + + + Adding manifest. + mt /outputresource:"../clconsole.exe%3b#1" /manifest clconsole.exe.manifest + + + + + + + + {f914cf4d-5904-477f-a388-00c05e749d18} + false + + + {e21ce9f1-f1af-487a-8c01-23a4d8a23cc7} + false + + + {99bd3558-deee-4f99-913e-dac97a12926e} + false + + + + + + \ No newline at end of file diff --git a/clconsole/clconsole_vc9.sln b/clconsole/clconsole_vc9.sln deleted file mode 100644 index 86dd900..0000000 --- a/clconsole/clconsole_vc9.sln +++ /dev/null @@ -1,17 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual Studio 2008 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "clconsole_vc9", "clconsole_vc9.vcproj", "{EE43A1A5-ED5E-4247-B0CF-FB5F3EC80A03}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Standard|Win32 = Standard|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {EE43A1A5-ED5E-4247-B0CF-FB5F3EC80A03}.Standard|Win32.ActiveCfg = Standard|Win32 - {EE43A1A5-ED5E-4247-B0CF-FB5F3EC80A03}.Standard|Win32.Build.0 = Standard|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/clconsole/clconsole_vc9.vcproj b/clconsole/clconsole_vc9.vcproj deleted file mode 100644 index 4c7aea4..0000000 --- a/clconsole/clconsole_vc9.vcproj +++ /dev/null @@ -1,127 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/clconsoleapp/clconsoleapp.vcxproj b/clconsoleapp/clconsoleapp.vcxproj new file mode 100644 index 0000000..163d86b --- /dev/null +++ b/clconsoleapp/clconsoleapp.vcxproj @@ -0,0 +1,101 @@ + + + + + Standard + Win32 + + + + {C31B2675-B04B-45F1-BBB2-35F099375CF8} + clconsoleapp + + + + Application + v120_xp + false + MultiByte + + + + + + + + + + + <_ProjectFileVersion>12.0.30501.0 + + + .\bin\ + .\bin\ + false + false + + + + + + + + .\Release/clconsoleapp.tlb + + + OnlyExplicitInline + ../include/;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + + .\Release/ + .\Release/ + .\Release/ + Level3 + true + Default + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + /MACHINE:I386 %(AdditionalOptions) + ../CormanLispServer/bin/cormanlispstatic.lib;../zlib/zlib.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + ../clconsoleapp.exe + true + ..\clconsoleapp.exe.manifest + ../clconsoleapp.pdb + Console + + + clconsoleapp.exe.manifest;%(AdditionalManifestFiles) + + + Adding manifest. + mt /outputresource:"../clconsoleapp.exe%3b#1" /manifest clconsoleapp.exe.manifest + + + + + + + + {f914cf4d-5904-477f-a388-00c05e749d18} + false + + + {e21ce9f1-f1af-487a-8c01-23a4d8a23cc7} + false + + + {99bd3558-deee-4f99-913e-dac97a12926e} + false + + + + + + \ No newline at end of file diff --git a/clconsoleapp/clconsoleapp_vc9.sln b/clconsoleapp/clconsoleapp_vc9.sln deleted file mode 100644 index 5893bb6..0000000 --- a/clconsoleapp/clconsoleapp_vc9.sln +++ /dev/null @@ -1,17 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual Studio 2008 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "clconsoleapp_vc9", "clconsoleapp_vc9.vcproj", "{C31B2675-B04B-45F1-BBB2-35F099375CF8}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Standard|Win32 = Standard|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {C31B2675-B04B-45F1-BBB2-35F099375CF8}.Standard|Win32.ActiveCfg = Standard|Win32 - {C31B2675-B04B-45F1-BBB2-35F099375CF8}.Standard|Win32.Build.0 = Standard|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/clconsoleapp/clconsoleapp_vc9.vcproj b/clconsoleapp/clconsoleapp_vc9.vcproj deleted file mode 100644 index 97fe523..0000000 --- a/clconsoleapp/clconsoleapp_vc9.vcproj +++ /dev/null @@ -1,124 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/copyrelease.bat b/copyrelease.bat index 968acf4..0a198bc 100644 --- a/copyrelease.bat +++ b/copyrelease.bat @@ -6,6 +6,7 @@ echo Copying deployment files to Release rmdir /s /q %1 mkdir %1 copy CormanLisp.exe %1 +copy CormanLisp.exe.manifest %1 copy CormanLisp.img %1 copy clboot.exe %1 copy clbootapp.exe %1 @@ -14,9 +15,10 @@ copy clconsoleapp.exe %1 copy CormanLispServer.dll %1 copy dlltemplate.dll %1 copy license.dll %1 +copy RDNZL.dll %1 copy init.lisp %1 copy makeall.bat %1 -copy *.ism %1 +rem copy *.ism %1 copy HyperSpec-6-0.tar.gz %1 mkdir %1\clboot copy clboot\clboot.cpp %1\clboot @@ -49,12 +51,12 @@ mkdir %1\documentation copy documentation\*.txt %1\documentation copy documentation\CormanLisp.pdf %1\documentation copy documentation\parse.html %1\documentation -mkdir %1\utilities -xcopy /s utilities\*.* %1\utilities -mkdir %1\examples -xcopy /s examples\*.* %1\examples -mkdir %1\examples\gui -copy examples\gui\*.* %1\examples\gui +mkdir "%1\Utilities" +xcopy /s Utilities\*.* "%1\Utilities" +mkdir "%1\Examples" +xcopy /s Examples\*.* "%1\Examples" +mkdir "%1\Examples\GUI" +copy Examples\GUI\*.* "%1\Examples\GUI" mkdir %1\include copy include\*.h %1\include mkdir %1\Libraries @@ -63,8 +65,8 @@ mkdir %1\Modules copy Modules\*.lisp %1\Modules copy Modules\*.dll %1\Modules copy Modules\*.txt %1\Modules -mkdir %1\sys -copy sys\*.lisp %1\sys +mkdir "%1\Sys" +copy Sys\*.lisp "%1\Sys" mkdir %1\test copy test\*.lisp %1\test mkdir %1\zlib @@ -74,6 +76,11 @@ copy zlib\ChangeLog %1\zlib copy zlib\Makefile %1\zlib copy zlib\README %1\zlib copy zlib\zlib.vcproj %1\zlib -mkdir %1\zlib\doc -copy zlib\doc\*.doc %1\zlib\doc +rem mkdir %1\zlib\doc +rem copy zlib\doc\*.doc %1\zlib\doc +mkdir "%1\Microsoft.VC80.CRT" +xcopy /s Microsoft.VC80.CRT\*.* "%1\Microsoft.VC80.CRT" +mkdir "%1\Microsoft.VC80.MFC" +xcopy /s Microsoft.VC80.MFC\*.* "%1\Microsoft.VC80.MFC" + rem touch -t 200203151151 -recurse %1/*.* \ No newline at end of file diff --git a/dlltemplate/dlltemplate.vcxproj b/dlltemplate/dlltemplate.vcxproj new file mode 100644 index 0000000..7108d37 --- /dev/null +++ b/dlltemplate/dlltemplate.vcxproj @@ -0,0 +1,83 @@ + + + + + Standard + Win32 + + + + {DE479E27-E406-43A8-BCBD-8506EBC31038} + dlltemplate + ManagedCProj + + + + DynamicLibrary + v120_xp + NotSet + false + + + + + + + + + + + <_ProjectFileVersion>12.0.30501.0 + + + .\bin\ + .\bin\ + false + false + false + + + + Disabled + OnlyExplicitInline + WIN32;_DEBUG;%(PreprocessorDefinitions) + false + MultiThreadedDLL + false + Level3 + + + msvcrt.lib;%(AdditionalDependencies) + ../dlltemplate.dll + + true + dlltemplate.def + false + Windows + DllMain + + + + + + + + + + + {f914cf4d-5904-477f-a388-00c05e749d18} + false + + + {e21ce9f1-f1af-487a-8c01-23a4d8a23cc7} + false + + + {99bd3558-deee-4f99-913e-dac97a12926e} + false + + + + + + \ No newline at end of file diff --git a/dlltemplate/dlltemplate.vcxproj.filters b/dlltemplate/dlltemplate.vcxproj.filters new file mode 100644 index 0000000..f19a328 --- /dev/null +++ b/dlltemplate/dlltemplate.vcxproj.filters @@ -0,0 +1,27 @@ + + + + + {6cfd180b-de87-416e-b249-05f82161fa20} + cpp;c;cxx;def;odl;idl;hpj;bat;asm + + + {61c602d2-bc0d-430c-ba2c-37ef61edd90d} + h;hpp;hxx;hm;inl;inc + + + {4956f130-a690-4db8-a013-73c24b6d36d5} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;r + + + + + Source Files + + + + + Source Files + + + \ No newline at end of file diff --git a/dlltemplate/dlltemplate_vc9.sln b/dlltemplate/dlltemplate_vc9.sln deleted file mode 100644 index 855bd4b..0000000 --- a/dlltemplate/dlltemplate_vc9.sln +++ /dev/null @@ -1,17 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual Studio 2008 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dlltemplate_vc9", "dlltemplate_vc9.vcproj", "{DE479E27-E406-43A8-BCBD-8506EBC31038}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Standard|Win32 = Standard|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {DE479E27-E406-43A8-BCBD-8506EBC31038}.Standard|Win32.ActiveCfg = Standard|Win32 - {DE479E27-E406-43A8-BCBD-8506EBC31038}.Standard|Win32.Build.0 = Standard|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/dlltemplate/dlltemplate_vc9.vcproj b/dlltemplate/dlltemplate_vc9.vcproj deleted file mode 100644 index 11da34f..0000000 --- a/dlltemplate/dlltemplate_vc9.vcproj +++ /dev/null @@ -1,130 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/documentation/CormanLisp.doc b/documentation/CormanLisp.doc index 1ab6313..c9f27e3 100644 Binary files a/documentation/CormanLisp.doc and b/documentation/CormanLisp.doc differ diff --git a/documentation/CormanLisp.pdf b/documentation/CormanLisp.pdf index 5d5a04d..49c07c4 100644 Binary files a/documentation/CormanLisp.pdf and b/documentation/CormanLisp.pdf differ diff --git a/documentation/new features.doc b/documentation/new features.doc deleted file mode 100644 index 9f8e74b..0000000 Binary files a/documentation/new features.doc and /dev/null differ diff --git a/license/license.cpp b/license/license.cpp index 7aedfeb..239227f 100644 --- a/license/license.cpp +++ b/license/license.cpp @@ -48,7 +48,8 @@ static bool InstallTimeout(int days); static EncryptDES des; -static long generateRegistrationCode(const char* name, +extern "C" long __declspec(dllexport) +generateRegistrationCode(const char* name, const char* organization, const char* key) { static char buf[4096]; diff --git a/license/license.vcxproj b/license/license.vcxproj new file mode 100644 index 0000000..c79b078 --- /dev/null +++ b/license/license.vcxproj @@ -0,0 +1,83 @@ + + + + + Standard + Win32 + + + + {E21CE9F1-F1AF-487A-8C01-23A4D8A23CC7} + license + Win32Proj + + + + DynamicLibrary + v120_xp + NotSet + + + + + + + + + + + <_ProjectFileVersion>12.0.30501.0 + + + ..\ + .\bin\ + false + false + false + + + + Disabled + OnlyExplicitInline + false + WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + MultiThreaded + true + + Level3 + ProgramDatabase + + + /IMPLIB:"../license.lib" %(AdditionalOptions) + $(OutDir)license.dll + + license.def + false + Windows + true + true + MachineX86 + + + + + + + + + + + + + + + + {99bd3558-deee-4f99-913e-dac97a12926e} + false + + + + + + \ No newline at end of file diff --git a/license/license.vcxproj.filters b/license/license.vcxproj.filters new file mode 100644 index 0000000..80159b5 --- /dev/null +++ b/license/license.vcxproj.filters @@ -0,0 +1,38 @@ + + + + + {0ab62580-4482-4b5f-a169-3ea25a320e42} + cpp;c;cxx;def;odl;idl;hpj;bat;asm + + + {258c8c22-0649-413e-9b0a-3e505a38b2c2} + h;hpp;hxx;hm;inl;inc + + + {96a86cb3-a7f6-4994-bc07-afeac8abf1c3} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe + + + + + Source Files + + + Source Files + + + + + Source Files + + + + + Header Files + + + Header Files + + + \ No newline at end of file diff --git a/license/license_vc9.sln b/license/license_vc9.sln deleted file mode 100644 index 9c09398..0000000 --- a/license/license_vc9.sln +++ /dev/null @@ -1,17 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual Studio 2008 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "license_vc9", "license_vc9.vcproj", "{E21CE9F1-F1AF-487A-8C01-23A4D8A23CC7}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Standard|Win32 = Standard|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {E21CE9F1-F1AF-487A-8C01-23A4D8A23CC7}.Standard|Win32.ActiveCfg = Standard|Win32 - {E21CE9F1-F1AF-487A-8C01-23A4D8A23CC7}.Standard|Win32.Build.0 = Standard|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/license/license_vc9.vcproj b/license/license_vc9.vcproj deleted file mode 100644 index 14b46b8..0000000 --- a/license/license_vc9.vcproj +++ /dev/null @@ -1,146 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src_vc12.sln b/src_vc12.sln new file mode 100644 index 0000000..b8f3234 --- /dev/null +++ b/src_vc12.sln @@ -0,0 +1,51 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2013 +VisualStudioVersion = 12.0.31101.0 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "zlib\zlib.vcxproj", "{99BD3558-DEEE-4F99-913E-DAC97A12926E}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CormanLispServer", "CormanLispServer\CormanLispServer.vcxproj", "{F914CF4D-5904-477F-A388-00C05E749D18}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "license", "license\license.vcxproj", "{E21CE9F1-F1AF-487A-8C01-23A4D8A23CC7}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dlltemplate", "dlltemplate\dlltemplate.vcxproj", "{DE479E27-E406-43A8-BCBD-8506EBC31038}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "clboot", "clboot\clboot.vcxproj", "{95914474-F1BA-4190-8FF3-4F03386FC8D6}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "clbootapp", "clbootapp\clbootapp.vcxproj", "{AE675399-2236-4F77-BBAD-B665F9C1022C}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "clconsole", "clconsole\clconsole.vcxproj", "{EE43A1A5-ED5E-4247-B0CF-FB5F3EC80A03}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "clconsoleapp", "clconsoleapp\clconsoleapp.vcxproj", "{C31B2675-B04B-45F1-BBB2-35F099375CF8}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CormanLisp", "CormanLispIDE\CormanLisp.vcxproj", "{FF6CFCF2-F424-4B17-93FF-469DEAD1D723}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Standard|Win32 = Standard|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {99BD3558-DEEE-4F99-913E-DAC97A12926E}.Standard|Win32.ActiveCfg = Standard|Win32 + {99BD3558-DEEE-4F99-913E-DAC97A12926E}.Standard|Win32.Build.0 = Standard|Win32 + {F914CF4D-5904-477F-A388-00C05E749D18}.Standard|Win32.ActiveCfg = Standard|Win32 + {F914CF4D-5904-477F-A388-00C05E749D18}.Standard|Win32.Build.0 = Standard|Win32 + {E21CE9F1-F1AF-487A-8C01-23A4D8A23CC7}.Standard|Win32.ActiveCfg = Standard|Win32 + {E21CE9F1-F1AF-487A-8C01-23A4D8A23CC7}.Standard|Win32.Build.0 = Standard|Win32 + {DE479E27-E406-43A8-BCBD-8506EBC31038}.Standard|Win32.ActiveCfg = Standard|Win32 + {DE479E27-E406-43A8-BCBD-8506EBC31038}.Standard|Win32.Build.0 = Standard|Win32 + {95914474-F1BA-4190-8FF3-4F03386FC8D6}.Standard|Win32.ActiveCfg = Standard|Win32 + {95914474-F1BA-4190-8FF3-4F03386FC8D6}.Standard|Win32.Build.0 = Standard|Win32 + {AE675399-2236-4F77-BBAD-B665F9C1022C}.Standard|Win32.ActiveCfg = Standard|Win32 + {AE675399-2236-4F77-BBAD-B665F9C1022C}.Standard|Win32.Build.0 = Standard|Win32 + {EE43A1A5-ED5E-4247-B0CF-FB5F3EC80A03}.Standard|Win32.ActiveCfg = Standard|Win32 + {EE43A1A5-ED5E-4247-B0CF-FB5F3EC80A03}.Standard|Win32.Build.0 = Standard|Win32 + {C31B2675-B04B-45F1-BBB2-35F099375CF8}.Standard|Win32.ActiveCfg = Standard|Win32 + {C31B2675-B04B-45F1-BBB2-35F099375CF8}.Standard|Win32.Build.0 = Standard|Win32 + {FF6CFCF2-F424-4B17-93FF-469DEAD1D723}.Standard|Win32.ActiveCfg = Standard|Win32 + {FF6CFCF2-F424-4B17-93FF-469DEAD1D723}.Standard|Win32.Build.0 = Standard|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/src_vc9.sln b/src_vc9.sln deleted file mode 100644 index d20c77b..0000000 --- a/src_vc9.sln +++ /dev/null @@ -1,85 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual Studio 2008 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib_vc9", "zlib\zlib_vc9.vcproj", "{99BD3558-DEEE-4F99-913E-DAC97A12926E}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CormanLispServer_vc9", "CormanLispServer\CormanLispServer_vc9.vcproj", "{F914CF4D-5904-477F-A388-00C05E749D18}" - ProjectSection(ProjectDependencies) = postProject - {99BD3558-DEEE-4F99-913E-DAC97A12926E} = {99BD3558-DEEE-4F99-913E-DAC97A12926E} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "license_vc9", "license\license_vc9.vcproj", "{E21CE9F1-F1AF-487A-8C01-23A4D8A23CC7}" - ProjectSection(ProjectDependencies) = postProject - {99BD3558-DEEE-4F99-913E-DAC97A12926E} = {99BD3558-DEEE-4F99-913E-DAC97A12926E} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dlltemplate_vc9", "dlltemplate\dlltemplate_vc9.vcproj", "{DE479E27-E406-43A8-BCBD-8506EBC31038}" - ProjectSection(ProjectDependencies) = postProject - {F914CF4D-5904-477F-A388-00C05E749D18} = {F914CF4D-5904-477F-A388-00C05E749D18} - {99BD3558-DEEE-4F99-913E-DAC97A12926E} = {99BD3558-DEEE-4F99-913E-DAC97A12926E} - {E21CE9F1-F1AF-487A-8C01-23A4D8A23CC7} = {E21CE9F1-F1AF-487A-8C01-23A4D8A23CC7} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "clboot_vc9", "clboot\clboot_vc9.vcproj", "{95914474-F1BA-4190-8FF3-4F03386FC8D6}" - ProjectSection(ProjectDependencies) = postProject - {F914CF4D-5904-477F-A388-00C05E749D18} = {F914CF4D-5904-477F-A388-00C05E749D18} - {99BD3558-DEEE-4F99-913E-DAC97A12926E} = {99BD3558-DEEE-4F99-913E-DAC97A12926E} - {E21CE9F1-F1AF-487A-8C01-23A4D8A23CC7} = {E21CE9F1-F1AF-487A-8C01-23A4D8A23CC7} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "clbootapp_vc9", "clbootapp\clbootapp_vc9.vcproj", "{AE675399-2236-4F77-BBAD-B665F9C1022C}" - ProjectSection(ProjectDependencies) = postProject - {F914CF4D-5904-477F-A388-00C05E749D18} = {F914CF4D-5904-477F-A388-00C05E749D18} - {99BD3558-DEEE-4F99-913E-DAC97A12926E} = {99BD3558-DEEE-4F99-913E-DAC97A12926E} - {E21CE9F1-F1AF-487A-8C01-23A4D8A23CC7} = {E21CE9F1-F1AF-487A-8C01-23A4D8A23CC7} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "clconsole_vc9", "clconsole\clconsole_vc9.vcproj", "{EE43A1A5-ED5E-4247-B0CF-FB5F3EC80A03}" - ProjectSection(ProjectDependencies) = postProject - {F914CF4D-5904-477F-A388-00C05E749D18} = {F914CF4D-5904-477F-A388-00C05E749D18} - {99BD3558-DEEE-4F99-913E-DAC97A12926E} = {99BD3558-DEEE-4F99-913E-DAC97A12926E} - {E21CE9F1-F1AF-487A-8C01-23A4D8A23CC7} = {E21CE9F1-F1AF-487A-8C01-23A4D8A23CC7} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "clconsoleapp_vc9", "clconsoleapp\clconsoleapp_vc9.vcproj", "{C31B2675-B04B-45F1-BBB2-35F099375CF8}" - ProjectSection(ProjectDependencies) = postProject - {F914CF4D-5904-477F-A388-00C05E749D18} = {F914CF4D-5904-477F-A388-00C05E749D18} - {99BD3558-DEEE-4F99-913E-DAC97A12926E} = {99BD3558-DEEE-4F99-913E-DAC97A12926E} - {E21CE9F1-F1AF-487A-8C01-23A4D8A23CC7} = {E21CE9F1-F1AF-487A-8C01-23A4D8A23CC7} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CormanLisp_vc9", "CormanLispIDE\CormanLisp_vc9.vcproj", "{FF6CFCF2-F424-4B17-93FF-469DEAD1D723}" - ProjectSection(ProjectDependencies) = postProject - {DE479E27-E406-43A8-BCBD-8506EBC31038} = {DE479E27-E406-43A8-BCBD-8506EBC31038} - {F914CF4D-5904-477F-A388-00C05E749D18} = {F914CF4D-5904-477F-A388-00C05E749D18} - {99BD3558-DEEE-4F99-913E-DAC97A12926E} = {99BD3558-DEEE-4F99-913E-DAC97A12926E} - {E21CE9F1-F1AF-487A-8C01-23A4D8A23CC7} = {E21CE9F1-F1AF-487A-8C01-23A4D8A23CC7} - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Standard|Win32 = Standard|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {99BD3558-DEEE-4F99-913E-DAC97A12926E}.Standard|Win32.ActiveCfg = Standard|Win32 - {99BD3558-DEEE-4F99-913E-DAC97A12926E}.Standard|Win32.Build.0 = Standard|Win32 - {F914CF4D-5904-477F-A388-00C05E749D18}.Standard|Win32.ActiveCfg = Standard|Win32 - {F914CF4D-5904-477F-A388-00C05E749D18}.Standard|Win32.Build.0 = Standard|Win32 - {E21CE9F1-F1AF-487A-8C01-23A4D8A23CC7}.Standard|Win32.ActiveCfg = Standard|Win32 - {E21CE9F1-F1AF-487A-8C01-23A4D8A23CC7}.Standard|Win32.Build.0 = Standard|Win32 - {DE479E27-E406-43A8-BCBD-8506EBC31038}.Standard|Win32.ActiveCfg = Standard|Win32 - {DE479E27-E406-43A8-BCBD-8506EBC31038}.Standard|Win32.Build.0 = Standard|Win32 - {95914474-F1BA-4190-8FF3-4F03386FC8D6}.Standard|Win32.ActiveCfg = Standard|Win32 - {95914474-F1BA-4190-8FF3-4F03386FC8D6}.Standard|Win32.Build.0 = Standard|Win32 - {AE675399-2236-4F77-BBAD-B665F9C1022C}.Standard|Win32.ActiveCfg = Standard|Win32 - {AE675399-2236-4F77-BBAD-B665F9C1022C}.Standard|Win32.Build.0 = Standard|Win32 - {EE43A1A5-ED5E-4247-B0CF-FB5F3EC80A03}.Standard|Win32.ActiveCfg = Standard|Win32 - {EE43A1A5-ED5E-4247-B0CF-FB5F3EC80A03}.Standard|Win32.Build.0 = Standard|Win32 - {C31B2675-B04B-45F1-BBB2-35F099375CF8}.Standard|Win32.ActiveCfg = Standard|Win32 - {C31B2675-B04B-45F1-BBB2-35F099375CF8}.Standard|Win32.Build.0 = Standard|Win32 - {FF6CFCF2-F424-4B17-93FF-469DEAD1D723}.Standard|Win32.ActiveCfg = Standard|Win32 - {FF6CFCF2-F424-4B17-93FF-469DEAD1D723}.Standard|Win32.Build.0 = Standard|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/vc6setvars.bat b/vc6setvars.bat deleted file mode 100644 index 47374b0..0000000 --- a/vc6setvars.bat +++ /dev/null @@ -1,3 +0,0 @@ -set include=d:\msdev6\vc98\include;d:\msdev6\vc98\mfc\include;%include% -set lib=d:\msdev6\vc98\lib;d:\msdev6\vc98\mfc\lib;%lib% -set path=D:\msdev6\Common\msdev98\bin;D:\msdev6\VC98\bin;D:\msdev6\Common\TOOLS\WINNT;D:\msdev6\Common\TOOLS;%path% \ No newline at end of file diff --git a/vc7setvars.bat b/vc7setvars.bat deleted file mode 100644 index 40996b8..0000000 --- a/vc7setvars.bat +++ /dev/null @@ -1,3 +0,0 @@ -set include=C:\Program Files\Microsoft Visual Studio .NET\FrameworkSDK\include\;C:\Program Files\Microsoft Visual Studio .NET\FrameworkSDK\include\;c:\program files\Microsoft Visual Studio .NET\Vc7\include\;c:\program files\Microsoft Visual Studio .NET\Vc7\atlmfc\include\;c:\program files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\include\;%include% -set lib=C:\Program Files\Microsoft Visual Studio .NET\FrameworkSDK\Lib\;C:\Program Files\Microsoft Visual Studio .NET\VC7\PlatformSDK\Lib\;C:\Program Files\Microsoft Visual Studio .NET\VC7\lib\;C:\Program Files\Microsoft Visual Studio .NET\VC7\atlmfc\lib\%lib% -set path=%SystemRoot%\system32;%SystemRoot%;%SystemRoot%\system32\WBEM;c:\program files\Microsoft Visual Studio .NET\Vc7\bin;c:\program files\Microsoft Visual Studio .NET\Common7\ide;%path% \ No newline at end of file diff --git a/vc8setvars.bat b/vc8setvars.bat deleted file mode 100644 index 0f19106..0000000 --- a/vc8setvars.bat +++ /dev/null @@ -1,31 +0,0 @@ -@SET VSINSTALLDIR=C:\msdev8 -@SET VCINSTALLDIR=C:\msdev8\VC -@SET FrameworkDir=C:\WINDOWS\Microsoft.NET\Framework -@SET FrameworkVersion=v2.0.50727 -@SET FrameworkSDKDir=C:\msdev8\SDK\v2.0 -@if "%VSINSTALLDIR%"=="" goto error_no_VSINSTALLDIR -@if "%VCINSTALLDIR%"=="" goto error_no_VCINSTALLDIR - -@echo Setting environment for using Microsoft Visual Studio 2005 x86 tools. - -@rem -@rem Root of Visual Studio IDE installed files. -@rem -@set DevEnvDir=C:\msdev8\Common7\IDE - -@set PATH=C:\msdev8\Common7\IDE;C:\msdev8\VC\BIN;C:\msdev8\Common7\Tools;C:\msdev8\Common7\Tools\bin;C:\msdev8\VC\PlatformSDK\bin;C:\msdev8\SDK\v2.0\bin;C:\WINDOWS\Microsoft.NET\Framework\v2.0.50727;C:\msdev8\VC\VCPackages;%PATH% -@set INCLUDE=C:\msdev8\VC\ATLMFC\INCLUDE;C:\msdev8\VC\INCLUDE;C:\msdev8\VC\PlatformSDK\include;C:\msdev8\SDK\v2.0\include;%INCLUDE% -@set LIB=C:\msdev8\VC\ATLMFC\LIB;C:\msdev8\VC\LIB;C:\msdev8\VC\PlatformSDK\lib;C:\msdev8\SDK\v2.0\lib;%LIB% -@set LIBPATH=C:\WINDOWS\Microsoft.NET\Framework\v2.0.50727;C:\msdev8\VC\ATLMFC\LIB - -@goto end - -:error_no_VSINSTALLDIR -@echo ERROR: VSINSTALLDIR variable is not set. -@goto end - -:error_no_VCINSTALLDIR -@echo ERROR: VCINSTALLDIR variable is not set. -@goto end - -:end diff --git a/vs9vars32.bat b/vs9vars32.bat deleted file mode 100644 index 59c04eb..0000000 --- a/vs9vars32.bat +++ /dev/null @@ -1,55 +0,0 @@ -@SET VSINSTALLDIR=C:\msdev9 -@SET VCINSTALLDIR=C:\msdev9\VC -@SET FrameworkDir=C:\WINDOWS\Microsoft.NET\Framework -@SET FrameworkVersion=v2.0.50727 -@SET Framework35Version=v3.5 -@if "%VSINSTALLDIR%"=="" goto error_no_VSINSTALLDIR -@if "%VCINSTALLDIR%"=="" goto error_no_VCINSTALLDIR - -@echo Setting environment for using Microsoft Visual Studio 2008 x86 tools. - -@call :GetWindowsSdkDir - -@if not "%WindowsSdkDir%" == "" ( - set "PATH=%WindowsSdkDir%bin;%PATH%" - set "INCLUDE=%WindowsSdkDir%include;%INCLUDE%" - set "LIB=%WindowsSdkDir%lib;%LIB%" -) - - -@rem -@rem Root of Visual Studio IDE installed files. -@rem -@set DevEnvDir=C:\msdev9\Common7\IDE - -@set PATH=C:\msdev9\Common7\IDE;C:\msdev9\VC\BIN;C:\msdev9\Common7\Tools;C:\WINDOWS\Microsoft.NET\Framework\v3.5;C:\WINDOWS\Microsoft.NET\Framework\v2.0.50727;C:\msdev9\VC\VCPackages;%PATH% -@set INCLUDE=C:\msdev9\VC\ATLMFC\INCLUDE;C:\msdev9\VC\INCLUDE;%INCLUDE% -@set LIB=C:\msdev9\VC\ATLMFC\LIB;C:\msdev9\VC\LIB;%LIB% -@set LIBPATH=C:\WINDOWS\Microsoft.NET\Framework\v3.5;C:\WINDOWS\Microsoft.NET\Framework\v2.0.50727;C:\msdev9\VC\ATLMFC\LIB;C:\msdev9\VC\LIB;%LIBPATH% - -@goto end - -:GetWindowsSdkDir -@call :GetWindowsSdkDirHelper HKLM > nul 2>&1 -@if errorlevel 1 call :GetWindowsSdkDirHelper HKCU > nul 2>&1 -@if errorlevel 1 set WindowsSdkDir=%VCINSTALLDIR%\PlatformSDK\ -@exit /B 0 - -:GetWindowsSdkDirHelper -@for /F "tokens=1,2*" %%i in ('reg query "%1\SOFTWARE\Microsoft\Microsoft SDKs\Windows" /v "CurrentInstallFolder"') DO ( - if "%%i"=="CurrentInstallFolder" ( - SET "WindowsSdkDir=%%k" - ) -) -@if "%WindowsSdkDir%"=="" exit /B 1 -@exit /B 0 - -:error_no_VSINSTALLDIR -@echo ERROR: VSINSTALLDIR variable is not set. -@goto end - -:error_no_VCINSTALLDIR -@echo ERROR: VCINSTALLDIR variable is not set. -@goto end - -:end diff --git a/zlib/zlib.vcxproj b/zlib/zlib.vcxproj new file mode 100644 index 0000000..e2a9f5c --- /dev/null +++ b/zlib/zlib.vcxproj @@ -0,0 +1,90 @@ + + + + + Standard + Win32 + + + + {99BD3558-DEEE-4F99-913E-DAC97A12926E} + zlib + + + + StaticLibrary + v120_xp + false + NotSet + + + + + + + + + + + <_ProjectFileVersion>12.0.30501.0 + + + .\bin\ + .\bin\ + + + + OnlyExplicitInline + WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + true + MultiThreaded + true + + .\bin/zlib.pch + .\bin/ + .\bin/ + .\bin/ + Level3 + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + .\zlib.lib + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/zlib/zlib.vcxproj.filters b/zlib/zlib.vcxproj.filters new file mode 100644 index 0000000..8e1276f --- /dev/null +++ b/zlib/zlib.vcxproj.filters @@ -0,0 +1,89 @@ + + + + + {98d97431-1ec9-4fab-9837-b496001fda88} + cpp;c;cxx;rc;def;r;odl;idl;hpj;bat + + + {bd02d061-1594-45d4-bd87-b520e3ac61f1} + h;hpp;hxx;hm;inl + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + \ No newline at end of file diff --git a/zlib/zlib_vc9.sln b/zlib/zlib_vc9.sln deleted file mode 100644 index b0f3ecf..0000000 --- a/zlib/zlib_vc9.sln +++ /dev/null @@ -1,17 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual Studio 2008 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib_vc9", "zlib_vc9.vcproj", "{99BD3558-DEEE-4F99-913E-DAC97A12926E}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Standard|Win32 = Standard|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {99BD3558-DEEE-4F99-913E-DAC97A12926E}.Standard|Win32.ActiveCfg = Standard|Win32 - {99BD3558-DEEE-4F99-913E-DAC97A12926E}.Standard|Win32.Build.0 = Standard|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/zlib/zlib_vc9.vcproj b/zlib/zlib_vc9.vcproj deleted file mode 100644 index ca54e91..0000000 --- a/zlib/zlib_vc9.vcproj +++ /dev/null @@ -1,203 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -