Commits

Laurens Rodriguez committed b979492

Fixed script graphics.kia (there was no fonts)
Fixed love lua compilation

Comments (0)

Files changed (4)

platform/msvc2008/love.vcproj

 			RelativePath="..\..\src\love.cpp"
 			>
 			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					ObjectFile="$(IntDir)\love\"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					ObjectFile="$(IntDir)\"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
 				Name="love-lua|Win32"
 				>
 				<Tool

src/common/script.h

 #define LOVE_SCRIPT_H_
 
 #ifdef LOVE_USE_LUA
-
-    #include <lua.h>
-    #include <lualib.h>
-    #include <lauxlib.h>
+    #ifdef __cplusplus
+    extern "C" {
+    #endif
+    #   include <lua.h>
+    #   include <lualib.h>
+    #   include <lauxlib.h>
+    #ifdef __cplusplus
+    }
+    #endif
 
     #if (LUA_VERSION_NUM > 501)
     #   define luaL_reg          luaL_Reg

src/scripts/graphics.kia

 		gl_FragColor = effect(gl_Color, _tex0_, gl_TexCoord[0].xy, gl_FragCoord.xy);
 	}"""
     public function love.graphics._effectCodeToGLSL(code) {
-		return table.concat{GLSL_HEADER, "\n", code, GLSL_FOOTER}
+		return table.concat([GLSL_HEADER, "\n", code, GLSL_FOOTER])
     }
 
     public function love.graphics._transformGLSLErrorMessages(message) {

src/scripts/graphics.kia.h

 	0x66, 0x66, 0x65, 0x63, 0x74, 0x43, 0x6f, 0x64, 0x65, 0x54, 0x6f, 0x47, 0x4c, 0x53, 0x4c, 0x28, 0x63, 0x6f, 
 	0x64, 0x65, 0x29, 0x20, 0x7b, 0x0a,
 	0x09, 0x09, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x2e, 0x63, 0x6f, 0x6e, 
-	0x63, 0x61, 0x74, 0x7b, 0x47, 0x4c, 0x53, 0x4c, 0x5f, 0x48, 0x45, 0x41, 0x44, 0x45, 0x52, 0x2c, 0x20, 0x22, 
-	0x5c, 0x6e, 0x22, 0x2c, 0x20, 0x63, 0x6f, 0x64, 0x65, 0x2c, 0x20, 0x47, 0x4c, 0x53, 0x4c, 0x5f, 0x46, 0x4f, 
-	0x4f, 0x54, 0x45, 0x52, 0x7d, 0x0a,
+	0x63, 0x61, 0x74, 0x28, 0x5b, 0x47, 0x4c, 0x53, 0x4c, 0x5f, 0x48, 0x45, 0x41, 0x44, 0x45, 0x52, 0x2c, 0x20, 
+	0x22, 0x5c, 0x6e, 0x22, 0x2c, 0x20, 0x63, 0x6f, 0x64, 0x65, 0x2c, 0x20, 0x47, 0x4c, 0x53, 0x4c, 0x5f, 0x46, 
+	0x4f, 0x4f, 0x54, 0x45, 0x52, 0x5d, 0x29, 0x0a,
 	0x20, 0x20, 0x20, 0x20, 0x7d, 0x0a,0x0a,
 	0x20, 0x20, 0x20, 0x20, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 
 	0x6e, 0x20, 0x6c, 0x6f, 0x76, 0x65, 0x2e, 0x67, 0x72, 0x61, 0x70, 0x68, 0x69, 0x63, 0x73, 0x2e, 0x5f, 0x74,