summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorNicolas Noble <pixel@Shinji.local>2008-12-03 04:34:51 -0800
committerNicolas Noble <pixel@Shinji.local>2008-12-03 04:34:51 -0800
commit218bc9c15cd75afa0165b453243f2b706142af9b (patch)
treef61193bd36c8472aa8e29255c26015984c2c9879 /src
parentc9d980fd1e4cec1973ea3e7d54ae7057e9c29e08 (diff)
Fixing module system for Darwin.
Diffstat (limited to 'src')
-rw-r--r--src/lua-interface-main.c5
-rw-r--r--src/lua-interface-win32-main.c5
-rw-r--r--src/lua-interface.cpp5
3 files changed, 8 insertions, 7 deletions
diff --git a/src/lua-interface-main.c b/src/lua-interface-main.c
new file mode 100644
index 0000000..35579db
--- /dev/null
+++ b/src/lua-interface-main.c
@@ -0,0 +1,5 @@
+int dll_main(int argc, char ** argv);
+
+int main(int argc, char ** argv) {
+ dll_main(argc, argv);
+}
diff --git a/src/lua-interface-win32-main.c b/src/lua-interface-win32-main.c
deleted file mode 100644
index e268432..0000000
--- a/src/lua-interface-win32-main.c
+++ /dev/null
@@ -1,5 +0,0 @@
-int win32_dll_main(int argc, char ** argv);
-
-int main(int argc, char ** argv) {
- win32_dll_main(argc, argv);
-}
diff --git a/src/lua-interface.cpp b/src/lua-interface.cpp
index 79307a6..0765f4c 100644
--- a/src/lua-interface.cpp
+++ b/src/lua-interface.cpp
@@ -74,11 +74,12 @@ extern void luaosmesa_init(Lua * L) WEAK;
}
-#ifdef _WIN32
#ifndef NO_DLL
-#define main win32_dll_main
+#define main dll_main
#endif
+#ifdef _WIN32
+
#include <windows.h>
#include <ctype.h>
#include <conio.h>