TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-15 16:44:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #696 from Ragora/bugfix-macos-compile

Browse source 
BugFix: Correct compilation for MacOS
This commit is contained in:
Areloch 2021-12-04 14:11:00 -06:00 • committed by GitHub
commit 54fb5837ec
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 26 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Engine/source/console/bison.simple
View file

@ -166,9 +166,9 @@ __yy_memcpy (from, to, count)
char *to; char *to;
int count; int count;
{ {
register char *f = from; char *f = from;
register char *t = to; char *t = to;
register int i = count; int i = count;
while (i-- > 0) while (i-- > 0)
*t++ = *f++; *t++ = *f++;
@ -181,9 +181,9 @@ __yy_memcpy (from, to, count)
static void static void
__yy_memcpy (char *from, char *to, int count) __yy_memcpy (char *from, char *to, int count)
{ {
register char *f = from; char *f = from;
register char *t = to; char *t = to;
register int i = count; int i = count;
while (i-- > 0) while (i-- > 0)
*t++ = *f++; *t++ = *f++;
@ -211,10 +211,10 @@ int
yyparse(YYPARSE_PARAM) yyparse(YYPARSE_PARAM)
YYPARSE_PARAM_DECL YYPARSE_PARAM_DECL
{ {
register int yystate; int yystate;
register int yyn; int yyn;
register short *yyssp; short *yyssp;
register YYSTYPE *yyvsp; YYSTYPE *yyvsp;
int yyerrstatus; /* number of tokens to shift before error messages enabled */ int yyerrstatus; /* number of tokens to shift before error messages enabled */
int yychar1 = 0; /* lookahead token as an internal (translated) token number */ int yychar1 = 0; /* lookahead token as an internal (translated) token number */

20
Engine/source/console/cmdgram.cpp
View file

@ -1247,9 +1247,9 @@ __yy_memcpy (from, to, count)
char *to; char *to;
int count; int count;
{ {
register char *f = from; char *f = from;
register char *t = to; char *t = to;
register int i = count; int i = count;
while (i-- > 0) while (i-- > 0)
*t++ = *f++; *t++ = *f++;
@ -1262,9 +1262,9 @@ __yy_memcpy (from, to, count)
static void static void
__yy_memcpy (char *from, char *to, int count) __yy_memcpy (char *from, char *to, int count)
{ {
register char *f = from; char *f = from;
register char *t = to; char *t = to;
register int i = count; int i = count;
while (i-- > 0) while (i-- > 0)
*t++ = *f++; *t++ = *f++;
@ -1292,10 +1292,10 @@ int
yyparse(YYPARSE_PARAM) yyparse(YYPARSE_PARAM)
YYPARSE_PARAM_DECL YYPARSE_PARAM_DECL
{ {
register int yystate; int yystate;
register int yyn; int yyn;
register short *yyssp; short *yyssp;
register YYSTYPE *yyvsp; YYSTYPE *yyvsp;
int yyerrstatus; /* number of tokens to shift before error messages enabled */ int yyerrstatus; /* number of tokens to shift before error messages enabled */
int yychar1 = 0; /* lookahead token as an internal (translated) token number */ int yychar1 = 0; /* lookahead token as an internal (translated) token number */

6
Tools/CMake/basics.cmake
View file

@ -348,6 +348,8 @@ macro(finishLibrary)
add_library("${PROJECT_NAME}" SHARED ${${PROJECT_NAME}_files}) add_library("${PROJECT_NAME}" SHARED ${${PROJECT_NAME}_files})
endif() endif()
target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_11)
# omg - only use the first folder ... otherwise we get lots of header name collisions # omg - only use the first folder ... otherwise we get lots of header name collisions
#foreach(dir ${${PROJECT_NAME}_paths}) #foreach(dir ${${PROJECT_NAME}_paths})
addInclude("${firstDir}") addInclude("${firstDir}")
@ -384,6 +386,10 @@ macro(finishExecutable)
else() else()
add_executable("${PROJECT_NAME}" WIN32 ${${PROJECT_NAME}_files}) add_executable("${PROJECT_NAME}" WIN32 ${${PROJECT_NAME}_files})
endif() endif()
# Torque requires c++17
target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_17)
addInclude("${firstDir}") addInclude("${firstDir}")
_postTargetProcess() _postTargetProcess()

3
Tools/CMake/torque3d.cmake
View file

@ -656,9 +656,6 @@ finishExecutable()
############################################################################### ###############################################################################
############################################################################### ###############################################################################
# Torque requires c++17
target_compile_features(${TORQUE_APP_NAME} PRIVATE cxx_std_17)
# Set Visual Studio startup project # Set Visual Studio startup project
if(MSVC) if(MSVC)
set_property(DIRECTORY ${CMAKE_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT ${TORQUE_APP_NAME}) set_property(DIRECTORY ${CMAKE_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT ${TORQUE_APP_NAME})