Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

reverted change that breaks assert build #775

Merged
merged 1 commit into from Dec 11, 2020

Conversation

MattOttawa
Copy link
Member

No description provided.

@github-actions github-actions bot added the dll A C++ issue label Dec 11, 2020
@Toffer90
Copy link
Contributor

Huh, curious that that would break the unity compilation of assert builds...
Impressive that you figured it out that fast.

@MattOttawa
Copy link
Member Author

Said unity 5 is broken. only made a couple changes to those files.

// Auto-generated Unity file - do not modify

#include "CvGameCoreDLL.h"

#pragma message( "C:/Users/Matt/Documents/GitHub/Caveman2Cosmos/Sources/CvGlobals.cpp" )
#include "C:\Users\Matt\Documents\GitHub\Caveman2Cosmos\Sources\CvGlobals.cpp"

#pragma message( "C:/Users/Matt/Documents/GitHub/Caveman2Cosmos/Sources/CvHallOfFameInfo.cpp" )
#include "C:\Users\Matt\Documents\GitHub\Caveman2Cosmos\Sources\CvHallOfFameInfo.cpp"

#pragma message( "C:/Users/Matt/Documents/GitHub/Caveman2Cosmos/Sources/CvInfos.cpp" )
#include "C:\Users\Matt\Documents\GitHub\Caveman2Cosmos\Sources\CvInfos.cpp"

#pragma message( "C:/Users/Matt/Documents/GitHub/Caveman2Cosmos/Sources/CvInfoWater.cpp" )
#include "C:\Users\Matt\Documents\GitHub\Caveman2Cosmos\Sources\CvInfoWater.cpp"

#pragma message( "C:/Users/Matt/Documents/GitHub/Caveman2Cosmos/Sources/CvInitCore.cpp" )
#include "C:\Users\Matt\Documents\GitHub\Caveman2Cosmos\Sources\CvInitCore.cpp"

#pragma message( "C:/Users/Matt/Documents/GitHub/Caveman2Cosmos/Sources/CvMap.cpp" )
#include "C:\Users\Matt\Documents\GitHub\Caveman2Cosmos\Sources\CvMap.cpp"

#pragma message( "C:/Users/Matt/Documents/GitHub/Caveman2Cosmos/Sources/CvMapExternal.cpp" )
#include "C:\Users\Matt\Documents\GitHub\Caveman2Cosmos\Sources\CvMapExternal.cpp"

#pragma message( "C:/Users/Matt/Documents/GitHub/Caveman2Cosmos/Sources/CvMapGenerator.cpp" )
#include "C:\Users\Matt\Documents\GitHub\Caveman2Cosmos\Sources\CvMapGenerator.cpp"

#pragma message( "C:/Users/Matt/Documents/GitHub/Caveman2Cosmos/Sources/CvMapInterfaceBase.cpp" )
#include "C:\Users\Matt\Documents\GitHub\Caveman2Cosmos\Sources\CvMapInterfaceBase.cpp"

@MattOttawa
Copy link
Member Author

Had to look up error. It's caused by too many functions like you guys guessed. Turning off /Cy compiler option should fix if it breaks again in the future.

https://docs.microsoft.com/en-us/cpp/error-messages/compiler-errors-1/fatal-error-c1128?view=msvc-160

@MattOttawa MattOttawa merged commit 29d6d25 into caveman2cosmos:master Dec 11, 2020
@MattOttawa MattOttawa deleted the fix_assert2 branch March 19, 2021 18:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
dll A C++ issue
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants