Fix static luajit library lookup on windows (#14)

Fix windows build

Author: Unix4ever

CMakeLists.txt

@@ -40,13 +40,14 @@ if(BUILD_LUA_BINDINGS)
   set(ADDITIONAL_SOURCES src/lua/script.cpp ${ADDITIONAL_SOURCES})
 endif(BUILD_LUA_BINDINGS)
 
-if(BUILD_KATANA_FROM_SUBMODULE)
-  set(KATANA_INCLUDE_DIRS katana-parser/src/)
-  set(KATANA_LIBRARY katana)
-  include_directories(${KATANA_INCLUDE_DIRS})
-  file(GLOB_RECURSE sources katana-parser/src/*.c)
-  add_library(${KATANA_LIBRARY} STATIC ${sources})
-endif(BUILD_KATANA_FROM_SUBMODULE)
+# disable it for now. It's not used, and does not build on windows
+#if(BUILD_KATANA_FROM_SUBMODULE)
+#  set(KATANA_INCLUDE_DIRS katana-parser/src/)
+#  set(KATANA_LIBRARY katana)
+#  include_directories(${KATANA_INCLUDE_DIRS})
+#  file(GLOB_RECURSE sources katana-parser/src/*.c)
+#  add_library(${KATANA_LIBRARY} STATIC ${sources})
+#endif(BUILD_KATANA_FROM_SUBMODULE)
 
 if(BUILD_TESTS)
   find_package(GTest)
@@ -72,6 +73,7 @@ add_library(${LIB_NAME} STATIC
   src/imvue_element.cpp
   src/imvue_script.cpp
   src/imvue_context.cpp
+  src/imstring.cpp
 ${ADDITIONAL_SOURCES})
 
 set(IMGUI_SOURCES
@@ -98,7 +100,7 @@ endif(BUILD_IMGUI_FROM_SUBMODULE)
 target_link_libraries(${LIB_NAME} ${ADDITIONAL_LIBS})
 
 if(MSVC)
-  target_compile_options(${LIB_NAME} PRIVATE /W4 /WX)
+  target_compile_options(${LIB_NAME} PRIVATE /W4)
 else()
-  target_compile_options(${LIB_NAME} PRIVATE -Wall -Wextra -pedantic -Werror)
+  target_compile_options(${LIB_NAME} PRIVATE -Wall -Wextra -pedantic)
 endif()

cmake/Modules/FindLuaJIT.cmake

@@ -44,7 +44,7 @@ FIND_PATH(LUA_INCLUDE_DIR lua.h
 )
 
 FIND_LIBRARY(LUA_LIBRARY
-  NAMES libluajit-static.a  luajit-51 luajit-5.1 luajit
+  NAMES libluajit-static.a luajit-static.lib libluajit luajit-51 luajit-5.1 luajit
   HINTS
   $ENV{LUAJIT_DIR}
   PATH_SUFFIXES lib64 lib

src/imstring.cpp

@@ -0,0 +1,158 @@
+/*
+Copyright (c) 2019 Artem Chernyshev
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+*/
+
+#include "imstring.h"
+#include "imgui.h"
+#include "imgui_internal.h"
+
+ImString::ImString()
+  : mData(0)
+  , mRefCount(0)
+{
+}
+
+ImString::ImString(size_t len)
+  : mData(0)
+  , mRefCount(0)
+{
+  reserve(len);
+}
+
+ImString::ImString(char* string)
+  : mData(string)
+  , mRefCount(0)
+{
+  ref();
+}
+
+ImString::ImString(const char* string)
+  : mData(0)
+  , mRefCount(0)
+{
+  if(string) {
+    mData = ImStrdup(string);
+    ref();
+  }
+}
+
+ImString::ImString(const ImString& other)
+{
+  mRefCount = other.mRefCount;
+  mData = other.mData;
+  ref();
+}
+
+ImString::~ImString()
+{
+  unref();
+}
+
+char& ImString::operator[](size_t pos) {
+  return mData[pos];
+}
+
+ImString::operator char* () { return mData; }
+
+bool ImString::operator==(const char* string)
+{
+  return strcmp(string, mData) == 0;
+}
+
+bool ImString::operator!=(const char* string)
+{
+  return strcmp(string, mData) != 0;
+}
+
+bool ImString::operator==(const ImString& string)
+{
+  return strcmp(string.c_str(), mData) == 0;
+}
+
+bool ImString::operator!=(const ImString& string)
+{
+  return strcmp(string.c_str(), mData) != 0;
+}
+
+ImString& ImString::operator=(const char* string)
+{
+  if(mData)
+    unref();
+  mData = ImStrdup(string);
+  ref();
+  return *this;
+}
+
+ImString& ImString::operator=(const ImString& other)
+{
+  if(mData && mData != other.mData)
+    unref();
+  mRefCount = other.mRefCount;
+  mData = other.mData;
+  ref();
+  return *this;
+}
+
+void ImString::reserve(size_t len)
+{
+  if(mData)
+    unref();
+  mData = (char*)ImGui::MemAlloc(len + 1);
+  mData[len] = '\0';
+  ref();
+}
+
+char* ImString::get() {
+  return mData;
+}
+
+const char* ImString::c_str() const {
+  return mData;
+}
+
+bool ImString::empty() const {
+  return mData == 0 || mData[0] == '\0';
+}
+
+int ImString::refcount() const {
+  return *mRefCount;
+}
+
+void ImString::ref() {
+  if(!mRefCount) {
+    mRefCount = new int();
+    (*mRefCount) = 0;
+  }
+  (*mRefCount)++;
+}
+
+void ImString::unref()
+{
+  if(mRefCount) {
+    (*mRefCount)--;
+    if(*mRefCount == 0) {
+      ImGui::MemFree(mData);
+      mData = 0;
+      delete mRefCount;
+    }
+    mRefCount = 0;
+  }
+}