update macosx build using premake

git-svn-id: http://svn.net-core.org/repos/t-engine4@3828 51575b47-30f0-44d4-a5cc-537603b46e54

bootstrap/boot.lua

@@ -14,6 +14,8 @@ if __SELFEXE then
 	if not __APPLE__ then
 		-- Now remove executable name
 		dir = dir:gsub("(.*"..fs.getPathSeparator()..").+", "%1")
+	else
+		dir = dir:gsub("(.*"..fs.getPathSeparator()..").+", "%1")..fs.getPathSeparator().."Resources"..fs.getPathSeparator()
 	end
 
 	print("SelfExe gave us app directory of:", dir)

build/te4core.lua

@@ -32,14 +32,18 @@ project "TEngine"
 		files { "../src/mac/SDL*" }
 	        includedirs {
         	      "/System/Library/Frameworks/OpenGL.framework/Headers",
+        	      "/System/Library/Frameworks/OpenAL.framework/Headers",
+	              "/Library/Frameworks/Ogg.framework/Headers",
+	              "/Library/Frameworks/Vorbis.framework/Headers",
+	              "/Library/Frameworks/SDL.framework/Headers",
 	              "/Library/Frameworks/SDL.framework/Headers",
         	      "/Library/Frameworks/SDL_net.framework/Headers",
 	              "/Library/Frameworks/SDL_image.framework/Headers",
         	      "/Library/Frameworks/SDL_ttf.framework/Headers",
 	              "/Library/Frameworks/SDL_mixer.framework/Headers"
         	}
-	        defines { "USE_TENGINE_MAIN", 'SELFEXE_MACOSX'  }
-		linkoptions { "-framework SDL", "-framework SDL_image", "-framework SDL_ttf", "-framework SDL_mixer", "-framework Cocoa", "-framework OpenGL" }
+	        defines { "USE_TENGINE_MAIN", 'SELFEXE_MACOSX', [[TENGINE_HOME_PATH='"/Library/Application Support/T-Engine/"']]  }
+		linkoptions { "-framework Vorbis", "-framework Ogg", "-framework SDL", "-framework SDL_image", "-framework SDL_ttf", "-framework SDL_mixer", "-framework Cocoa", "-framework OpenGL" , "-framework OpenAL" }
 		targetdir "."
         	links { "IOKit" }
 
@@ -112,7 +116,7 @@ elseif _OPTIONS.lua == "jit2" then
 		configuration "linux"
 			local list = "../src/luajit2/src/lib_base.c ../src/luajit2/src/lib_math.c ../src/luajit2/src/lib_bit.c ../src/luajit2/src/lib_string.c ../src/luajit2/src/lib_table.c ../src/luajit2/src/lib_io.c ../src/luajit2/src/lib_os.c ../src/luajit2/src/lib_package.c ../src/luajit2/src/lib_debug.c ../src/luajit2/src/lib_jit.c ../src/luajit2/src/lib_ffi.c"
 			prebuildcommands{
-				"gcc -o ../src/luajit2/src/buildvm ../src/luajit2/src/buildvm*.c",
+				_OPTIONS.force32bits and "gcc -m32 -o ../src/luajit2/src/buildvm ../src/luajit2/src/buildvm*.c" or "gcc -o ../src/luajit2/src/buildvm ../src/luajit2/src/buildvm*.c",
 				"../src/luajit2/src/buildvm -m elfasm -o ../src/luajit2/src/lj_vm.s",
 				"../src/luajit2/src/buildvm -m bcdef -o ../src/luajit2/src/lj_bcdef.h "..list,
 				"../src/luajit2/src/buildvm -m ffdef -o ../src/luajit2/src/lj_ffdef.h "..list,
@@ -122,10 +126,23 @@ elseif _OPTIONS.lua == "jit2" then
 				"../src/luajit2/src/buildvm -m folddef -o ../src/luajit2/src/lj_folddef.h ../src/luajit2/src/lj_opt_fold.c",
 			}
 
