Add a reminder about the submodule to the README, and some other minor

stuff (permissions etc), fixing the build for MacOSX again

Core/MIPS/MIPSIntVFPU.cpp

@@ -656,7 +656,7 @@ namespace MIPSInt
       }
       colors[i] = col;
     }
-    u32 ov[2] =  {colors[0] | (colors[1] << 16), colors[2] | (colors[3] << 16)};
+    u32 ov[2] =  {(u32)colors[0] | (colors[1] << 16), (u32)colors[2] | (colors[3] << 16)};
     WriteVector((const float *)ov, V_Pair, vd);
     PC += 4;
     EatPrefixes();
@@ -967,7 +967,7 @@ namespace MIPSInt
 
 	void Int_Vcst(u32 op)
 	{
-		static const float constants[32] = 
+		static const float constants[32] =
 		{
 			0,
 			std::numeric_limits<float>::infinity(),  // or max() ??   pspautotests seem to indicate inf
@@ -986,9 +986,9 @@ namespace MIPSInt
 			(float)M_LN10,
 			2*(float)M_PI,
 			(float)M_PI/6,
-			log10(2.0f), 
-			log(10.0f)/log(2.0f), //"Log2(10)",
-			sqrt(3.0f)/2.0f, //"Sqrt(3)/2"
+			log10f(2.0f),
+			logf(10.0f)/logf(2.0f), //"Log2(10)",
+			sqrtf(3.0f)/2.0f, //"Sqrt(3)/2"
 		};
 
 		int conNum = (op >> 16) & 0x1f;
@@ -997,12 +997,12 @@ namespace MIPSInt
 		VectorSize sz = GetVecSize(op);
 		float c = constants[conNum];
 		float temp[4] = {c,c,c,c};
-		WriteVector(temp, sz, vd);	
+		WriteVector(temp, sz, vd);
 		PC += 4;
 		EatPrefixes();
 	}
 
-	enum VCondition 
+	enum VCondition
 	{
 		VC_FL,
 		VC_EQ,

README.md

@@ -17,6 +17,15 @@ BASIC BUILD INSTRUCTIONS
 
 (for more detailed instructions, see http://www.ppsspp.org/development.html )
 
+First of all, after having checked out the source, don't forget to
+run:
+git submodule init
+git submodule update
+
+in order to get the "native" library.
+
+Now, the actual building:
+
 PPSSPP currently has three build systems, for building
 for the following platforms:
 * Win32: MSVC

SDL/CMakeLists.txt

@@ -24,9 +24,10 @@ add_definitions(-Wno-multichar)
 add_definitions(-fno-strict-aliasing)
 add_definitions(-DUSE_PROFILER)
 
-#Damn MacOSX
 if (UNIX)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++0x")
+	if (NOT APPLE)  # can't build the SDL .m file with -std=gnu++0x
+		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++0x")
+	endif()
 endif()
 
 include_directories(..)
@@ -70,18 +71,18 @@ set(FILES
 	../android/jni/MenuScreens.cpp
 	../android/jni/GamepadEmu.cpp
 	../android/jni/UIShader.cpp
-  ../android/jni/ui_atlas.cpp
+	../android/jni/ui_atlas.cpp
 	../native/base/PCMain.cpp
 	)
 
 if (APPLE)
-  SET(FILES ${FILES} SDLMain.m)
+	SET(FILES ${FILES} SDLMain.m)
 endif (APPLE)
 
 add_executable(ppsspp ${FILES})
 
 target_link_libraries(ppsspp ${LIBS})
-	
+
 set(FILES ../headless/Headless.cpp)
 
 add_executable(ppsspp-headless ${FILES})

SDL/README.TXT

@@ -1,6 +1,7 @@
 1. Install GCC, CMake, and development libraries for zlib and sdl.
 2. cd SDL
-3. ./b.sh
+3. ./buildassets.sh
+4. ./b.sh
 
 That should do it.