Skip to content
This repository was archived by the owner on Jan 13, 2022. It is now read-only.

Changes needed to work with Visual Studio 2015 #105

Open
makiolo wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Changes needed to work with Visual Studio 2015 #105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
00530d8
Update CCRakNetSlidingWindow.cpp
makiolo Dec 8, 2016
da83aed
Update CMakeLists.txt
makiolo Dec 8, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Lib/LibStatic/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ IF(WIN32 AND NOT UNIX)

IF(NOT ${CMAKE_GENERATOR} STREQUAL "MSYS Makefiles")

IF( MSVC10 OR MSVC11 OR MSVC12 )
IF( MSVC10 OR MSVC11 OR MSVC12 OR MSVC14 )

@davidstlyoui davidstlyoui Apr 28, 2017

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems like a duplicate of this PR: #64
which I commented. The proper way to do it here, would probably be:

if (MSVC_VERSION GREATER_EQUAL 1600)

set_target_properties(RakNetLibStatic PROPERTIES STATIC_LIBRARY_FLAGS "/NODEFAULTLIB:\"LIBCD.lib LIBCMTD.lib MSVCRT.lib\"" )
ELSE()
set_target_properties(RakNetLibStatic PROPERTIES STATIC_LIBRARY_FLAGS "/NODEFAULTLIB:"LIBCD.lib LIBCMTD.lib MSVCRT.lib"" )
Expand Down
2 changes: 1 addition & 1 deletion Source/CCRakNetSlidingWindow.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ static const CCTimeType SYN=10000;

#include "MTUSize.h"
#include <stdio.h>
#include <math.h>
#include <cmath>

@davidstlyoui davidstlyoui Apr 28, 2017

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As I commented also on #64,
personally I would rather just change the abs to an fabs and avoid header changes like this.

#include <stdlib.h>
#include "RakAssert.h"
#include "RakAlloca.h"
Expand Down