summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--html/en/history.html3
-rw-r--r--include/cdlua.h5
-rw-r--r--mak.vc9/cd.sln38
-rw-r--r--mak.vc9/cdlua51.vcproj (renamed from mak.vc9/cdlua5.vcproj)4
-rw-r--r--mak.vc9/cdlua52.vcproj131
-rw-r--r--mak.vc9/cdluacontextplus51.vcproj (renamed from mak.vc9/cdluacontextplus5.vcproj)4
-rw-r--r--mak.vc9/cdluacontextplus52.vcproj106
-rw-r--r--mak.vc9/cdluaim51.vcproj (renamed from mak.vc9/cdluaim5.vcproj)5
-rw-r--r--mak.vc9/cdluaim52.vcproj110
-rw-r--r--mak.vc9/cdluapdf51.vcproj (renamed from mak.vc9/cdluapdf5.vcproj)4
-rw-r--r--mak.vc9/cdluapdf52.vcproj106
-rw-r--r--src/lua5/cdlua5.c2
-rw-r--r--src/lua5/cdlua5ctx.c6
13 files changed, 503 insertions, 21 deletions
diff --git a/html/en/history.html b/html/en/history.html
index 1b1ac36..11532df 100644
--- a/html/en/history.html
+++ b/html/en/history.html
@@ -45,6 +45,9 @@
or LUA_CPATH must be set.</li>
<li dir="ltr">
<span class="hist_changed">Changed:</span>
+ added compatibility with Lua 5.2.</li>
+ <li dir="ltr">
+ <span class="hist_changed">Changed:</span>
<strong>
<span style="color: #FF0000">IMPORTANT</span></strong> - the main library in
Linux and BSD is now the GDK base driver. The X11 base driver library
diff --git a/include/cdlua.h b/include/cdlua.h
index 30d8174..465d09c 100644
--- a/include/cdlua.h
+++ b/include/cdlua.h
@@ -29,6 +29,11 @@ int cdlua_close(lua_State *L);
cdCanvas* cdlua_getcanvas(lua_State * L); /* pos=1, deprecated use cdlua_checkcanvas */
cdCanvas* cdlua_checkcanvas(lua_State * L, int pos);
void cdlua_pushcanvas(lua_State * L, cdCanvas* canvas);
+
+#if LUA_VERSION_NUM < 502
+#define luaL_typeerror luaL_typerror
+#endif
+
#endif
#ifdef __cplusplus
diff --git a/mak.vc9/cd.sln b/mak.vc9/cd.sln
index f006382..9a861fb 100644
--- a/mak.vc9/cd.sln
+++ b/mak.vc9/cd.sln
@@ -16,7 +16,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cdgdiplus", "cdgdiplus.vcpr
{01818D2C-65AF-4D5C-9452-4DFF401C6461} = {01818D2C-65AF-4D5C-9452-4DFF401C6461}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cdlua5", "cdlua5.vcproj", "{53FC9752-81C1-4AA6-B366-A7890A2B81F6}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cdlua51", "cdlua51.vcproj", "{53FC9752-81C1-4AA6-B366-A7890A2B81F6}"
ProjectSection(ProjectDependencies) = postProject
{01818D2C-65AF-4D5C-9452-4DFF401C6461} = {01818D2C-65AF-4D5C-9452-4DFF401C6461}
EndProjectSection
@@ -38,7 +38,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cdluapdf3", "cdluapdf3.vcpr
{8441F69D-7135-43B2-974F-45C6123C8467} = {8441F69D-7135-43B2-974F-45C6123C8467}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cdluapdf5", "cdluapdf5.vcproj", "{B4823266-DF8C-1224-EE00-C7688C234EAC}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cdluapdf51", "cdluapdf51.vcproj", "{B4823266-DF8C-1224-EE00-C7688C234EAC}"
ProjectSection(ProjectDependencies) = postProject
{53FC9752-81C1-4AA6-B366-A7890A2B81F6} = {53FC9752-81C1-4AA6-B366-A7890A2B81F6}
{8441F69D-7135-43B2-974F-45C6123C8467} = {8441F69D-7135-43B2-974F-45C6123C8467}
@@ -49,7 +49,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cdxrender", "cdxrender.vcpr
{01818D2C-7689-4D5C-1234-4DFF401C6461} = {01818D2C-7689-4D5C-1234-4DFF401C6461}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cdluaim5", "cdluaim5.vcproj", "{CB863607-6B6C-0000-0000-123400001234}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cdluaim51", "cdluaim51.vcproj", "{CB863607-6B6C-0000-0000-123400001234}"
ProjectSection(ProjectDependencies) = postProject
{53FC9752-81C1-4AA6-B366-A7890A2B81F6} = {53FC9752-81C1-4AA6-B366-A7890A2B81F6}
EndProjectSection
@@ -58,12 +58,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pdflib", "cd_pdflib.vcproj"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "freetype6", "cd_freetype.vcproj", "{01818D2C-65AF-AFDC-4356-1234401C6461}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cdluacontextplus5", "cdluacontextplus5.vcproj", "{B4823266-DF8C-ABCD-1234-C7688C234EAC}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cdluacontextplus51", "cdluacontextplus51.vcproj", "{B4823266-DF8C-ABCD-1234-C7688C234EAC}"
ProjectSection(ProjectDependencies) = postProject
{53FC9752-81C1-4AA6-B366-A7890A2B81F6} = {53FC9752-81C1-4AA6-B366-A7890A2B81F6}
EndProjectSection
EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Lua5", "Lua5", "{EFB1BE3C-2981-456B-8E32-928CBDFF7822}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Lua51", "Lua51", "{EFB1BE3C-2981-456B-8E32-928CBDFF7822}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Lua3", "Lua3", "{E92DB6FF-5501-4FC0-81D2-00DB8EFA2434}"
EndProject
@@ -124,6 +124,16 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cdtestcairo", "cdtestcairo.
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ContextPlus", "ContextPlus", "{89C76F13-4572-4A6D-9F6B-9ED4D0809B64}"
EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Lua52", "Lua52", "{9645A3AF-CEAB-4A7E-92AB-BF3420E655FF}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cdlua52", "cdlua52.vcproj", "{53FC9752-81C1-4AA6-81C1-DDAA0A2B81F6}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cdluacontextplus52", "cdluacontextplus52.vcproj", "{B4823266-DF8C-A169-F6A1-C7656C234EAC}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cdluaim52", "cdluaim52.vcproj", "{CB863607-6B6C-FF53-DF34-12AA00001234}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cdluapdf52", "cdluapdf52.vcproj", "{B4823266-DF8C-ABC1-DF8C-12688C234EAC}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -171,6 +181,14 @@ Global
{01818D2C-AAAA-DD23-00AA-5678401C6461}.Debug|Win32.Build.0 = Debug|Win32
{A7E49FB8-0022-15EC-AB17-FFCDC7E83C00}.Debug|Win32.ActiveCfg = Debug|Win32
{A7E49FB8-0022-15EC-AB17-FFCDC7E83C00}.Debug|Win32.Build.0 = Debug|Win32
+ {53FC9752-81C1-4AA6-81C1-DDAA0A2B81F6}.Debug|Win32.ActiveCfg = Debug|Win32
+ {53FC9752-81C1-4AA6-81C1-DDAA0A2B81F6}.Debug|Win32.Build.0 = Debug|Win32
+ {B4823266-DF8C-A169-F6A1-C7656C234EAC}.Debug|Win32.ActiveCfg = Debug|Win32
+ {B4823266-DF8C-A169-F6A1-C7656C234EAC}.Debug|Win32.Build.0 = Debug|Win32
+ {CB863607-6B6C-FF53-DF34-12AA00001234}.Debug|Win32.ActiveCfg = Debug|Win32
+ {CB863607-6B6C-FF53-DF34-12AA00001234}.Debug|Win32.Build.0 = Debug|Win32
+ {B4823266-DF8C-ABC1-DF8C-12688C234EAC}.Debug|Win32.ActiveCfg = Debug|Win32
+ {B4823266-DF8C-ABC1-DF8C-12688C234EAC}.Debug|Win32.Build.0 = Debug|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -182,6 +200,9 @@ Global
{01818D2C-65AF-4D5C-9452-4DFF401C6461} = {1EE89DAC-3D3A-450C-9CF8-E200DF5E12E8}
{B4823266-DF8C-AAAA-9999-C7E78C234EAC} = {E92DB6FF-5501-4FC0-81D2-00DB8EFA2434}
{53FC9752-81C1-4AA6-B366-AF6D0A2B81F6} = {E92DB6FF-5501-4FC0-81D2-00DB8EFA2434}
+ {160DEDA5-C1AA-48C7-8B07-490C6A8DE2EE} = {89C76F13-4572-4A6D-9F6B-9ED4D0809B64}
+ {01818D2C-AAAA-DD23-00AA-5678401C6461} = {89C76F13-4572-4A6D-9F6B-9ED4D0809B64}
+ {51A96255-7EAB-4F36-A6E5-1BAF6245FA18} = {89C76F13-4572-4A6D-9F6B-9ED4D0809B64}
{B4823266-DF8C-1224-EE00-C7688C234EAC} = {EFB1BE3C-2981-456B-8E32-928CBDFF7822}
{CB863607-6B6C-0000-0000-123400001234} = {EFB1BE3C-2981-456B-8E32-928CBDFF7822}
{B4823266-DF8C-ABCD-1234-C7688C234EAC} = {EFB1BE3C-2981-456B-8E32-928CBDFF7822}
@@ -192,9 +213,10 @@ Global
{A7E49FB8-0000-45EC-1234-ABCDC7E83C00} = {162715BD-4DB3-4007-8B50-725C0BD11878}
{A7E49FB8-5467-45EC-2211-FFAB7E83C100} = {162715BD-4DB3-4007-8B50-725C0BD11878}
{A7E49FB8-0022-15EC-AB17-FFCDC7E83C00} = {162715BD-4DB3-4007-8B50-725C0BD11878}
- {01818D2C-AAAA-DD23-00AA-5678401C6461} = {89C76F13-4572-4A6D-9F6B-9ED4D0809B64}
- {160DEDA5-C1AA-48C7-8B07-490C6A8DE2EE} = {89C76F13-4572-4A6D-9F6B-9ED4D0809B64}
- {51A96255-7EAB-4F36-A6E5-1BAF6245FA18} = {89C76F13-4572-4A6D-9F6B-9ED4D0809B64}
+ {53FC9752-81C1-4AA6-81C1-DDAA0A2B81F6} = {9645A3AF-CEAB-4A7E-92AB-BF3420E655FF}
+ {B4823266-DF8C-A169-F6A1-C7656C234EAC} = {9645A3AF-CEAB-4A7E-92AB-BF3420E655FF}
+ {CB863607-6B6C-FF53-DF34-12AA00001234} = {9645A3AF-CEAB-4A7E-92AB-BF3420E655FF}
+ {B4823266-DF8C-ABC1-DF8C-12688C234EAC} = {9645A3AF-CEAB-4A7E-92AB-BF3420E655FF}
EndGlobalSection
GlobalSection(DevPartner Solution Properties) = postSolution
EndGlobalSection
diff --git a/mak.vc9/cdlua5.vcproj b/mak.vc9/cdlua51.vcproj
index 625275a..cc94b78 100644
--- a/mak.vc9/cdlua5.vcproj
+++ b/mak.vc9/cdlua51.vcproj
@@ -2,7 +2,7 @@
<VisualStudioProject
ProjectType="Visual C++"
Version="9,00"
- Name="cdlua5"
+ Name="cdlua51"
ProjectGUID="{53FC9752-81C1-4AA6-B366-A7890A2B81F6}"
TargetFrameworkVersion="0"
>
@@ -66,7 +66,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="$(OutDir)/$(ProjectName)1.lib"
+ OutputFile="$(OutDir)/$(ProjectName).lib"
SuppressStartupBanner="true"
/>
<Tool
diff --git a/mak.vc9/cdlua52.vcproj b/mak.vc9/cdlua52.vcproj
new file mode 100644
index 0000000..30d3b3a
--- /dev/null
+++ b/mak.vc9/cdlua52.vcproj
@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9,00"
+ Name="cdlua52"
+ ProjectGUID="{53FC9752-81C1-4AA6-81C1-DDAA0A2B81F6}"
+ TargetFrameworkVersion="0"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="..\lib"
+ IntermediateDirectory="..\obj\Debug\$(ProjectName)"
+ ConfigurationType="4"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\include;..\..\lua52\include"
+ PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,CD_NO_OLD_INTERFACE,_CRT_SECURE_NO_DEPRECATE"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="1"
+ PrecompiledHeaderFile=""
+ AssemblerListingLocation=""
+ ObjectFile="$(IntDir)\"
+ ProgramDataBaseFileName="$(IntDir)\vc90.pdb"
+ WarningLevel="4"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="1"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ Culture="1046"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ OutputFile="$(OutDir)/$(ProjectName).lib"
+ SuppressStartupBanner="true"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <File
+ RelativePath="..\include\cdlua.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\lua5\cdlua5.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\lua5\cdlua5.def"
+ >
+ </File>
+ <File
+ RelativePath="..\src\lua5\cdlua5_active.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\lua5\cdlua5_canvas.c"
+ >
+ </File>
+ <File
+ RelativePath="..\include\cdlua5_private.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\lua5\cdlua5ctx.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\lua5\cdvoid5.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\lua5\cdvoid5.h"
+ >
+ </File>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/mak.vc9/cdluacontextplus5.vcproj b/mak.vc9/cdluacontextplus51.vcproj
index a595c8d..640408a 100644
--- a/mak.vc9/cdluacontextplus5.vcproj
+++ b/mak.vc9/cdluacontextplus51.vcproj
@@ -2,7 +2,7 @@
<VisualStudioProject
ProjectType="Visual C++"
Version="9,00"
- Name="cdluacontextplus5"
+ Name="cdluacontextplus51"
ProjectGUID="{B4823266-DF8C-ABCD-1234-C7688C234EAC}"
TargetFrameworkVersion="0"
>
@@ -65,7 +65,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="$(OutDir)/$(ProjectName)1.lib"
+ OutputFile="$(OutDir)/$(ProjectName).lib"
SuppressStartupBanner="true"
/>
<Tool
diff --git a/mak.vc9/cdluacontextplus52.vcproj b/mak.vc9/cdluacontextplus52.vcproj
new file mode 100644
index 0000000..90e49d6
--- /dev/null
+++ b/mak.vc9/cdluacontextplus52.vcproj
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9,00"
+ Name="cdluacontextplus52"
+ ProjectGUID="{B4823266-DF8C-A169-F6A1-C7656C234EAC}"
+ TargetFrameworkVersion="0"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="..\lib"
+ IntermediateDirectory="..\obj\Debug\$(ProjectName)"
+ ConfigurationType="4"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\include;..\..\lua52\include"
+ PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,CD_NO_OLD_INTERFACE,_CRT_SECURE_NO_DEPRECATE"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="1"
+ PrecompiledHeaderFile=""
+ AssemblerListingLocation=""
+ ObjectFile="$(IntDir)\"
+ ProgramDataBaseFileName="$(IntDir)\vc90.pdb"
+ WarningLevel="4"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="1"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ OutputFile="$(OutDir)/$(ProjectName).lib"
+ SuppressStartupBanner="true"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <File
+ RelativePath="..\include\cdluacontextplus.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\lua5\cdluacontextplus5.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\lua5\cdluacontextplus5.def"
+ >
+ </File>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/mak.vc9/cdluaim5.vcproj b/mak.vc9/cdluaim51.vcproj
index af1b2f3..67c6bc8 100644
--- a/mak.vc9/cdluaim5.vcproj
+++ b/mak.vc9/cdluaim51.vcproj
@@ -2,7 +2,7 @@
<VisualStudioProject
ProjectType="Visual C++"
Version="9,00"
- Name="cdluaim5"
+ Name="cdluaim51"
ProjectGUID="{CB863607-6B6C-0000-0000-123400001234}"
TargetFrameworkVersion="0"
>
@@ -47,7 +47,6 @@
ExceptionHandling="0"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
- PrecompiledHeaderFile="..\lib/cdluaim5.pch"
AssemblerListingLocation=""
ObjectFile="$(IntDir)\"
ProgramDataBaseFileName="$(IntDir)\vc90.pdb"
@@ -69,7 +68,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="$(OutDir)/$(ProjectName)1.lib"
+ OutputFile="$(OutDir)/$(ProjectName).lib"
SuppressStartupBanner="true"
/>
<Tool
diff --git a/mak.vc9/cdluaim52.vcproj b/mak.vc9/cdluaim52.vcproj
new file mode 100644
index 0000000..f0bdd99
--- /dev/null
+++ b/mak.vc9/cdluaim52.vcproj
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9,00"
+ Name="cdluaim52"
+ ProjectGUID="{CB863607-6B6C-FF53-DF34-12AA00001234}"
+ TargetFrameworkVersion="0"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="..\lib"
+ IntermediateDirectory="..\obj\Debug\$(ProjectName)"
+ ConfigurationType="4"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="../include;../../lua52/include;../../im/include"
+ PreprocessorDefinitions="WIN32,_DEBUG,_LIB,_CRT_SECURE_NO_DEPRECATE"
+ ExceptionHandling="0"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="1"
+ AssemblerListingLocation=""
+ ObjectFile="$(IntDir)\"
+ ProgramDataBaseFileName="$(IntDir)\vc90.pdb"
+ WarningLevel="4"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="1"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
+ Culture="1046"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ OutputFile="$(OutDir)/$(ProjectName).lib"
+ SuppressStartupBanner="true"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+ >
+ <File
+ RelativePath="..\src\lua5\cdluaim5.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\lua5\cdluaim5.def"
+ >
+ </File>
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/mak.vc9/cdluapdf5.vcproj b/mak.vc9/cdluapdf51.vcproj
index 28da040..d103929 100644
--- a/mak.vc9/cdluapdf5.vcproj
+++ b/mak.vc9/cdluapdf51.vcproj
@@ -2,7 +2,7 @@
<VisualStudioProject
ProjectType="Visual C++"
Version="9,00"
- Name="cdluapdf5"
+ Name="cdluapdf51"
ProjectGUID="{B4823266-DF8C-1224-EE00-C7688C234EAC}"
TargetFrameworkVersion="0"
>
@@ -65,7 +65,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="$(OutDir)/$(ProjectName)1.lib"
+ OutputFile="$(OutDir)/$(ProjectName).lib"
SuppressStartupBanner="true"
/>
<Tool
diff --git a/mak.vc9/cdluapdf52.vcproj b/mak.vc9/cdluapdf52.vcproj
new file mode 100644
index 0000000..c28f85a
--- /dev/null
+++ b/mak.vc9/cdluapdf52.vcproj
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9,00"
+ Name="cdluapdf52"
+ ProjectGUID="{B4823266-DF8C-ABC1-DF8C-12688C234EAC}"
+ TargetFrameworkVersion="0"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="..\lib"
+ IntermediateDirectory="..\obj\Debug\$(ProjectName)"
+ ConfigurationType="4"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\include;..\..\lua52\include"
+ PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,CD_NO_OLD_INTERFACE,_CRT_SECURE_NO_DEPRECATE"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="1"
+ PrecompiledHeaderFile=""
+ AssemblerListingLocation=""
+ ObjectFile="$(IntDir)\"
+ ProgramDataBaseFileName="$(IntDir)\vc90.pdb"
+ WarningLevel="4"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="1"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ OutputFile="$(OutDir)/$(ProjectName).lib"
+ SuppressStartupBanner="true"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <File
+ RelativePath="..\include\cdluapdf.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\lua5\cdluapdf5.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\lua5\cdluapdf5.def"
+ >
+ </File>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/src/lua5/cdlua5.c b/src/lua5/cdlua5.c
index c5d9537..a45bbd3 100644
--- a/src/lua5/cdlua5.c
+++ b/src/lua5/cdlua5.c
@@ -87,7 +87,7 @@ static cdluaPalette* cdlua_rawcheckpalette(lua_State *L, int param)
}
}
}
- luaL_typerror(L, param, "cdPalette"); /* else error */
+ luaL_typeerror(L, param, "cdPalette"); /* else error */
return NULL; /* to avoid warnings */
}
diff --git a/src/lua5/cdlua5ctx.c b/src/lua5/cdlua5ctx.c
index b4c899b..71f090d 100644
--- a/src/lua5/cdlua5ctx.c
+++ b/src/lua5/cdlua5ctx.c
@@ -1,5 +1,5 @@
/***************************************************************************\
-* $Id: cdlua5ctx.c,v 1.3 2010/04/23 14:27:10 scuri Exp $
+* $Id: cdlua5ctx.c,v 1.4 2010/06/11 17:28:56 scuri Exp $
* *
\***************************************************************************/
@@ -397,7 +397,7 @@ static void *cdimagergb_checkdata(lua_State* L, int param)
int ret = cdlua_rawchecktype(L, param, "cdBitmap");
if (ret == 0)
- luaL_typerror(L, param, "cdBitmap"); /* not a user data and not a metatable */
+ luaL_typeerror(L, param, "cdBitmap"); /* not a user data and not a metatable */
if (ret == 1)
{
@@ -487,7 +487,7 @@ static void *cdimagergb_checkdata(lua_State* L, int param)
return data_s;
}
- luaL_typerror(L, param, "cdBitmap"); /* is a metatable but it is not one of the accepted */
+ luaL_typeerror(L, param, "cdBitmap"); /* is a metatable but it is not one of the accepted */
}
return data_s;
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-09 16:08:27 +0000