Fix wrong path makefile

tranleduy2000 · tranleduy2000 · commit 3e4e49f230c5 · 2018-05-29T20:31:24.000+07:00
diff --git a/sdlplugin/AndroidManifest.xml b/sdlplugin/AndroidManifest.xml
@@ -11,7 +11,7 @@
     <application
         android:allowBackup="false"
         android:fullBackupContent="false"
-        android:icon="@drawable/ic_launcher"
+        android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:theme="@style/Theme.AppCompat.Light"
         tools:ignore="GoogleAppIndexingWarning">
diff --git a/sdlplugin/Examples/SDL/draw2/Makefile b/sdlplugin/Examples/SDL/draw2/Makefile
@@ -10,11 +10,11 @@ TARGET = draw2
 
 all: $(TARGET)
 
-CFLAGS = -Os -Wall -DANDROID -I${EXTERNAL_STORAGE}/CCTools/SDL/include
+CFLAGS = -Os -Wall -DANDROID -I${EXTERNAL_STORAGE}/CCPlusPlusNIDE/SDL/include
 
-LDFLAGS = -shared ${EXTERNAL_STORAGE}/CCTools/SDL/lib/SDL_android_main.o -L${EXTERNAL_STORAGE}/CCTools/SDL/lib -lSDL2 -lGLESv1_CM -llog -lm
+LDFLAGS = -shared ${EXTERNAL_STORAGE}/CCPlusPlusNIDE/SDL/lib/SDL_android_main.o -L${EXTERNAL_STORAGE}/CCPlusPlusNIDE/SDL/lib -lSDL2 -lGLESv1_CM -llog -lm
 
-SDLRUN = am start $(shell am 2>&1| grep -q '\-\-user' && echo '--user 0') -n com.pdaxrom.cctools.sdlplugin/.sdlpluginActivity -e sdlmain
+SDLRUN = am start $(shell am 2>&1| grep -q '\-\-user' && echo '--user 0') -n com.duy.ccppcompiler.sdlplugin/.sdlpluginActivity -e sdlmain
 
 OBJS = $(TARGET).o
 
diff --git a/sdlplugin/Examples/SDL/drawchessboard/Makefile b/sdlplugin/Examples/SDL/drawchessboard/Makefile
@@ -10,11 +10,11 @@ TARGET = drawchessboard
 
 all: $(TARGET)
 
-CFLAGS = -Os -Wall -DANDROID -I${EXTERNAL_STORAGE}/CCTools/SDL/include
+CFLAGS = -Os -Wall -DANDROID -I${EXTERNAL_STORAGE}/CCPlusPlusNIDE/SDL/include
 
-LDFLAGS = -shared ${EXTERNAL_STORAGE}/CCTools/SDL/lib/SDL_android_main.o -L${EXTERNAL_STORAGE}/CCTools/SDL/lib -lSDL2 -lGLESv1_CM -llog -lm
+LDFLAGS = -shared ${EXTERNAL_STORAGE}/CCPlusPlusNIDE/SDL/lib/SDL_android_main.o -L${EXTERNAL_STORAGE}/CCPlusPlusNIDE/SDL/lib -lSDL2 -lGLESv1_CM -llog -lm
 
-SDLRUN = am start $(shell am 2>&1| grep -q '\-\-user' && echo '--user 0') -n com.pdaxrom.cctools.sdlplugin/.sdlpluginActivity -e sdlmain
+SDLRUN = am start $(shell am 2>&1| grep -q '\-\-user' && echo '--user 0') -n com.duy.ccppcompiler.sdlplugin/.sdlpluginActivity -e sdlmain
 
 OBJS = $(TARGET).o
 
diff --git a/sdlplugin/Examples/SDL/gles2cube/Makefile b/sdlplugin/Examples/SDL/gles2cube/Makefile
@@ -10,13 +10,13 @@ TARGET = gles2cube
 
 all: $(TARGET)
 
-CFLAGS = -Os -Wall -DANDROID -I${EXTERNAL_STORAGE}/CCTools/SDL/include
+CFLAGS = -Os -Wall -DANDROID -I${EXTERNAL_STORAGE}/CCPlusPlusNIDE/SDL/include
 
 CXXFLAGS = $(CFLAGS)
 
