Skip to content

Commit

Permalink
Install langregion and shaders for iOS and other CMake builds.
Browse files Browse the repository at this point in the history
  • Loading branch information
@xsacha
xsacha committed Oct 17, 2013
1 parent f48f458 commit a4ef688
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion CMakeLists.txt
View file
Expand Up @@ -1162,7 +1162,9 @@ if(ANDROID)
endif()
set(NativeAssets
android/assets/ui_atlas.zim
assets/ppge_atlas.zim)
assets/shaders
assets/ppge_atlas.zim
assets/langregion.ini)
set(LinkCommon ${CoreLibName} ${CMAKE_THREAD_LIBS_INIT} ${nativeExtraLibs})

if(USE_FFMPEG AND NOT DEFINED FFMPEG_BUILDDIR)
Expand Down Expand Up @@ -1322,6 +1324,8 @@ if(IOS)

file(GLOB IOSAssets ios/assets/*.png)
file(INSTALL ${IOSAssets} DESTINATION assets)
file(INSTALL assets/langregion.ini DESTINATION assets)
file(INSTALL assets/shaders DESTINATION assets)

This comment has been minimized.

Sign in to view

Copy link
@hrydgard

hrydgard Oct 24, 2013

Owner

People report this isn't working. Maybe you need to do a GLOB?

http://forums.ppsspp.org/showthread.php?tid=6895

This comment has been minimized.

Sign in to view

Copy link
@xsacha

xsacha Oct 24, 2013

Author Collaborator

Oh, it should work like 'flash0' and 'lang' directories. No GLOB required.
I think the issue is the shaders are only being looked for in the 'PSP' directory.

This comment has been minimized.

Sign in to view

Copy link
@hrydgard

hrydgard Oct 24, 2013

Owner

Why would they be? we look for shaders in assets.

This comment has been minimized.

Sign in to view

Copy link
@unknownbrackets

unknownbrackets Oct 24, 2013

Collaborator

Not sure what's wrong here. I suppose it's possible it ends up as assets/assets/shaders? Not really sure.

We look in both PSP/shaders/ and assets/shaders/ AFAIK.

-[Unknown]

This comment has been minimized.

Sign in to view

Copy link
@xsacha

xsacha Oct 24, 2013

Author Collaborator

I had to install shaders to PSP folder on Symbian and make a special ifdef to get the right assets folder on Blackberry. Most likely it's the same thing here.
It doesn't use the VFS folder (assets) but instead some hardcoded relative path 'assets/'. Would explain why it works on the SDL example (also using CMake here) as well.

This comment has been minimized.

Sign in to view

Copy link
@unknownbrackets

unknownbrackets Oct 24, 2013

Collaborator

But, it does use the VFS folder on Android, at least...

-[Unknown]

This comment has been minimized.

Sign in to view

Copy link
@xsacha

xsacha Oct 24, 2013

Author Collaborator

Coincidence. Right now it's hardcoded to look in "assets/" and memory card dir + "PSP/".
After it finds and lists the shaders, then it loads them from VFS (or full path if it is given).
Might be easier to just do memory card dir since that is usually same as VFS dir.
Or can we actually look for the .ini without hardcoding directories, pushing them to a list and scanning them like it is done now?

This comment has been minimized.

Sign in to view

Copy link
@unknownbrackets

unknownbrackets Oct 24, 2013

Collaborator

Well, on Android the VFS actually looks within the zip file, afaiu. So on Android they definitely are not usually the same.

-[Unknown]

This comment has been minimized.

Sign in to view

Copy link
@xsacha

xsacha Oct 24, 2013

Author Collaborator

So, install to PSP folder instead, change path to memory card or ..?
file(INSTALL flash0 DESTINATION assets)
file(INSTALL lang DESTINATION assets)
if (IOS_DEBUG)
Expand Down

0 comments on commit a4ef688

Please sign in to comment.