Skip to content

Commit

Permalink
Try to fix compile
Browse files Browse the repository at this point in the history
  • Loading branch information
nico-abram committed Mar 11, 2018
1 parent a248709 commit ea2c2db
Show file tree
Hide file tree
Showing 84 changed files with 6 additions and 20 deletions.
17 changes: 5 additions & 12 deletions StepmaniaCore.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -254,18 +254,11 @@ if(WIN32)
link_libraries(${SM_EXTERN_DIR}/LuaJIT/lua51.lib)
include_directories(${SM_EXTERN_DIR}/LuaJIT/include)

find_library(LIB_UWS NAMES "uWS"
PATHS "${SM_EXTERN_DIR}/uWebSocket" NO_DEFAULT_PATH
)
find_library(LIB_EAY NAMES "libeay32"
PATHS "${SM_EXTERN_DIR}/uWebSocket" NO_DEFAULT_PATH
)
find_library(LIB_SSL NAMES "ssleay32"
PATHS "${SM_EXTERN_DIR}/uWebSocket" NO_DEFAULT_PATH
)
find_library(LIB_UV NAMES "libuv"
PATHS "${SM_EXTERN_DIR}/uWebSocket" NO_DEFAULT_PATH
)
include_directories(${SM_EXTERN_DIR}/uWebSocket/include)
link_libraries(${SM_EXTERN_DIR}/uWebSocket/uWS.lib)
link_libraries(${SM_EXTERN_DIR}/uWebSocket/libeay32.lib)
link_libraries(${SM_EXTERN_DIR}/uWebSocket/ssleay32.lib)
link_libraries(${SM_EXTERN_DIR}/uWebSocket/libuv.lib)
if (MINGW AND WITH_FFMPEG)
include("${SM_CMAKE_DIR}/SetupFfmpeg.cmake")
set(HAS_FFMPEG TRUE)
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,6 @@
# define _WIN32_WINNT 0x0600
#endif

#if !defined(_SSIZE_T_) && !defined(_SSIZE_T_DEFINED)
typedef intptr_t ssize_t;
# define _SSIZE_T_
# define _SSIZE_T_DEFINED
#endif

#include <winsock2.h>

Expand Down
File renamed without changes.
4 changes: 1 addition & 3 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -534,9 +534,7 @@ list(APPEND SM_INCLUDE_DIRS
${CMAKE_CURRENT_SOURCE_DIR}
"${SM_SRC_DIR}/generated"
)
list(APPEND SM_INCLUDE_DIRS
"${SM_EXTERN_DIR}/uWebSocket/include"
)

if(NOT APPLE)
list(APPEND SM_INCLUDE_DIRS
"${SM_EXTERN_DIR}/glew-1.5.8/include"
Expand Down

0 comments on commit ea2c2db

Please sign in to comment.