Update ENIGMA Submodule (#55)

Pull in the newer ENIGMA submodule and point to the protos at their new directory. Also link to Wtsapi32 and grpc_cronet which is now necessary with the new Qt5 deps.

CMakeLists.txt

@@ -19,7 +19,7 @@ set(CMAKE_AUTOUIC_SEARCH_PATHS "${CMAKE_CURRENT_SOURCE_DIR}/Dialogs")
 
 # Include ENIGMA things
 set(ENIGMA_DIR ${CMAKE_CURRENT_SOURCE_DIR}/Submodules/enigma-dev)
-include_directories("${ENIGMA_DIR}/CommandLine/protos" "${ENIGMA_DIR}/CommandLine/libEGM")
+include_directories("${ENIGMA_DIR}/shared/protos" "${ENIGMA_DIR}/CommandLine/libEGM")
 
 # Populate a CMake variable with the sources
 set(RGM_SOURCES
@@ -187,9 +187,10 @@ target_link_libraries(${EXE} PRIVATE "$<IF:$<CONFIG:Debug>,${LIB_PROTO_D},${LIB_
 
 # Find GRPC
 find_library(LIB_GRPC_UNSECURE NAMES grpc++_unsecure)
+find_library(LIB_GRPC_CRONET NAMES grpc_cronet)
 find_library(LIB_GRPC NAMES grpc)
 find_library(LIB_GPR NAMES gpr)
-target_link_libraries(${EXE} PRIVATE ${LIB_GRPC_UNSECURE} ${LIB_GRPC} ${LIB_GPR})
+target_link_libraries(${EXE} PRIVATE ${LIB_GPR} ${LIB_GRPC} ${LIB_GRPC_UNSECURE} ${LIB_GRPC_CRONET})
 
 # Find Protobuf
 include(FindProtobuf)
@@ -277,5 +278,5 @@ target_link_libraries(${EXE} PRIVATE ${LIB_DOUBLE_CONVERSION})
 
 if(WIN32)
 	# Windows is a turd
-	target_link_libraries(${EXE} PRIVATE Ws2_32 Wldap32 Crypt32 Winmm Userenv Netapi32 version Dwmapi Imm32)
+	target_link_libraries(${EXE} PRIVATE Ws2_32 Wtsapi32 Wldap32 Crypt32 Winmm Userenv Netapi32 version Dwmapi Imm32)
 endif(WIN32)

RadialGM.pro

@@ -43,8 +43,8 @@ DEFINES += QT_DEPRECATED_WARNINGS
 
 INCLUDEPATH += /usr/include/qt/ \
                $$PWD/Submodules/enigma-dev/CommandLine/libEGM/ \
-               $$PWD/Submodules/enigma-dev/CommandLine/protos \
-               $$PWD/Submodules/enigma-dev/CommandLine/protos/codegen
+               $$PWD/Submodules/enigma-dev/shared/protos \
+               $$PWD/Submodules/enigma-dev/shared/protos/codegen
 LIBS += -L$$PWD/Submodules/enigma-dev/CommandLine/libEGM/ \
         -lEGM \
         -lprotobuf \

appveyor.yml

@@ -59,7 +59,7 @@ install:
 build_script:
   - echo %BUILD_TYPE%
   - echo %GENERATOR%
-  - cd %APPVEYOR_BUILD_FOLDER%\Submodules\enigma-dev\CommandLine\protos
+  - cd %APPVEYOR_BUILD_FOLDER%\Submodules\enigma-dev\shared\protos
   - mkdir build && cd build
   - cmake -G "%GENERATOR%" -DCMAKE_BUILD_TYPE="%BUILD_TYPE%" -DPROTOBUF_IMPORT_DIRS="%VCPKG_DIR%\installed\%TRIPLET_NAME%\include" -DVCPKG_TARGET_TRIPLET=%TRIPLET_NAME% -DCMAKE_TOOLCHAIN_FILE="%VCPKG_DIR%\scripts\buildsystems\vcpkg.cmake" ..
   - cmake --build . --target install --config "%BUILD_TYPE%"