C++ migration: buildfixes

Essentially, buildfixes when compiling as C++, plus properly marking public API as extern "C"

2 files changed, 14 insertions, 20 deletions

diff --git a/deep_test/deep_test.c b/deep_test/deep_test.c
index cb89741..eca7479 100644
--- a/deep_test/deep_test.c
+++ b/deep_test/deep_test.c
@@ -9,12 +9,6 @@
 #include "lanes/src/deep.h"
 #include "lanes/src/compat.h"
 
-#if (defined PLATFORM_WIN32) || (defined PLATFORM_POCKETPC)
-#define LANES_API __declspec(dllexport)
-#else
-#define LANES_API
-#endif // (defined PLATFORM_WIN32) || (defined PLATFORM_POCKETPC)
-
 // ################################################################################################
 
 // a lanes-deep userdata. needs DeepPrelude and luaG_newdeepuserdata from Lanes code.
@@ -248,7 +242,7 @@ static luaL_Reg const deep_module[] =
 
 // ################################################################################################
 
-extern int __declspec(dllexport) luaopen_deep_test(lua_State* L)
+LANES_API int luaopen_deep_test(lua_State* L)
 {
         luaL_newlib( L, deep_module);                           // M
 
@@ -256,18 +250,18 @@ extern int __declspec(dllexport) luaopen_deep_test(lua_State* L)
         if( luaL_newmetatable( L, "clonable"))                  // M mt
         {
                 luaL_setfuncs( L, clonable_mt, 0);
-                lua_pushvalue(L, -1);                                 // M mt mt
-                lua_setfield(L, -2, "__index");                       // M mt
+                lua_pushvalue(L, -1);                               // M mt mt
+                lua_setfield(L, -2, "__index");                     // M mt
         }
         lua_setfield(L, -2, "__clonableMT");                    // M
 
         if( luaL_newmetatable( L, "deep"))                      // mt
         {
                 luaL_setfuncs( L, deep_mt, 0);
-                lua_pushvalue(L, -1);                                 // mt mt
-                lua_setfield(L, -2, "__index");                       // mt
+                lua_pushvalue(L, -1);                               // mt mt
+                lua_setfield(L, -2, "__index");                     // mt
         }
-        lua_setfield(L, -2, "__deepMT");                    // M
+        lua_setfield(L, -2, "__deepMT");                        // M
 
         return 1;
 }
diff --git a/deep_test/deep_test.vcxproj b/deep_test/deep_test.vcxproj
index 6ff7685..730c137 100644
--- a/deep_test/deep_test.vcxproj
+++ b/deep_test/deep_test.vcxproj
@@ -350,8 +350,8 @@
       <AdditionalLibraryDirectories>$(SolutionDir)..\Lua53\bin\$(Platform)\Release</AdditionalLibraryDirectories>
     </Link>
     <PostBuildEvent>
-      <Command>xcopy /R /F /Y /I "$(TargetPath)" $(SolutionDir)..\framework\</Command>
-      <Message>Copy to framework</Message>
+      <Command>xcopy /R /F /Y /I "$(TargetPath)" $(SolutionDir)..\Lua53\bin\$(Platform)\Release\</Command>
+      <Message>Copy to Lua 5.3</Message>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release 5.4|x64'">
@@ -517,7 +517,7 @@
     </ClCompile>
     <PostBuildEvent>
       <Command>xcopy /R /F /Y /I "$(TargetPath)" $(SolutionDir)..\Lua53\bin\$(Platform)\Debug\</Command>
-      <Message>Lua 5.3</Message>
+      <Message>Copy to Lua 5.3</Message>
     </PostBuildEvent>
     <Link>
       <AdditionalDependencies>lua53.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -539,8 +539,8 @@
       <Message>Copy to Lua 5.2</Message>
     </PostBuildEvent>
     <Link>
-      <AdditionalDependencies>lua52.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\Lua52\bin\$(Platform)\Debug</AdditionalLibraryDirectories>
+      <AdditionalDependencies>lua51.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(SolutionDir)..\Lua51\bin\$(Platform)\Debug</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.2|x64'">
@@ -549,7 +549,7 @@
       <Optimization>Disabled</Optimization>
       <SDLCheck>true</SDLCheck>
       <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\Lua51\include;$(SolutionDir)Lanes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\Lua52\include;$(SolutionDir)Lanes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
       <PreprocessorDefinitions>_WINDLL;_DEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
@@ -558,8 +558,8 @@
       <Message>Copy to Lua 5.2</Message>
     </PostBuildEvent>
     <Link>
-      <AdditionalDependencies>lua51.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\Lua51\bin\$(Platform)\Debug</AdditionalLibraryDirectories>
+      <AdditionalDependencies>lua52.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(SolutionDir)..\Lua52\bin\$(Platform)\Debug</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug LuaJIT 2.1.0-beta3|x64'">