update windows build for LJ2 and openal

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

build/te4core.lua

@@ -44,7 +44,7 @@ project "TEngine"
         	links { "IOKit" }
 
 	configuration "windows"
-		links { "mingw32", "SDLmain", "SDL", "SDL_ttf", "SDL_image", "openal", "OPENGL32", "GLU32", "wsock32" }
+		links { "mingw32", "SDLmain", "SDL", "SDL_ttf", "SDL_image", "openal32", "vorbisfile", "OPENGL32", "GLU32", "wsock32" }
 		defines { [[TENGINE_HOME_PATH='"T-Engine"']], 'SELFEXE_WINDOWS'  }
 		prebuildcommands { "windres ../src/windows/icon.rc -O coff -o ../src/windows/icon.res" }
 		linkoptions { "../src/windows/icon.res" }
@@ -107,6 +107,7 @@ elseif _OPTIONS.lua == "jit2" then
 		targetname "lua"
 
 		files { "../src/luajit2/src/*.c", "../src/luajit2/src/*.s", "../src/luajit2/src/lj_vm.s", "../src/luajit2/src/lj_bcdef.h", "../src/luajit2/src/lj_ffdef.h", "../src/luajit2/src/lj_ffdef.h", "../src/luajit2/src/lj_libdef.h", "../src/luajit2/src/lj_recdef.h", "../src/luajit2/src/lj_folddef.h" }
+		excludes { "../src/luajit2/src/buildvm*.c", "../src/luajit2/src/luajit.c" }
 
 		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"
@@ -120,6 +121,20 @@ elseif _OPTIONS.lua == "jit2" then
 				"../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",
+				"../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/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",
+			}
+
 end
 
 project "luasocket"

premake4.lua

@@ -5,7 +5,7 @@ solution "TEngine"
 	objdir "obj"
 	defines {"GLEW_STATIC"}
 	if _OPTIONS.force32bits then buildoptions{"-m32"} linkoptions{"-m32"} libdirs{"/usr/lib32"} end
-	if _OPTIONS.relpath then linkoptions{"-Wl,-rpath -Wl,\\\$\$ORIGIN/lib "} end
+	if _OPTIONS.relpath then linkoptions{"-Wl,-rpath -Wl,\\\$\$ORIGIN/lib "} end	
 
 	includedirs {
 		"src",
@@ -31,6 +31,8 @@ configuration "windows"
 		"/e/libs/SDL_ttf-2.0.9/lib",
 		"/e/libs/SDL_image-1.2.10/lib",
 		"/e/libs/SDL_mixer-1.2.11/lib",
+		"/e/libs/libvorbis-1.3.2/lib/.libs",
+		"/e/libs/libogg-1.2.2/src/.libs",
 		"/e/apps/mingw/lib",
 	}
 	includedirs {
@@ -38,6 +40,8 @@ configuration "windows"
 		"/e/libs/SDL_ttf-2.0.9/include/",
 		"/e/libs/SDL_image-1.2.10/include/",
 		"/e/libs/SDL_mixer-1.2.11/include/",
+		"/e/libs/libvorbis-1.3.2/include",
+		"/e/libs/libogg-1.2.2/include",
 		"/e/apps/mingw/include/GL",
 	}
 

src/music.h

@@ -26,8 +26,8 @@
 #include <OpenAL/alc.h>
 #include <Vorbis/vorbisfile.h>
 #elif defined(WIN32)
-#include <al.h>
-#include <alc.h>
+#include <AL/al.h>
+#include <AL/alc.h>
 #include <vorbis/vorbisfile.h>
 #else
 #include <AL/al.h>