Move lang into assets.

.gitmodules

@@ -2,7 +2,7 @@
 	path = pspautotests
 	url = https://github.com/hrydgard/pspautotests.git
 [submodule "lang"]
-	path = lang
+	path = assets/lang
 	url = https://github.com/hrydgard/ppsspp-lang.git
 [submodule "ffmpeg"]
 	path = ffmpeg

CMakeLists.txt

@@ -1622,7 +1622,7 @@ if (TargetBin)
 		# Now this is very prone to errors when changes occur.
 		# Also better to have assets under Resources dir for OS X.
 		file(GLOB_RECURSE FLASH0_FILES flash0/*)
-		file(GLOB_RECURSE LANG_FILES lang/*)
+		file(GLOB_RECURSE LANG_FILES assets/lang/*)
 		file(GLOB_RECURSE SHADER_FILES assets/shaders/*)
 
 		if (APPLE AND NOT IOS)

android/ab.cmd

@@ -1,5 +1,5 @@
 xcopy ..\flash0 assets\flash0 /s /y <d.txt
-xcopy ..\lang assets\lang /s /y <d.txt
+xcopy ..\assets\lang assets\lang /s /y <d.txt
 xcopy ..\assets\shaders assets\shaders /s /y <d.txt
 copy ..\assets\langregion.ini assets\langregion.ini
 copy ..\assets\compat.ini assets\compat.ini

android/ab.sh

@@ -1,5 +1,5 @@
 cp -r ../flash0 assets
-cp -r ../lang assets
+cp -r ../assets/lang assets
 cp -r ../assets/shaders assets
 cp ../assets/langregion.ini assets/langregion.ini
 cp ../assets/compat.ini assets/compat.ini

make-font-textfiles.sh

@@ -1,3 +1,3 @@
-cat lang/zh_CN.ini lang/zh_TW.ini assets/langregion.ini > chinese.txt
-cat lang/ko_KR.ini assets/langregion.ini > korean.txt
+cat assets/lang/zh_CN.ini assets/lang/zh_TW.ini assets/langregion.ini > chinese.txt
+cat assets/lang/ko_KR.ini assets/langregion.ini > korean.txt