AstralTransRocketries/ClassiCube
1
0
Fork 0
mirror of https://github.com/ClassiCube/ClassiCube.git synced 2025-09-16 19:15:14 -04:00
Code Issues Packages Projects Releases Wiki Activity

reorganise platform.c a little bit to reduce #ifndef mess

Browse Source
This commit is contained in:
UnknownShadow200 2019-09-11 06:59:10 +10:00
parent 0a2af2162f
commit 7e129bab2f
2 changed files with 122 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

233
src/Platform.c
View File

@ -1453,61 +1453,6 @@ void Platform_Free(void) {
HeapDestroy(heap); HeapDestroy(heap);
} }
ReturnCode Platform_SetDefaultCurrentDirectory(void) {
TCHAR path[NATIVE_STR_LEN + 1];
int i, len;
ReturnCode res = Process_RawGetExePath(path, &len);
if (res) return res;
/* Get rid of filename at end of directory */
for (i = len - 1; i >= 0; i--, len--) {
if (path[i] == '/' || path[i] == '\\') break;
}
path[len] = '\0';
return SetCurrentDirectory(path) ? 0 : GetLastError();
}
static String Platform_NextArg(STRING_REF String* args) {
String arg;
int end;
/* get rid of leading spaces before arg */
while (args->length && args->buffer[0] == ' ') {
*args = String_UNSAFE_SubstringAt(args, 1);
}
if (args->length && args->buffer[0] == '"') {
/* "xy za" is used for arg with spaces */
*args = String_UNSAFE_SubstringAt(args, 1);
end = String_IndexOf(args, '"');
} else {
end = String_IndexOf(args, ' ');
}
if (end == -1) {
arg = *args;
args->length = 0;
} else {
arg = String_UNSAFE_Substring(args, 0, end);
*args = String_UNSAFE_SubstringAt(args, end + 1);
}
return arg;
}
int Platform_GetCommandLineArgs(int argc, STRING_REF char** argv, String* args) {
String cmdArgs = String_FromReadonly(GetCommandLineA());
int i;
Platform_NextArg(&cmdArgs); /* skip exe path */
for (i = 0; i < GAME_MAX_CMDARGS; i++) {
args[i] = Platform_NextArg(&cmdArgs);
if (!args[i].length) break;
}
return i;
}
ReturnCode Platform_Encrypt(const void* data, int len, cc_uint8** enc, int* encLen) { ReturnCode Platform_Encrypt(const void* data, int len, cc_uint8** enc, int* encLen) {
DATA_BLOB dataIn, dataOut; DATA_BLOB dataIn, dataOut;
dataIn.cbData = len; dataIn.pbData = (BYTE*)data; dataIn.cbData = len; dataIn.pbData = (BYTE*)data;
@ -1567,27 +1512,6 @@ static void Platform_InitPosix(void) {
} }
void Platform_Free(void) { } void Platform_Free(void) { }
#ifndef CC_BUILD_ANDROID
int Platform_GetCommandLineArgs(int argc, STRING_REF char** argv, String* args) {
int i, count;
argc--; argv++; /* skip executable path argument */
#ifdef CC_BUILD_OSX
if (argc) {
String arg0 = String_FromReadonly(argv[0]);
String psn = String_FromConst("-psn_0_");
if (String_CaselessStarts(&arg0, &psn)) { argc--; argv++; }
}
#endif
count = min(argc, GAME_MAX_CMDARGS);
for (i = 0; i < count; i++) {
args[i] = String_FromReadonly(argv[i]);
}
return count;
}
#endif
ReturnCode Platform_Encrypt(const void* data, int len, cc_uint8** enc, int* encLen) { ReturnCode Platform_Encrypt(const void* data, int len, cc_uint8** enc, int* encLen) {
return ERR_NOT_SUPPORTED; return ERR_NOT_SUPPORTED;
} }
@ -1595,23 +1519,6 @@ ReturnCode Platform_Decrypt(const void* data, int len, cc_uint8** dec, int* decL
return ERR_NOT_SUPPORTED; return ERR_NOT_SUPPORTED;
} }
#if !defined CC_BUILD_WEB && !defined CC_BUILD_ANDROID
ReturnCode Platform_SetDefaultCurrentDirectory(void) {
char path[NATIVE_STR_LEN];
int i, len = 0;
ReturnCode res = Process_RawGetExePath(path, &len);
if (res) return res;
/* get rid of filename at end of directory */
for (i = len - 1; i >= 0; i--, len--) {
if (path[i] == '/') break;
}
path[len] = '\0';
return chdir(path) == -1 ? errno : 0;
}
#endif
bool Platform_DescribeError(ReturnCode res, String* dst) { bool Platform_DescribeError(ReturnCode res, String* dst) {
char chars[NATIVE_STR_LEN]; char chars[NATIVE_STR_LEN];
int len; int len;
@ -1671,31 +1578,12 @@ void Platform_Init(void) {
...... ......
*/ */
} }
ReturnCode Platform_SetDefaultCurrentDirectory(void) {
return chdir("/classicube") == -1 ? errno : 0;
}
#elif defined CC_BUILD_ANDROID #elif defined CC_BUILD_ANDROID
jclass App_Class; jclass App_Class;
jobject App_Instance; jobject App_Instance;
JavaVM* VM_Ptr; JavaVM* VM_Ptr;
void Platform_Init(void) { Platform_InitPosix(); } void Platform_Init(void) { Platform_InitPosix(); }
int Platform_GetCommandLineArgs(int argc, STRING_REF char** argv, String* args) {
if (!gameArgs.length) return 0;
return String_UNSAFE_Split(&gameArgs, ' ', args, GAME_MAX_CMDARGS);
}
ReturnCode Platform_SetDefaultCurrentDirectory(void) {
String dir; char dirBuffer[FILENAME_SIZE + 1];
String_InitArray_NT(dir, dirBuffer);
JavaCall_Void_String("getExternalAppDir", &dir);
dir.buffer[dir.length] = '\0';
Platform_Log1("EXTERNAL DIR: %s|", &dir);
return chdir(dir.buffer) == -1 ? errno : 0;
}
/* JNI helpers */ /* JNI helpers */
String JavaGetString(JNIEnv* env, jstring str) { String JavaGetString(JNIEnv* env, jstring str) {
String dst; String dst;
@ -1768,3 +1656,124 @@ void JavaCall_Void_String(const char* name, String* dst) {
(*env)->DeleteLocalRef(env, obj); (*env)->DeleteLocalRef(env, obj);
} }
#endif #endif
/*########################################################################################################################*
*--------------------------------------------------------Platform---------------------------------------------------------*
*#########################################################################################################################*/
#if defined CC_BUILD_WIN
static String Platform_NextArg(STRING_REF String* args) {
String arg;
int end;
/* get rid of leading spaces before arg */
while (args->length && args->buffer[0] == ' ') {
*args = String_UNSAFE_SubstringAt(args, 1);
}
if (args->length && args->buffer[0] == '"') {
/* "xy za" is used for arg with spaces */
*args = String_UNSAFE_SubstringAt(args, 1);
end = String_IndexOf(args, '"');
} else {
end = String_IndexOf(args, ' ');
}
if (end == -1) {
arg = *args;
args->length = 0;
} else {
arg = String_UNSAFE_Substring(args, 0, end);
*args = String_UNSAFE_SubstringAt(args, end + 1);
}
return arg;
}
int Platform_GetCommandLineArgs(int argc, STRING_REF char** argv, String* args) {
String cmdArgs = String_FromReadonly(GetCommandLineA());
int i;
Platform_NextArg(&cmdArgs); /* skip exe path */
for (i = 0; i < GAME_MAX_CMDARGS; i++) {
args[i] = Platform_NextArg(&cmdArgs);
if (!args[i].length) break;
}
return i;
}
ReturnCode Platform_SetDefaultCurrentDirectory(void) {
TCHAR path[NATIVE_STR_LEN + 1];
int i, len;
ReturnCode res = Process_RawGetExePath(path, &len);
if (res) return res;
/* Get rid of filename at end of directory */
for (i = len - 1; i >= 0; i--, len--) {
if (path[i] == '/' || path[i] == '\\') break;
}
path[len] = '\0';
return SetCurrentDirectory(path) ? 0 : GetLastError();
}
#elif defined CC_BUILD_WEB
int Platform_GetCommandLineArgs(int argc, STRING_REF char** argv, String* args) {
int i, count;
argc--; argv++; /* skip executable path argument */
count = min(argc, GAME_MAX_CMDARGS);
for (i = 0; i < count; i++) { args[i] = String_FromReadonly(argv[i]); }
return count;
}
ReturnCode Platform_SetDefaultCurrentDirectory(void) {
return chdir("/classicube") == -1 ? errno : 0;
}
#elif defined CC_BUILD_ANDROID
int Platform_GetCommandLineArgs(int argc, STRING_REF char** argv, String* args) {
if (!gameArgs.length) return 0;
return String_UNSAFE_Split(&gameArgs, ' ', args, GAME_MAX_CMDARGS);
}
ReturnCode Platform_SetDefaultCurrentDirectory(void) {
String dir; char dirBuffer[FILENAME_SIZE + 1];
String_InitArray_NT(dir, dirBuffer);
JavaCall_Void_String("getExternalAppDir", &dir);
dir.buffer[dir.length] = '\0';
Platform_Log1("EXTERNAL DIR: %s|", &dir);
return chdir(dir.buffer) == -1 ? errno : 0;
}
#elif defined CC_BUILD_POSIX
int Platform_GetCommandLineArgs(int argc, STRING_REF char** argv, String* args) {
int i, count;
argc--; argv++; /* skip executable path argument */
#ifdef CC_BUILD_OSX
if (argc) {
String arg0 = String_FromReadonly(argv[0]);
String psn = String_FromConst("-psn_0_");
if (String_CaselessStarts(&arg0, &psn)) { argc--; argv++; }
}
#endif
count = min(argc, GAME_MAX_CMDARGS);
for (i = 0; i < count; i++) { args[i] = String_FromReadonly(argv[i]); }
return count;
}
ReturnCode Platform_SetDefaultCurrentDirectory(void) {
char path[NATIVE_STR_LEN];
int i, len = 0;
ReturnCode res = Process_RawGetExePath(path, &len);
if (res) return res;
/* get rid of filename at end of directory */
for (i = len - 1; i >= 0; i--, len--) {
if (path[i] == '/') break;
}
path[len] = '\0';
return chdir(path) == -1 ? errno : 0;
}
#endif

2
src/Platform.h
View File

@ -44,9 +44,9 @@ void Platform_Init(void);
void Platform_Free(void); void Platform_Free(void);
/* Sets the appropriate default current/working directory. */ /* Sets the appropriate default current/working directory. */
ReturnCode Platform_SetDefaultCurrentDirectory(void); ReturnCode Platform_SetDefaultCurrentDirectory(void);
/* Gets the command line arguments passed to the program. */ /* Gets the command line arguments passed to the program. */
int Platform_GetCommandLineArgs(int argc, STRING_REF char** argv, String* args); int Platform_GetCommandLineArgs(int argc, STRING_REF char** argv, String* args);
/* Encrypts data in a platform-specific manner. (may not be supported) */ /* Encrypts data in a platform-specific manner. (may not be supported) */
/* NOTE: Should only be implemented when platform natively supports it. */ /* NOTE: Should only be implemented when platform natively supports it. */
ReturnCode Platform_Encrypt(const void* data, int len, cc_uint8** enc, int* encLen); ReturnCode Platform_Encrypt(const void* data, int len, cc_uint8** enc, int* encLen);