+		configuration "macosx"
+			local list = "../src/luajit2/src/lib_base.c ../src/luajit2/src/lib_math.c ../src/luajit2/src/lib_bit.c ../src/luajit2/src/lib_string.c ../src/luajit2/src/lib_table.c ../src/luajit2/src/lib_io.c ../src/luajit2/src/lib_os.c ../src/luajit2/src/lib_package.c ../src/luajit2/src/lib_debug.c ../src/luajit2/src/lib_jit.c ../src/luajit2/src/lib_ffi.c"
+			prebuildcommands{
+				_OPTIONS.force32bits and "gcc -m32 -o ../src/luajit2/src/buildvm ../src/luajit2/src/buildvm*.c" or "gcc -o ../src/luajit2/src/buildvm ../src/luajit2/src/buildvm*.c",
+				"../src/luajit2/src/buildvm -m machasm -o ../src/luajit2/src/lj_vm.s",
+				"../src/luajit2/src/buildvm -m bcdef -o ../src/luajit2/src/lj_bcdef.h "..list,
+				"../src/luajit2/src/buildvm -m ffdef -o ../src/luajit2/src/lj_ffdef.h "..list,
+				"../src/luajit2/src/buildvm -m libdef -o ../src/luajit2/src/lj_libdef.h "..list,
+				"../src/luajit2/src/buildvm -m recdef -o ../src/luajit2/src/lj_recdef.h "..list,
+				"../src/luajit2/src/buildvm -m vmdef -o ../src/luajit2/vmdef.lua "..list,
+				"../src/luajit2/src/buildvm -m folddef -o ../src/luajit2/src/lj_folddef.h ../src/luajit2/src/lj_opt_fold.c",
+			}
+
 		configuration "windows"
 			local list = "../src/luajit2/src/lib_base.c ../src/luajit2/src/lib_math.c ../src/luajit2/src/lib_bit.c ../src/luajit2/src/lib_string.c ../src/luajit2/src/lib_table.c ../src/luajit2/src/lib_io.c ../src/luajit2/src/lib_os.c ../src/luajit2/src/lib_package.c ../src/luajit2/src/lib_debug.c ../src/luajit2/src/lib_jit.c ../src/luajit2/src/lib_ffi.c"
 			prebuildcommands{
-				"gcc -o ../src/luajit2/src/buildvm ../src/luajit2/src/buildvm*.c",
+				_OPTIONS.force32bits and "gcc -m32 -o ../src/luajit2/src/buildvm ../src/luajit2/src/buildvm*.c" or "gcc -o ../src/luajit2/src/buildvm ../src/luajit2/src/buildvm*.c",
 				"../src/luajit2/src/buildvm -m coffasm -o ../src/luajit2/src/lj_vm.s",
 				"../src/luajit2/src/buildvm -m bcdef -o ../src/luajit2/src/lj_bcdef.h "..list,
 				"../src/luajit2/src/buildvm -m ffdef -o ../src/luajit2/src/lj_ffdef.h "..list,

src/main.c

@@ -786,7 +786,9 @@ void boot_lua(int state, bool rebooting, int argc, char *argv[])
 		SDL_WM_SetCaption("T-Engine4", NULL);
 
 		// Now we can open lua lanes, the physfs paths are set and it can load it's lanes-keeper.lua file
-//		luaopen_lanes(L);
+		//		luaopen_lanes(L);
+
+		printf("Running lua loader code...\n");
 
 		// And run the lua engine scripts
 		if (!luaL_loadfile(L, "/loader/init.lua"))

src/music.h

@@ -21,10 +21,10 @@
 #ifndef _MUSIC_H_
 #define _MUSIC_H_
 
-#if defined(MACOSX)
-#include <OpenAL/al.h>
-#include <OpenAL/alc.h>
-#include <Vorbis/vorbisfile.h>
+#ifdef __APPLE__
+#include <al.h>
+#include <alc.h>
+#include <vorbisfile.h>
 #elif defined(WIN32)
 #include <AL/al.h>
 #include <AL/alc.h>