Use the right target for Lua bindings on Windows

* Works by copying the target's output file to the binding's base directory. * Doesn't look like Code::Blocks 10.05 can set custom clean steps, so these copied files can't be cleaned, only overwritten. Bugger.
tung · Feb 7, 2011 · 368a558 · 368a558
1 parent 9e5a1c8
commit 368a558
Show file tree

Hide file tree

Showing 11 changed files with 24 additions and 8 deletions.
diff --git a/lib/gl.lua b/lib/gl.lua
@@ -1,7 +1,6 @@
 local path
 if WIN32 then
-    -- TODO: Support Release target too.
-    path = "lib/gl/luagl/bin/Debug/luagl.dll"
+    path = "lib/gl/luagl/LuaGL.dll"
 else
     -- Assume Linux for now.
     path = "lib/gl/luagl/libluagl.so"

diff --git a/lib/gl/luagl/.gitignore b/lib/gl/luagl/.gitignore
@@ -1,2 +1,4 @@
 bin/Debug/*.dll
 bin/Release/*.dll
+LuaGL.dll
+LuaGLU.dll
diff --git a/lib/gl/luagl/LuaGL.cbp b/lib/gl/luagl/LuaGL.cbp
@@ -42,6 +42,10 @@
 			<Add library="..\..\..\contrib\lua\lua5.1.lib" />
 			<Add directory="..\..\..\contrib\lua" />
 		</Linker>
+		<ExtraCommands>
+			<Add after='cmd /c copy &quot;${TARGET_OUTPUT_FILE}&quot; .' />
+			<Mode after="always" />
+		</ExtraCommands>
 		<Unit filename="..\..\gl.lua">
 			<Option target="&lt;{~None~}&gt;" />
 		</Unit>

diff --git a/lib/gl/luagl/LuaGLU.cbp b/lib/gl/luagl/LuaGLU.cbp
@@ -43,6 +43,10 @@
 			<Add library="..\..\..\contrib\lua\lua5.1.lib" />
 			<Add directory="..\..\..\contrib\lua" />
 		</Linker>
+		<ExtraCommands>
+			<Add after='cmd /c copy &quot;${TARGET_OUTPUT_FILE}&quot; .' />
+			<Mode after="always" />
+		</ExtraCommands>
 		<Unit filename="luagl_const.c">
 			<Option compilerVar="CC" />
 		</Unit>

diff --git a/lib/glu.lua b/lib/glu.lua
@@ -1,7 +1,6 @@
 local path
 if WIN32 then
-    -- TODO: Support Release target too.
-    path = "lib/gl/luagl/bin/Debug/luaglu.dll"
+    path = "lib/gl/luagl/LuaGLU.dll"
 else
     -- Assume Linux for now.
     path = "lib/gl/luagl/libluaglu.so"

diff --git a/lib/sdl.lua b/lib/sdl.lua
@@ -1,7 +1,6 @@
 local path
 if WIN32 then
-    -- TODO: Support Release target too.
-    path = "lib/sdl/LuaSDL_new/bin/Debug/LuaSDL.dll"
+    path = "lib/sdl/LuaSDL_new/LuaSDL.dll"
 else
     -- Assume Linux for now.
     path = "lib/sdl/LuaSDL_new/libluasdl.so"

diff --git a/lib/sdl/LuaSDL_new/.gitignore b/lib/sdl/LuaSDL_new/.gitignore
@@ -4,3 +4,4 @@ bin/Debug/*.dll
 bin/Release/*.dll
 pkg/SDL_config.h.pkg
 pkg/SDL_platform.h.pkg
+LuaSDL.dll
diff --git a/lib/sdl/LuaSDL_new/LuaSDL.cbp b/lib/sdl/LuaSDL_new/LuaSDL.cbp
@@ -53,6 +53,10 @@
 			<Add directory="..\..\..\contrib\lua" />
 			<Add directory="..\..\..\contrib\sdl\lib" />
 		</Linker>
+		<ExtraCommands>
+			<Add after='cmd /c copy &quot;${TARGET_OUTPUT_FILE}&quot; .' />
+			<Mode after="always" />
+		</ExtraCommands>
 		<Unit filename="..\..\sdl.lua">
 			<Option target="&lt;{~None~}&gt;" />
 		</Unit>

diff --git a/lib/sdlgl.lua b/lib/sdlgl.lua
@@ -1,7 +1,6 @@
 local path
 if WIN32 then
-    -- TODO: Support Release target too.
-    path = "lib/sdlgl/bin/Debug/sdlgl.dll"
+    path = "lib/sdlgl/sdlgl.dll"
 else
     -- Assume Linux for now.
     path = "lib/sdlgl/libsdlgl.so"

diff --git a/lib/sdlgl/.gitignore b/lib/sdlgl/.gitignore
@@ -1,2 +1,3 @@
 /obj
 /bin
+sdlgl.dll
diff --git a/lib/sdlgl/sdlgl.cbp b/lib/sdlgl/sdlgl.cbp
@@ -45,6 +45,10 @@
 			<Add directory="..\..\contrib\lua" />
 			<Add directory="..\..\contrib\sdl\lib" />
 		</Linker>
+		<ExtraCommands>
+			<Add after='cmd /c copy &quot;${TARGET_OUTPUT_FILE}&quot; .' />
+			<Mode after="always" />
+		</ExtraCommands>
 		<Unit filename="..\sdlgl.lua">
 			<Option target="&lt;{~None~}&gt;" />
 		</Unit>