-LDFLAGS = -shared ${EXTERNAL_STORAGE}/CCTools/SDL/lib/SDL_android_main.o -L${EXTERNAL_STORAGE}/CCTools/SDL/lib -lSDL2 -lGLESv2 -llog -lm
+LDFLAGS = -shared ${EXTERNAL_STORAGE}/CCPlusPlusNIDE/SDL/lib/SDL_android_main.o -L${EXTERNAL_STORAGE}/CCPlusPlusNIDE/SDL/lib -lSDL2 -lGLESv2 -llog -lm
 
-SDLRUN = am start $(shell am 2>&1| grep -q '\-\-user' && echo '--user 0') -n com.pdaxrom.cctools.sdlplugin/.sdlpluginActivity -e sdlmain
+SDLRUN = am start $(shell am 2>&1| grep -q '\-\-user' && echo '--user 0') -n com.duy.ccppcompiler.sdlplugin/.sdlpluginActivity -e sdlmain
 
 OBJS = $(TARGET).o shader.o matrix.o
 
diff --git a/sdlplugin/Examples/SDL/gles2example/Makefile b/sdlplugin/Examples/SDL/gles2example/Makefile
@@ -10,13 +10,13 @@ TARGET = gles2example
 
 all: $(TARGET)
 
-CFLAGS = -Os -Wall -DANDROID -I${EXTERNAL_STORAGE}/CCTools/SDL/include
+CFLAGS = -Os -Wall -DANDROID -I${EXTERNAL_STORAGE}/CCPlusPlusNIDE/SDL/include
 
 CXXFLAGS = $(CFLAGS)
 
-LDFLAGS = -shared ${EXTERNAL_STORAGE}/CCTools/SDL/lib/SDL_android_main.o -L${EXTERNAL_STORAGE}/CCTools/SDL/lib -lSDL2 -lGLESv2 -llog -lm
+LDFLAGS = -shared ${EXTERNAL_STORAGE}/CCPlusPlusNIDE/SDL/lib/SDL_android_main.o -L${EXTERNAL_STORAGE}/CCPlusPlusNIDE/SDL/lib -lSDL2 -lGLESv2 -llog -lm
 
-SDLRUN = am start $(shell am 2>&1| grep -q '\-\-user' && echo '--user 0') -n com.pdaxrom.cctools.sdlplugin/.sdlpluginActivity -e sdlmain
+SDLRUN = am start $(shell am 2>&1| grep -q '\-\-user' && echo '--user 0') -n com.duy.ccppcompiler.sdlplugin/.sdlpluginActivity -e sdlmain
 
 OBJS = $(TARGET).o
 
diff --git a/sdlplugin/Examples/SDL/glesexample/Makefile b/sdlplugin/Examples/SDL/glesexample/Makefile
@@ -10,11 +10,11 @@ TARGET = glesexample
 
 all: $(TARGET)
 
-CFLAGS = -Os -Wall -DANDROID -I${EXTERNAL_STORAGE}/CCTools/SDL/include
+CFLAGS = -Os -Wall -DANDROID -I${EXTERNAL_STORAGE}/CCPlusPlusNIDE/SDL/include
 
-LDFLAGS = -shared ${EXTERNAL_STORAGE}/CCTools/SDL/lib/SDL_android_main.o -L${EXTERNAL_STORAGE}/CCTools/SDL/lib -lSDL2 -lGLESv1_CM -llog -lm
+LDFLAGS = -shared ${EXTERNAL_STORAGE}/CCPlusPlusNIDE/SDL/lib/SDL_android_main.o -L${EXTERNAL_STORAGE}/CCPlusPlusNIDE/SDL/lib -lSDL2 -lGLESv1_CM -llog -lm
 
-SDLRUN = am start $(shell am 2>&1| grep -q '\-\-user' && echo '--user 0') -n com.pdaxrom.cctools.sdlplugin/.sdlpluginActivity -e sdlmain
+SDLRUN = am start $(shell am 2>&1| grep -q '\-\-user' && echo '--user 0') -n com.duy.ccppcompiler.sdlplugin/.sdlpluginActivity -e sdlmain
 
 OBJS = $(TARGET).o
 
diff --git a/sdlplugin/Examples/SDL/playmus/Makefile b/sdlplugin/Examples/SDL/playmus/Makefile
@@ -10,11 +10,11 @@ TARGET = playmus
 
 all: $(TARGET)
 
-CFLAGS = -Os -Wall -DANDROID -I${EXTERNAL_STORAGE}/CCTools/SDL/include
+CFLAGS = -Os -Wall -DANDROID -I${EXTERNAL_STORAGE}/CCPlusPlusNIDE/SDL/include
 
