Browse Source

unconflict with tesseract

Daniel Kolesa 7 months ago
parent
commit
33bb28a2a6
2 changed files with 10 additions and 10 deletions
  1. 7
    7
      octacore_unix
  2. 3
    3
      src/engine/main.cpp

tesseract_unix → octacore_unix View File

@@ -1,15 +1,15 @@
1 1
 #!/bin/sh
2
-# TESS_DATA should refer to the directory in which Tesseract data files are placed.
3
-#TESS_DATA=~/tesseract
4
-#TESS_DATA=/usr/local/tesseract
2
+# TESS_DATA should refer to the directory in which OF data files are placed.
3
+#TESS_DATA=~/octacore
4
+#TESS_DATA=/usr/local/octacore
5 5
 TESS_DATA=.
6 6
 
7
-# TESS_BIN should refer to the directory in which Tesseract executable files are placed.
7
+# TESS_BIN should refer to the directory in which OF executable files are placed.
8 8
 TESS_BIN=${TESS_DATA}/bin_unix
9 9
 
10
-# TESS_OPTIONS contains any command line options you would like to start Tesseract with.
10
+# TESS_OPTIONS contains any command line options you would like to start OF with.
11 11
 #TESS_OPTIONS=""
12
-TESS_OPTIONS="-u${HOME}/.tesseract"
12
+TESS_OPTIONS="-u${HOME}/.octaforge"
13 13
 
14 14
 # SYSTEM_NAME should be set to the name of your operating system.
15 15
 #SYSTEM_NAME=Linux
@@ -55,7 +55,7 @@ then
55 55
   cd ${TESS_DATA}
56 56
   exec ${TESS_BIN}/${SYSTEM_NAME}${MACHINE_NAME}client ${TESS_OPTIONS} "$@"
57 57
 else
58
-  echo "Your platform does not have a pre-compiled Tesseract client."
58
+  echo "Your platform does not have a pre-compiled OctaForge client."
59 59
   echo "Please follow the following steps to build a native client:"
60 60
   echo "1) Ensure you have the SDL2, SDL2-image, SDL2-mixer, and OpenGL libraries installed."
61 61
   echo "2) Type \"make -C src install\"."

+ 3
- 3
src/engine/main.cpp View File

@@ -62,7 +62,7 @@ void fatal(const char *s, ...)    // failure exit
62 62
                 #endif
63 63
             }
64 64
             SDL_Quit();
65
-            SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "Tesseract fatal error", msg, NULL);
65
+            SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "OctaCore fatal error", msg, NULL);
66 66
         }
67 67
     }
68 68
 
@@ -550,7 +550,7 @@ void setupscreen()
550 550
     SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
551 551
     SDL_GL_SetAttribute(SDL_GL_STENCIL_SIZE, 0);
552 552
     SDL_GL_SetAttribute(SDL_GL_DEPTH_SIZE, 0);
553
-    screen = SDL_CreateWindow("Tesseract", winx, winy, winw, winh, SDL_WINDOW_OPENGL | SDL_WINDOW_SHOWN | SDL_WINDOW_INPUT_FOCUS | SDL_WINDOW_MOUSE_FOCUS | flags);
553
+    screen = SDL_CreateWindow("OctaForge", winx, winy, winw, winh, SDL_WINDOW_OPENGL | SDL_WINDOW_SHOWN | SDL_WINDOW_INPUT_FOCUS | SDL_WINDOW_MOUSE_FOCUS | flags);
554 554
     if(!screen) fatal("failed to create OpenGL window: %s", SDL_GetError());
555 555
 
556 556
     SDL_SetWindowMinimumSize(screen, SCR_MINW, SCR_MINH);
@@ -893,7 +893,7 @@ void stackdumper(unsigned int type, EXCEPTION_POINTERS *ep)
893 893
     EXCEPTION_RECORD *er = ep->ExceptionRecord;
894 894
     CONTEXT *context = ep->ContextRecord;
895 895
     char out[512];
896
-    formatstring(out, "Tesseract Win32 Exception: 0x%x [0x%x]\n\n", er->ExceptionCode, er->ExceptionCode==EXCEPTION_ACCESS_VIOLATION ? er->ExceptionInformation[1] : -1);
896
+    formatstring(out, "OctaCore Win32 Exception: 0x%x [0x%x]\n\n", er->ExceptionCode, er->ExceptionCode==EXCEPTION_ACCESS_VIOLATION ? er->ExceptionInformation[1] : -1);
897 897
     SymInitialize(GetCurrentProcess(), NULL, TRUE);
898 898
 #ifdef _AMD64_
899 899
     STACKFRAME64 sf = {{context->Rip, 0, AddrModeFlat}, {}, {context->Rbp, 0, AddrModeFlat}, {context->Rsp, 0, AddrModeFlat}, 0};

Loading…
Cancel
Save