diff --git a/buildNumber.properties b/buildNumber.properties index a97fa9f0..1396e376 100644 --- a/buildNumber.properties +++ b/buildNumber.properties @@ -1,3 +1,3 @@ #maven.buildNumber.plugin properties file -#Fri Aug 16 09:31:36 EDT 2024 -buildNumber=241 +#Fri Aug 16 10:14:05 EDT 2024 +buildNumber=249 diff --git a/docs/src/progress/renderertodo.md b/docs/src/progress/renderertodo.md index 9251a696..1648d2d6 100644 --- a/docs/src/progress/renderertodo.md +++ b/docs/src/progress/renderertodo.md @@ -588,6 +588,7 @@ Fix viewmodel animation framerate Fix server not starting Fix client disconnection causing wrong socket to be closed from server Fix build tooling, scripts, etc +Launcher fixes # TODO diff --git a/launcher/src/main.c b/launcher/src/main.c index 39bb3c68..1cc41190 100644 --- a/launcher/src/main.c +++ b/launcher/src/main.c @@ -29,13 +29,20 @@ int main(){ strcat(javaPath,"\\jdk\\bin\\java.exe\0"); //get jar location char jarPath[MAX_PATH_SIZE + 50]; - strcpy(jarPath,currentWorkingDirectory); + + strcpy(jarPath,"\""); + strcat(jarPath,currentWorkingDirectory); strcat(jarPath,"\\engine.jar"); + strcat(jarPath,"\""); logVar("javaPath: ",javaPath); logVar("jarPath: ",jarPath); printf("%s\n",jarPath); fflush(stdout); - execlp(javaPath,"java","-jar",jarPath, (char *)NULL); + int execVal = execlp(javaPath,"java","-jar",jarPath, (char *)NULL); + printf("Exec code: %d\n",execVal); + perror("execlp"); + fflush(stdout); + fflush(stderr); return 0; } @@ -48,6 +55,14 @@ void redirectStdout(){ } dup2(outfd, 1); // replace stdout close(outfd); + int outerrfd = open("stderr.txt", O_CREAT|O_WRONLY|O_TRUNC, 0644); + if (!outerrfd) + { + printf("Error opening stdout redirect"); + fflush(stderr); + } + dup2(outerrfd, fileno(stderr)); // replace stderr + close(outerrfd); }