-LDFLAGS = -shared ${EXTERNAL_STORAGE}/CCTools/SDL/lib/SDL_android_main.o -L${EXTERNAL_STORAGE}/CCTools/SDL/lib -lSDL2 -lSDL2_mixer -llog -lm
+LDFLAGS = -shared ${EXTERNAL_STORAGE}/CCPlusPlusNIDE/SDL/lib/SDL_android_main.o -L${EXTERNAL_STORAGE}/CCPlusPlusNIDE/SDL/lib -lSDL2 -lSDL2_mixer -llog -lm
 
-SDLRUN = am start $(shell am 2>&1| grep -q '\-\-user' && echo '--user 0') -n com.pdaxrom.cctools.sdlplugin/.sdlpluginActivity -e sdlmain
+SDLRUN = am start $(shell am 2>&1| grep -q '\-\-user' && echo '--user 0') -n com.duy.ccppcompiler.sdlplugin/.sdlpluginActivity -e sdlmain
 
 OBJS = $(TARGET).o
 
diff --git a/sdlplugin/Examples/SDL/showfont/Makefile b/sdlplugin/Examples/SDL/showfont/Makefile
@@ -10,11 +10,11 @@ TARGET = showfont
 
 all: $(TARGET)
 
-CFLAGS = -Os -Wall -DANDROID -I${EXTERNAL_STORAGE}/CCTools/SDL/include
+CFLAGS = -Os -Wall -DANDROID -I${EXTERNAL_STORAGE}/CCPlusPlusNIDE/SDL/include
 
-LDFLAGS = -shared ${EXTERNAL_STORAGE}/CCTools/SDL/lib/SDL_android_main.o -L${EXTERNAL_STORAGE}/CCTools/SDL/lib -lSDL2 -lSDL2_ttf -llog -lm
+LDFLAGS = -shared ${EXTERNAL_STORAGE}/CCPlusPlusNIDE/SDL/lib/SDL_android_main.o -L${EXTERNAL_STORAGE}/CCPlusPlusNIDE/SDL/lib -lSDL2 -lSDL2_ttf -llog -lm
 
-SDLRUN = am start $(shell am 2>&1| grep -q '\-\-user' && echo '--user 0') -n com.pdaxrom.cctools.sdlplugin/.sdlpluginActivity -e sdlmain
+SDLRUN = am start $(shell am 2>&1| grep -q '\-\-user' && echo '--user 0') -n com.duy.ccppcompiler.sdlplugin/.sdlpluginActivity -e sdlmain
 
 OBJS = $(TARGET).o
 
diff --git a/sdlplugin/Examples/SDL/showimage/Makefile b/sdlplugin/Examples/SDL/showimage/Makefile
@@ -10,11 +10,11 @@ TARGET = showimage
 
 all: $(TARGET)
 
-CFLAGS = -Os -Wall -DANDROID -I${EXTERNAL_STORAGE}/CCTools/SDL/include
+CFLAGS = -Os -Wall -DANDROID -I${EXTERNAL_STORAGE}/CCPlusPlusNIDE/SDL/include
 
-LDFLAGS = -shared ${EXTERNAL_STORAGE}/CCTools/SDL/lib/SDL_android_main.o -L${EXTERNAL_STORAGE}/CCTools/SDL/lib -lSDL2 -lSDL2_image -llog -lm
+LDFLAGS = -shared ${EXTERNAL_STORAGE}/CCPlusPlusNIDE/SDL/lib/SDL_android_main.o -L${EXTERNAL_STORAGE}/CCPlusPlusNIDE/SDL/lib -lSDL2 -lSDL2_image -llog -lm
 
-SDLRUN = am start $(shell am 2>&1| grep -q '\-\-user' && echo '--user 0') -n com.pdaxrom.cctools.sdlplugin/.sdlpluginActivity -e sdlmain
+SDLRUN = am start $(shell am 2>&1| grep -q '\-\-user' && echo '--user 0') -n com.duy.ccppcompiler.sdlplugin/.sdlpluginActivity -e sdlmain
 
 OBJS = $(TARGET).o
 
diff --git a/sdlplugin/Examples/SDL/testgesture/Makefile b/sdlplugin/Examples/SDL/testgesture/Makefile
@@ -10,11 +10,11 @@ TARGET = testgesture
 
 all: $(TARGET)
 
