v.1.44.30 - Compile mimetex for Windows

xintrea · Sep 14, 2018 · 3ca1e1d · 3ca1e1d
1 parent cd69757
commit 3ca1e1d
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 9 deletions.
diff --git a/app/app.pro b/app/app.pro
@@ -6,11 +6,11 @@ TARGET_OS=ANY_OS
 
 # Build type
 # "debug" or "release"
-BUILD_TYPE="debug"
+BUILD_TYPE="release"
 
 # Enable console for Windows
-# 0 - disable, 1 - enable
-WINDOWS_CONSOLE_ENABLE=1
+# 0 - disable, 1 - enable (this is for compile mytetra.exe and rename to mytetra_debug.exe)
+WINDOWS_CONSOLE_ENABLE=0
 
 # Profiling enable
 # 0 - disable, 1 - enable
@@ -422,4 +422,4 @@ win32 {
     MIMETEX_BINARY=mimetex
 }
 
-QMAKE_POST_LINK += $$copyToDir($${_PRO_FILE_PWD_}/../thirdParty/mimetex/build/bin/mimetex, $${OUT_PWD}/bin/$${MIMETEX_BINARY})
+QMAKE_POST_LINK += $$copyToDir($${_PRO_FILE_PWD_}/../thirdParty/mimetex/build/bin/$${MIMETEX_BINARY}, $${OUT_PWD}/bin/$${MIMETEX_BINARY})
diff --git a/app/src/main.h b/app/src/main.h
@@ -34,7 +34,7 @@ using namespace std;
 // Версия программы
 #define APPLICATION_RELEASE_VERSION         1
 #define APPLICATION_RELEASE_SUBVERSION     44
-#define APPLICATION_RELEASE_MICROVERSION   29
+#define APPLICATION_RELEASE_MICROVERSION   30
 
 
 // Поддерживаемая версия формата базы (хранилища)

diff --git a/thirdParty/mimetex/mimetex.c b/thirdParty/mimetex/mimetex.c
@@ -421,13 +421,17 @@ Program id
 /* -------------------------------------------------------------------------
 header files and macros
 -------------------------------------------------------------------------- */
+
+// #define	_GNU_SOURCE			/* for strcasestr() in string.h */
+// char	*strcasestr();			/* non-standard extension */
+// #define _GNU_SOURCE char *strcasestr(const char *haystack, const char *needle);
+const char *strcasestr(const char *s1, const char *s2);
+
 /* --- standard headers --- */
 #include <stdio.h>
 #include <stdlib.h>
 /*#include <unistd.h>*/
-#define	_GNU_SOURCE			/* for strcasestr() in string.h */
 #include <string.h>
-char	*strcasestr();			/* non-standard extension */
 #include <ctype.h>
 #include <math.h>
 #include <time.h>
@@ -18282,5 +18286,36 @@ return pixval;
 #endif /* gif */
 #endif /* driver */
 #endif /* PART1 */
+
+
+int mystrncmpi(const char* s1, const char* s2,int n)
+{
+    int i=0;
+    while((s1[i]!='\0' || s2[i]!='\0') && i<n) {
+        if((s1[i]==s2[i])|| (s1[i]-s2[i])==32|| (s1[i]-s2[i])==- 32)
+            i++;
+        else
+            return(s1[i]-s2[i]);
+    }
+
+    return 0;
+}
+
+const char *strcasestr(const char *s1, const char *s2)
+{
+ // if either pointer is null
+ if (s1 == 0 || s2 == 0)
+  return 0;
+ // the length of the needle
+ size_t n = strlen(s2);
+ // iterate through the string
+ while(*s1)
+ // if the compare which is case insensitive is a match, return the pointer
+ if(!mystrncmpi(s1++,s2,n))
+  return (s1-1);
+ // no match was found
+ return 0;
+}
+
 /* ======================= END-OF-FILE MIMETEX.C ========================= */
 
diff --git a/thirdParty/mimetex/mimetex.pro b/thirdParty/mimetex/mimetex.pro
@@ -3,8 +3,8 @@ QT-=gui
 
 message(Touch mimeTeX qmake)
 
-QMAKE_CFLAGS += -DAA
-QMAKE_CXXFLAGS += -DAA
+QMAKE_CFLAGS += -DAA -D_GNU_SOURCE
+QMAKE_CXXFLAGS += -DAA -D_GNU_SOURCE
 
 SOURCES=mimetex.c \
         gifsave.c \