Commits

Anonymous committed fd735af Merge

Merging upstream changes

  • Participants
  • Parent commits 8ad8479, ee911c2

Comments (0)

Files changed (2)

File platform/macosx/love.xcodeproj/project.pbxproj

 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
+				DEPLOYMENT_POSTPROCESSING = YES;
 				FRAMEWORK_SEARCH_PATHS = "";
 				GCC_C_LANGUAGE_STANDARD = c99;
 				GCC_INPUT_FILETYPE = automatic;
 					../../src,
 					../../src/modules,
 				);
+				LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks";
 				LIBRARY_SEARCH_PATHS = "";
 				ONLY_ACTIVE_ARCH = NO;
 				OTHER_LDFLAGS = "";

File src/modules/font/freetype/Font.cpp

 		int length = glyphs.size();
 		unsigned short * g = new unsigned short[length];
 		for (int i = 0; i < length; i++) {
-			g[i] = glyphs[i];
+			g[i] = (unsigned char)glyphs[i];
 		}
 		Rasterizer * r = newRasterizer(data, g, length);
 		delete [] g;