Fix for tomcrypt component, and windows build.

lillod · Mar 19, 2019 · 377120e · 377120e
1 parent 5603feb
commit 377120e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/.travis.yml b/.travis.yml
@@ -30,7 +30,7 @@ matrix:
       script:
         - mkdir -p ${TRAVIS_BUILD_DIR}/build && cd ${TRAVIS_BUILD_DIR}/build
         - cmake ..
-        - MSbuild.exe TravisTesting.sln -t:TravisTesting
+        - MSbuild.exe Etterna.sln -t:Etterna /p:Configuration=Release
 
 
 

diff --git a/extern/libtomcrypt/CMakeLists.txt b/extern/libtomcrypt/CMakeLists.txt
@@ -268,6 +268,7 @@ add_library("tomcrypt" STATIC ${TOMCRYPT_SRC} ${TOMCRYPT_HPP})
 
 set_property(TARGET "tomcrypt" PROPERTY FOLDER "External Libraries")
 
+set_target_properties(tomcrypt PROPERTIES COMPILE_DEFINITIONS LTC_NO_ASM)
 #if (WITH_PORTABLE_TOMCRYPT)
 #  sm_add_compile_definition("tomcrypt" LTC_NO_ASM)
 #elseif(WITH_NO_ROLC_TOMCRYPT AND NOT APPLE)