forked from OctaForge/OctaCore
unconflict with tesseract
parent
8c8a344d33
commit
33bb28a2a6
|
@ -1,15 +1,15 @@
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
# TESS_DATA should refer to the directory in which Tesseract data files are placed.
|
# TESS_DATA should refer to the directory in which OF data files are placed.
|
||||||
#TESS_DATA=~/tesseract
|
#TESS_DATA=~/octacore
|
||||||
#TESS_DATA=/usr/local/tesseract
|
#TESS_DATA=/usr/local/octacore
|
||||||
TESS_DATA=.
|
TESS_DATA=.
|
||||||
|
|
||||||
# TESS_BIN should refer to the directory in which Tesseract executable files are placed.
|
# TESS_BIN should refer to the directory in which OF executable files are placed.
|
||||||
TESS_BIN=${TESS_DATA}/bin_unix
|
TESS_BIN=${TESS_DATA}/bin_unix
|
||||||
|
|
||||||
# TESS_OPTIONS contains any command line options you would like to start Tesseract with.
|
# TESS_OPTIONS contains any command line options you would like to start OF with.
|
||||||
#TESS_OPTIONS=""
|
#TESS_OPTIONS=""
|
||||||
TESS_OPTIONS="-u${HOME}/.tesseract"
|
TESS_OPTIONS="-u${HOME}/.octaforge"
|
||||||
|
|
||||||
# SYSTEM_NAME should be set to the name of your operating system.
|
# SYSTEM_NAME should be set to the name of your operating system.
|
||||||
#SYSTEM_NAME=Linux
|
#SYSTEM_NAME=Linux
|
||||||
|
@ -55,7 +55,7 @@ then
|
||||||
cd ${TESS_DATA}
|
cd ${TESS_DATA}
|
||||||
exec ${TESS_BIN}/${SYSTEM_NAME}${MACHINE_NAME}client ${TESS_OPTIONS} "$@"
|
exec ${TESS_BIN}/${SYSTEM_NAME}${MACHINE_NAME}client ${TESS_OPTIONS} "$@"
|
||||||
else
|
else
|
||||||
echo "Your platform does not have a pre-compiled Tesseract client."
|
echo "Your platform does not have a pre-compiled OctaForge client."
|
||||||
echo "Please follow the following steps to build a native client:"
|
echo "Please follow the following steps to build a native client:"
|
||||||
echo "1) Ensure you have the SDL2, SDL2-image, SDL2-mixer, and OpenGL libraries installed."
|
echo "1) Ensure you have the SDL2, SDL2-image, SDL2-mixer, and OpenGL libraries installed."
|
||||||
echo "2) Type \"make -C src install\"."
|
echo "2) Type \"make -C src install\"."
|
|
@ -62,7 +62,7 @@ void fatal(const char *s, ...) // failure exit
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
SDL_Quit();
|
SDL_Quit();
|
||||||
SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "Tesseract fatal error", msg, NULL);
|
SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "OctaCore fatal error", msg, NULL);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -550,7 +550,7 @@ void setupscreen()
|
||||||
SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
|
SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
|
||||||
SDL_GL_SetAttribute(SDL_GL_STENCIL_SIZE, 0);
|
SDL_GL_SetAttribute(SDL_GL_STENCIL_SIZE, 0);
|
||||||
SDL_GL_SetAttribute(SDL_GL_DEPTH_SIZE, 0);
|
SDL_GL_SetAttribute(SDL_GL_DEPTH_SIZE, 0);
|
||||||
screen = SDL_CreateWindow("Tesseract", winx, winy, winw, winh, SDL_WINDOW_OPENGL | SDL_WINDOW_SHOWN | SDL_WINDOW_INPUT_FOCUS | SDL_WINDOW_MOUSE_FOCUS | flags);
|
screen = SDL_CreateWindow("OctaForge", winx, winy, winw, winh, SDL_WINDOW_OPENGL | SDL_WINDOW_SHOWN | SDL_WINDOW_INPUT_FOCUS | SDL_WINDOW_MOUSE_FOCUS | flags);
|
||||||
if(!screen) fatal("failed to create OpenGL window: %s", SDL_GetError());
|
if(!screen) fatal("failed to create OpenGL window: %s", SDL_GetError());
|
||||||
|
|
||||||
SDL_SetWindowMinimumSize(screen, SCR_MINW, SCR_MINH);
|
SDL_SetWindowMinimumSize(screen, SCR_MINW, SCR_MINH);
|
||||||
|
@ -893,7 +893,7 @@ void stackdumper(unsigned int type, EXCEPTION_POINTERS *ep)
|
||||||
EXCEPTION_RECORD *er = ep->ExceptionRecord;
|
EXCEPTION_RECORD *er = ep->ExceptionRecord;
|
||||||
CONTEXT *context = ep->ContextRecord;
|
CONTEXT *context = ep->ContextRecord;
|
||||||
char out[512];
|
char out[512];
|
||||||
formatstring(out, "Tesseract Win32 Exception: 0x%x [0x%x]\n\n", er->ExceptionCode, er->ExceptionCode==EXCEPTION_ACCESS_VIOLATION ? er->ExceptionInformation[1] : -1);
|
formatstring(out, "OctaCore Win32 Exception: 0x%x [0x%x]\n\n", er->ExceptionCode, er->ExceptionCode==EXCEPTION_ACCESS_VIOLATION ? er->ExceptionInformation[1] : -1);
|
||||||
SymInitialize(GetCurrentProcess(), NULL, TRUE);
|
SymInitialize(GetCurrentProcess(), NULL, TRUE);
|
||||||
#ifdef _AMD64_
|
#ifdef _AMD64_
|
||||||
STACKFRAME64 sf = {{context->Rip, 0, AddrModeFlat}, {}, {context->Rbp, 0, AddrModeFlat}, {context->Rsp, 0, AddrModeFlat}, 0};
|
STACKFRAME64 sf = {{context->Rip, 0, AddrModeFlat}, {}, {context->Rbp, 0, AddrModeFlat}, {context->Rsp, 0, AddrModeFlat}, 0};
|
||||||
|
|
Loading…
Reference in New Issue