-CFLAGS = -Os -Wall -DANDROID -I${EXTERNAL_STORAGE}/CCTools/SDL/include
+CFLAGS = -Os -Wall -DANDROID -I${EXTERNAL_STORAGE}/CCPlusPlusNIDE/SDL/include
 
-LDFLAGS = -shared ${EXTERNAL_STORAGE}/CCTools/SDL/lib/SDL_android_main.o -L${EXTERNAL_STORAGE}/CCTools/SDL/lib -lSDL2 -lGLESv1_CM -llog -lm
+LDFLAGS = -shared ${EXTERNAL_STORAGE}/CCPlusPlusNIDE/SDL/lib/SDL_android_main.o -L${EXTERNAL_STORAGE}/CCPlusPlusNIDE/SDL/lib -lSDL2 -lGLESv1_CM -llog -lm
 
-SDLRUN = am start $(shell am 2>&1| grep -q '\-\-user' && echo '--user 0') -n com.pdaxrom.cctools.sdlplugin/.sdlpluginActivity -e sdlmain
+SDLRUN = am start $(shell am 2>&1| grep -q '\-\-user' && echo '--user 0') -n com.duy.ccppcompiler.sdlplugin/.sdlpluginActivity -e sdlmain
 
 OBJS = $(TARGET).o
 
diff --git a/sdlplugin/assets/examples.zip b/sdlplugin/assets/examples.zip
diff --git a/sdlplugin/assets/headers.zip b/sdlplugin/assets/headers.zip
diff --git a/sdlplugin/src/main/java/com/duy/ccppcompiler/sdlplugin/sdlpluginActivity.java b/sdlplugin/src/main/java/com/duy/ccppcompiler/sdlplugin/sdlpluginActivity.java
@@ -26,28 +26,29 @@ public class sdlpluginActivity extends SDLActivity {
     private static final String TAG = "sdlpluginActivity";
     private static final int RC_PERMISSION_WRITE_EXTERNAL_STORAGE = 2;
 
-    private static final String CCTOOLS_GOOGLE_URL = "https://play.google.com/store/apps/details?id=com.pdaxrom.cctools";
+    private static final String CCTOOLS_GOOGLE_URL = "https://play.google.com/store/apps/details?id=com.duy.ccppcompiler";
 
     private static final String CCTOOLS_URL = "http://cctools.info";
 
-    private static String sdCardDir;
+    private File mSdCardAppDir;
 
     private ProgressDialog pd;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         Log.v(TAG, "onCreate()");
         super.onCreate(savedInstanceState);
-        sdCardDir = Environment.getExternalStorageDirectory().getPath() + "/CCTools";
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            requestPermissions(new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE}, RC_PERMISSION_WRITE_EXTERNAL_STORAGE);
+        }
 
