Rename loaders to fit their locations

--HG--
branch : minor
This commit is contained in:
Bart van Strien
2011-03-13 20:25:35 +01:00
parent 254bd29244
commit b4139ffab5
28 changed files with 41 additions and 41 deletions
+13 -13
View File
@@ -66,19 +66,19 @@
#ifdef LOVE_BUILD_STANDALONE #ifdef LOVE_BUILD_STANDALONE
static const luaL_Reg modules[] = { static const luaL_Reg modules[] = {
{ "love.audio.openal", love::audio::openal::luaopen_love_audio }, { "love.audio.openal", love::audio::openal::luaopen_love_audio_openal },
{ "love.event.sdl", love::event::sdl::luaopen_love_event }, { "love.event.sdl", love::event::sdl::luaopen_love_event_sdl },
{ "love.filesystem.physfs", love::filesystem::physfs::luaopen_love_filesystem }, { "love.filesystem.physfs", love::filesystem::physfs::luaopen_love_filesystem_physfs },
{ "love.font.freetype", love::font::freetype::luaopen_love_font }, { "love.font.freetype", love::font::freetype::luaopen_love_font_freetype },
{ "love.graphics.opengl", love::graphics::opengl::luaopen_love_graphics }, { "love.graphics.opengl", love::graphics::opengl::luaopen_love_graphics_opengl },
{ "love.image.devil", love::image::devil::luaopen_love_image }, { "love.image.devil", love::image::devil::luaopen_love_image_devil },
{ "love.joystick.sdl", love::joystick::sdl::luaopen_love_joystick }, { "love.joystick.sdl", love::joystick::sdl::luaopen_love_joystick_sdl },
{ "love.keyboard.sdl", love::keyboard::sdl::luaopen_love_keyboard }, { "love.keyboard.sdl", love::keyboard::sdl::luaopen_love_keyboard_sdl },
{ "love.mouse.sdl", love::mouse::sdl::luaopen_love_mouse }, { "love.mouse.sdl", love::mouse::sdl::luaopen_love_mouse_sdl },
{ "love.physics.box2d", love::physics::box2d::luaopen_love_physics }, { "love.physics.box2d", love::physics::box2d::luaopen_love_physics_box2d },
{ "love.sound.lullaby", love::sound::lullaby::luaopen_love_sound }, { "love.sound.lullaby", love::sound::lullaby::luaopen_love_sound_lullaby },
{ "love.timer.sdl", love::timer::sdl::luaopen_love_timer }, { "love.timer.sdl", love::timer::sdl::luaopen_love_timer_sdl },
{ "love.thread.sdl", love::thread::sdl::luaopen_love_thread }, { "love.thread.sdl", love::thread::sdl::luaopen_love_thread_sdl },
{ 0, 0 } { 0, 0 }
}; };
+1 -1
View File
@@ -63,7 +63,7 @@ namespace openal
0 0
}; };
int luaopen_love_audio(lua_State * L) int luaopen_love_audio_openal(lua_State * L)
{ {
if(instance == 0) if(instance == 0)
{ {
+1 -1
View File
@@ -30,7 +30,7 @@ namespace audio
{ {
namespace openal namespace openal
{ {
extern "C" LOVE_EXPORT int luaopen_love_audio(lua_State * L); extern "C" LOVE_EXPORT int luaopen_love_audio_openal(lua_State * L);
} // openal } // openal
} // audio } // audio
+1 -1
View File
@@ -186,7 +186,7 @@ namespace sdl
{ 0, 0 } { 0, 0 }
}; };
int luaopen_love_event(lua_State * L) int luaopen_love_event_sdl(lua_State * L)
{ {
if(instance == 0) if(instance == 0)
{ {
+1 -1
View File
@@ -36,7 +36,7 @@ namespace sdl
int w_wait(lua_State * L); int w_wait(lua_State * L);
int w_push(lua_State * L); int w_push(lua_State * L);
extern "C" LOVE_EXPORT int luaopen_love_event(lua_State * L); extern "C" LOVE_EXPORT int luaopen_love_event_sdl(lua_State * L);
} // sdl } // sdl
} // event } // event
@@ -318,7 +318,7 @@ namespace physfs
0 0
}; };
int luaopen_love_filesystem(lua_State * L) int luaopen_love_filesystem_physfs(lua_State * L)
{ {
if(instance == 0) if(instance == 0)
{ {
@@ -59,7 +59,7 @@ namespace physfs
int w_load(lua_State * L); int w_load(lua_State * L);
int w_getLastModified(lua_State * L); int w_getLastModified(lua_State * L);
int loader(lua_State * L); int loader(lua_State * L);
extern "C" LOVE_EXPORT int luaopen_love_filesystem(lua_State * L); extern "C" LOVE_EXPORT int luaopen_love_filesystem_physfs(lua_State * L);
} // physfs } // physfs
} // filesystem } // filesystem
+1 -1
View File
@@ -77,7 +77,7 @@ namespace freetype
0 0
}; };
int luaopen_love_font(lua_State * L) int luaopen_love_font_freetype(lua_State * L)
{ {
if(instance == 0) if(instance == 0)
{ {
+1 -1
View File
@@ -34,7 +34,7 @@ namespace freetype
int w_newRasterizer(lua_State * L); int w_newRasterizer(lua_State * L);
int w_newGlyphData(lua_State * L); int w_newGlyphData(lua_State * L);
int w_newFontData(lua_State * L); int w_newFontData(lua_State * L);
extern "C" LOVE_EXPORT int luaopen_love_font(lua_State * L); extern "C" LOVE_EXPORT int luaopen_love_font_freetype(lua_State * L);
} // freetype } // freetype
} // font } // font
@@ -1000,7 +1000,7 @@ namespace opengl
0 0
}; };
int luaopen_love_graphics(lua_State * L) int luaopen_love_graphics_opengl(lua_State * L)
{ {
if(instance == 0) if(instance == 0)
{ {
+1 -1
View File
@@ -100,7 +100,7 @@ namespace opengl
int w_scale(lua_State * L); int w_scale(lua_State * L);
int w_translate(lua_State * L); int w_translate(lua_State * L);
int w_hasFocus(lua_State * L); int w_hasFocus(lua_State * L);
extern "C" LOVE_EXPORT int luaopen_love_graphics(lua_State * L); extern "C" LOVE_EXPORT int luaopen_love_graphics_opengl(lua_State * L);
} // opengl } // opengl
} // graphics } // graphics
+1 -1
View File
@@ -43,7 +43,7 @@ namespace devil
0 0
}; };
int luaopen_love_image(lua_State * L) int luaopen_love_image_devil(lua_State * L)
{ {
if(instance == 0) if(instance == 0)
{ {
+1 -1
View File
@@ -31,7 +31,7 @@ namespace image
{ {
namespace devil namespace devil
{ {
extern "C" LOVE_EXPORT int luaopen_love_image(lua_State * L); extern "C" LOVE_EXPORT int luaopen_love_image_devil(lua_State * L);
} //devil } //devil
} // image } // image
+1 -1
View File
@@ -151,7 +151,7 @@ namespace sdl
{ 0, 0 } { 0, 0 }
}; };
int luaopen_love_joystick(lua_State * L) int luaopen_love_joystick_sdl(lua_State * L)
{ {
if(instance == 0) if(instance == 0)
{ {
+1 -1
View File
@@ -45,7 +45,7 @@ namespace sdl
int w_isDown(lua_State * L); int w_isDown(lua_State * L);
int w_getHat(lua_State * L); int w_getHat(lua_State * L);
int w_close(lua_State * L); int w_close(lua_State * L);
extern "C" LOVE_EXPORT int luaopen_love_joystick(lua_State * L); extern "C" LOVE_EXPORT int luaopen_love_joystick_sdl(lua_State * L);
} // sdl } // sdl
} // joystick } // joystick
+1 -1
View File
@@ -72,7 +72,7 @@ namespace sdl
{ 0, 0 } { 0, 0 }
}; };
int luaopen_love_keyboard(lua_State * L) int luaopen_love_keyboard_sdl(lua_State * L)
{ {
if(instance == 0) if(instance == 0)
{ {
+1 -1
View File
@@ -37,7 +37,7 @@ namespace sdl
int w_isDown(lua_State * L); int w_isDown(lua_State * L);
int w_setKeyRepeat(lua_State * L); int w_setKeyRepeat(lua_State * L);
int w_getKeyRepeat(lua_State * L); int w_getKeyRepeat(lua_State * L);
extern "C" LOVE_EXPORT int luaopen_love_keyboard(lua_State * L); extern "C" LOVE_EXPORT int luaopen_love_keyboard_sdl(lua_State * L);
} // sdl } // sdl
} // keyboard } // keyboard
+1 -1
View File
@@ -109,7 +109,7 @@ namespace sdl
{ 0, 0 } { 0, 0 }
}; };
int luaopen_love_mouse(lua_State * L) int luaopen_love_mouse_sdl(lua_State * L)
{ {
if(instance == 0) if(instance == 0)
{ {
+1 -1
View File
@@ -40,7 +40,7 @@ namespace sdl
int w_isVisible(lua_State * L); int w_isVisible(lua_State * L);
int w_setGrap(lua_State * L); int w_setGrap(lua_State * L);
int w_isGrabbed(lua_State * L); int w_isGrabbed(lua_State * L);
extern "C" LOVE_EXPORT int luaopen_love_mouse(lua_State * L); extern "C" LOVE_EXPORT int luaopen_love_mouse_sdl(lua_State * L);
} // sdl } // sdl
} // mouse } // mouse
+1 -1
View File
@@ -229,7 +229,7 @@ namespace box2d
0 0
}; };
int luaopen_love_physics(lua_State * L) int luaopen_love_physics_box2d(lua_State * L)
{ {
if(instance == 0) if(instance == 0)
{ {
+1 -1
View File
@@ -55,7 +55,7 @@ namespace box2d
int w_newPrismaticJoint(lua_State * L); int w_newPrismaticJoint(lua_State * L);
int w_newPulleyJoint(lua_State * L); int w_newPulleyJoint(lua_State * L);
int w_newGearJoint(lua_State * L); int w_newGearJoint(lua_State * L);
extern "C" LOVE_EXPORT int luaopen_love_physics(lua_State * L); extern "C" LOVE_EXPORT int luaopen_love_physics_box2d(lua_State * L);
} // box2d } // box2d
} // physics } // physics
+1 -1
View File
@@ -42,7 +42,7 @@ namespace lullaby
0 0
}; };
int luaopen_love_sound(lua_State * L) int luaopen_love_sound_lullaby(lua_State * L)
{ {
if(instance == 0) if(instance == 0)
{ {
+1 -1
View File
@@ -31,7 +31,7 @@ namespace sound
{ {
namespace lullaby namespace lullaby
{ {
extern "C" LOVE_EXPORT int luaopen_love_sound(lua_State * L); extern "C" LOVE_EXPORT int luaopen_love_sound_lullaby(lua_State * L);
} // lullaby } // lullaby
} // sound } // sound
+2 -2
View File
@@ -25,7 +25,7 @@
#ifdef LOVE_BUILD_STANDALONE #ifdef LOVE_BUILD_STANDALONE
extern "C" int luaopen_love(lua_State * L); extern "C" int luaopen_love(lua_State * L);
#endif // LOVE_BUILD_STANDALONE #endif // LOVE_BUILD_STANDALONE
extern "C" int luaopen_love_thread(lua_State *L); extern "C" int luaopen_love_thread_sdl(lua_State *L);
namespace love namespace love
{ {
@@ -41,7 +41,7 @@ namespace sdl
love::luax_preload(L, luaopen_love, "love"); love::luax_preload(L, luaopen_love, "love");
luaopen_love(L); luaopen_love(L);
#endif // LOVE_BUILD_STANDALONE #endif // LOVE_BUILD_STANDALONE
luaopen_love_thread(L); luaopen_love_thread_sdl(L);
{ {
size_t len; size_t len;
const char *name = comm->getName(&len); const char *name = comm->getName(&len);
+1 -1
View File
@@ -356,7 +356,7 @@ namespace sdl
0 0
}; };
int luaopen_love_thread(lua_State *L) int luaopen_love_thread_sdl(lua_State *L)
{ {
if(instance == 0) if(instance == 0)
{ {
+1 -1
View File
@@ -48,7 +48,7 @@ namespace sdl
int w_getThreads(lua_State *L); int w_getThreads(lua_State *L);
int w_getThread(lua_State *L); int w_getThread(lua_State *L);
extern "C" LOVE_EXPORT int luaopen_love_thread(lua_State * L); extern "C" LOVE_EXPORT int luaopen_love_thread_sdl(lua_State * L);
} // sdl } // sdl
} // thread } // thread
} // love } // love
+1 -1
View File
@@ -78,7 +78,7 @@ namespace sdl
}; };
int luaopen_love_timer(lua_State * L) int luaopen_love_timer_sdl(lua_State * L)
{ {
if(instance == 0) if(instance == 0)
{ {
+1 -1
View File
@@ -37,7 +37,7 @@ namespace sdl
int w_sleep(lua_State * L); int w_sleep(lua_State * L);
int w_getTime(lua_State * L); int w_getTime(lua_State * L);
int w_getMicroTime(lua_State * L); int w_getMicroTime(lua_State * L);
extern "C" LOVE_EXPORT int luaopen_love_timer(lua_State * L); extern "C" LOVE_EXPORT int luaopen_love_timer_sdl(lua_State * L);
} // sdl } // sdl
} // timer } // timer