ShuriZma
/
flycast
mirror of https://github.com/flyinghead/flycast.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/reicast/emulator 

Conflicts:
	newdc/linux-dist/main.cpp
This commit is contained in:
ptitSeb 2013-12-20 21:46:59 +01:00
parent aa385f3320 639ff2737a
commit b2525bb150
4 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
newdc/linux-dist/main.cpp
View File

@ -625,7 +625,20 @@ int main(int argc, wchar* argv[])
init_sound();
#endif
#if defined(USES_HOMEDIR)
string home = (string)getenv("HOME");
if(home.c_str())
{
home += "/.reicast";
mkdir(home.c_str(), 0755); // create the directory if missing
SetHomeDir(home);
}
else
SetHomeDir(".");
#else
SetHomeDir(".");
#endif
printf("Home dir is: %s\n",GetPath("/").c_str());

4
reicast/android/src/com/reicast/emulator/GL2JNIView.java
View File

@ -52,7 +52,7 @@ import com.example.newdc.JNIdc;
class GL2JNIView extends GLSurfaceView
{
private static String fileName;
//private AudioThread audioThread;
//private AudioThread audioThread;
private EmuThread ethd = new EmuThread();
private static final boolean DEBUG = false;
@ -121,7 +121,7 @@ class GL2JNIView extends GLSurfaceView
public GL2JNIView(Context context,String newFileName,boolean translucent,int depth,int stencil)
{
super(context);
setKeepScreenOn(true);
vib=(Vibrator) context.getSystemService(Context.VIBRATOR_SERVICE);
// This is the game we are going to run

8
reicast/android/src/com/reicast/emulator/MainActivity.java
View File

@ -226,7 +226,7 @@ public class MainActivity extends Activity {
for (int i=0;i<list.size();i++)
{
if (list.get(i)!=null && list.get(i).isFile())
if (!list.get(i).getName().endsWith(".gdi") && !list.get(i).getName().endsWith(".cdi") && !list.get(i).getName().endsWith(".chd"))
if (!list.get(i).getName().toLowerCase().endsWith(".gdi") && !list.get(i).getName().toLowerCase().endsWith(".cdi") && !list.get(i).getName().toLowerCase().endsWith(".chd"))
continue;
View childview=getLayoutInflater().inflate(R.layout.app_list_item, null, false);
@ -241,9 +241,9 @@ public class MainActivity extends Activity {
((ImageView)childview.findViewById(R.id.item_icon)).setImageResource(
list.get(i)==null ? R.drawable.config :
list.get(i).isDirectory() ? R.drawable.open_folder :
list.get(i).getName().endsWith(".gdi") ? R.drawable.gdi :
list.get(i).getName().endsWith(".cdi") ? R.drawable.cdi :
list.get(i).getName().endsWith(".chd") ? R.drawable.chd :
list.get(i).getName().toLowerCase().endsWith(".gdi") ? R.drawable.gdi :
list.get(i).getName().toLowerCase().endsWith(".cdi") ? R.drawable.cdi :
list.get(i).getName().toLowerCase().endsWith(".chd") ? R.drawable.chd :
R.drawable.disk_unknown);
childview.setTag(list.get(i));

2
reicast/gcwz/Makefile
View File

@ -30,7 +30,7 @@ SOURCES := cfg/ hw/arm7/ hw/aica/ hw/asic/ hw/ hw/gdrom/ hw/maple/ \
hw/extdev/ hw/arm/ imgread/ linux/ linux-dist/ ./ rec-ARM/ deps/zlib/ deps/chdr/ deps/crypto/ arm_emitter/
CXXFLAGS := -g -O3 -D RELEASE -c -D TARGET_GCW0 -D HOST_NO_REC #-D NO_REND
CXXFLAGS := -g -O3 -D RELEASE -c -D TARGET_GCW0 -D USES_HOMEDIR -D HOST_NO_REC #-D NO_REND
CXXFLAGS += -frename-registers -fno-strict-aliasing -fsingle-precision-constant
CXXFLAGS += -ffast-math -ftree-vectorize
#-fprefetch-loop-arrays