+        mSdCardAppDir = new File(Environment.getExternalStorageDirectory(), "CCPlusPlusNIDE");
         if (!super.mIsPaused && getIntent().getExtras() == null) {
-            if (new File(sdCardDir).exists() && new File(sdCardDir).isDirectory()) {
-                if (!new File(sdCardDir + "/SDL/include").exists() ||
-                        !new File(sdCardDir + "/SDL/lib").exists()) {
+            if (mSdCardAppDir.exists() && mSdCardAppDir.isDirectory()) {
+                if (!new File(mSdCardAppDir + "/SDL/include").exists() ||
+                        !new File(mSdCardAppDir + "/SDL/lib").exists()) {
                     Log.i(TAG, "Install dev files");
-                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-                        requestPermissions(new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE}, RC_PERMISSION_WRITE_EXTERNAL_STORAGE);
-                    }
+
                     new InstallDevFiles().execute();
                 } else {
                     aboutDialog(1);
@@ -121,31 +122,31 @@ protected void onProgressUpdate(String... values) {
         @Override
         protected Void doInBackground(Void... params) {
             try {
-                if (!(new File(sdCardDir + "/SDL/lib").exists())) {
-                    new File(sdCardDir + "/SDL/lib").mkdirs();
+                if (!(new File(mSdCardAppDir + "/SDL/lib").exists())) {
+                    new File(mSdCardAppDir + "/SDL/lib").mkdirs();
                     Utils.copyDirectory(new File(getCacheDir().getParentFile().getAbsolutePath() + "/lib"),
-                            new File(sdCardDir + "/SDL/lib"));
-                    new File(sdCardDir + "/SDL/lib/libmain.so").delete();
-                    new File(sdCardDir + "/SDL/lib/libccsdlplugin.so").delete();
+                            new File(mSdCardAppDir + "/SDL/lib"));
+                    new File(mSdCardAppDir + "/SDL/lib/libmain.so").delete();
+                    new File(mSdCardAppDir + "/SDL/lib/libccsdlplugin.so").delete();
                     String arch = Build.CPU_ABI;
                     if (arch.startsWith("mips")) {
                         arch = "mips";
                     }
                     publishProgress(getString(R.string.update_install_libs));
                     InputStream is = getAssets().open("sdlmain-" + arch + ".zip");
-                    Utils.unpackZip(is, sdCardDir + "/SDL/lib");
+                    Utils.unpackZip(is, mSdCardAppDir + "/SDL/lib");
                     is.close();
                 }
-                if (!(new File(sdCardDir + "/SDL/include").exists())) {
+                if (!(new File(mSdCardAppDir + "/SDL/include").exists())) {
                     publishProgress(getString(R.string.update_install_headers));
                     InputStream is = getAssets().open("headers.zip");
-                    Utils.unpackZip(is, sdCardDir + "/SDL");
+                    Utils.unpackZip(is, mSdCardAppDir + "/SDL");
                     is.close();
                 }
-                if (!(new File(sdCardDir + "/Examples/SDL").exists())) {
+                if (!(new File(mSdCardAppDir + "/Examples/SDL").exists())) {
                     publishProgress(getString(R.string.update_install_examples));
                     InputStream is = getAssets().open("examples.zip");
-                    Utils.unpackZip(is, sdCardDir);
+                    Utils.unpackZip(is, mSdCardAppDir.getAbsolutePath());
                     is.close();
                 }
             } catch (IOException e) {
diff --git a/sdlplugin/src/main/java/org/libsdl/app/SDLActivity.java b/sdlplugin/src/main/java/org/libsdl/app/SDLActivity.java
@@ -523,7 +523,7 @@ class SDLSurface extends SurfaceView implements SurfaceHolder.Callback,
     // Keep track of the surface size to normalize touch events
     protected static float mWidth, mHeight;
 
-    // Startup    
+    // Startup
     public SDLSurface(Context context) {
         super(context);
         getHolder().addCallback(this);
diff --git a/sdlplugin/src/main/res/drawable-hdpi/ic_launcher.png b/sdlplugin/src/main/res/drawable-hdpi/ic_launcher.png
diff --git a/sdlplugin/src/main/res/drawable-mdpi/ic_launcher.png b/sdlplugin/src/main/res/drawable-mdpi/ic_launcher.png
diff --git a/sdlplugin/src/main/res/drawable-xhdpi/ic_launcher.png b/sdlplugin/src/main/res/drawable-xhdpi/ic_launcher.png
diff --git a/sdlplugin/src/main/res/drawable-xxhdpi/ic_launcher.png b/sdlplugin/src/main/res/drawable-xxhdpi/ic_launcher.png
diff --git a/sdlplugin/src/main/res/layout/main.xml b/sdlplugin/src/main/res/layout/main.xml
diff --git a/sdlplugin/src/main/res/values-ru/strings.xml b/sdlplugin/src/main/res/values-ru/strings.xml
@@ -6,7 +6,6 @@
     <string name="about_dialog_text1">Установите CPP N-IDE</string>
     <string name="about_dialog_text2">для использования этого плагина.</string>
     <string name="about_dialog_text3">Ознакомтесь с SDL howto на</string>
-    <string name="update_devfiles">Обновление файлов разработки</string>
     <string name="update_checking">Проверка установленных компонентов&#8230;</string>
     <string name="update_install_headers">Установка заголовков&#8230;</string>
     <string name="update_install_libs">Установка библиотек&#8230;</string>
diff --git a/sdlplugin/src/main/res/values/strings.xml b/sdlplugin/src/main/res/values/strings.xml
@@ -6,8 +6,7 @@
     <string name="about_dialog_text1">Install CPP N-IDE </string>
 	<string name="about_dialog_text2">to use this plugin.</string>
 	<string name="about_dialog_text3">Check SDL howto on</string>
-	<string name="update_devfiles">Updating SDL dev files</string>
-	<string name="update_checking">Checking installed components&#8230;</string>
+    <string name="update_checking">Checking installed components&#8230;</string>
 	<string name="update_install_headers">Installing SDL headers&#8230;</string>
 	<string name="update_install_libs">Installing SDL libraries&#8230;</string>
 	<string name="update_install_examples">Installing SDL examples&#8230;</string>
