Browse Source

add linux support

JimMarlowe 9 years ago
parent
commit
d5e9f04418
1 changed files with 10 additions and 3 deletions
  1. 10 3
      Source/ToolCore/Platform/PlatformAndroid.cpp

+ 10 - 3
Source/ToolCore/Platform/PlatformAndroid.cpp

@@ -141,9 +141,13 @@ String PlatformAndroid::GetADBCommand() const
 
 
 #ifdef ATOMIC_PLATFORM_OSX
 #ifdef ATOMIC_PLATFORM_OSX
     adbCommand += "/platform-tools/adb";
     adbCommand += "/platform-tools/adb";
-#else
+#endif
+#ifdef ATOMIC_PLATFORM_WINDOWS
     adbCommand += "/platform-tools/adb.exe";
     adbCommand += "/platform-tools/adb.exe";
 #endif
 #endif
+#ifdef ATOMIC_PLATFORM_LINUX
+    adbCommand += "/platform-tools/adb";
+#endif
 
 
     return adbCommand;
     return adbCommand;
 
 
@@ -161,14 +165,17 @@ String PlatformAndroid::GetAndroidCommand() const
 #ifdef ATOMIC_PLATFORM_OSX
 #ifdef ATOMIC_PLATFORM_OSX
     //Vector<String> args = String("list targets").Split(' ');
     //Vector<String> args = String("list targets").Split(' ');
     androidCommand += "/tools/android";
     androidCommand += "/tools/android";
-#else
+#endif
+#ifdef ATOMIC_PLATFORM_WINDOWS
 
 
     // android is a batch file on windows, so have to run with cmd /c
     // android is a batch file on windows, so have to run with cmd /c
     androidCommand += "\\tools\\android.bat";
     androidCommand += "\\tools\\android.bat";
 
 
     //androidCommand = "cmd";
     //androidCommand = "cmd";
 #endif
 #endif
-
+#ifdef ATOMIC_PLATFORM_LINUX
+    androidCommand += "/tools/android";
+#endif
     return androidCommand;
     return androidCommand;
 
 
 }
 }