mirror of
https://github.com/panda3d/panda3d.git
synced 2025-10-03 10:22:45 -04:00
fix static-init order issue
This commit is contained in:
parent
9e76c93d1e
commit
0ae9a55bdb
@ -352,6 +352,13 @@ reload_implicit_pages() {
|
||||
#ifdef USE_PANDAFILESTREAM
|
||||
// Update this very low-level config variable here, for lack of any
|
||||
// better place.
|
||||
ConfigVariableEnum<PandaFileStreamBuf::NewlineMode> newline_mode
|
||||
("newline-mode", PandaFileStreamBuf::NM_native,
|
||||
PRC_DESC("Controls how newlines are written by Panda applications writing "
|
||||
"to a text file. The default, \"native\", means to write newlines "
|
||||
"appropriate to the current platform. You may also specify \"binary\", "
|
||||
"to avoid molesting the file data, or one of \"msdos\", \"unix\", "
|
||||
"or \"mac\"."));
|
||||
PandaFileStreamBuf::_newline_mode = newline_mode;
|
||||
#endif // USE_PANDAFILESTREAM
|
||||
}
|
||||
|
@ -21,15 +21,3 @@ NotifyCategoryDef(prc, "");
|
||||
ConfigVariableBool assert_abort
|
||||
("assert-abort", false,
|
||||
PRC_DESC("Set this true to trigger a core dump and/or stack trace when the first assertion fails"));
|
||||
|
||||
#ifdef USE_PANDAFILESTREAM
|
||||
|
||||
ConfigVariableEnum<PandaFileStreamBuf::NewlineMode> newline_mode
|
||||
("newline-mode", PandaFileStreamBuf::NM_native,
|
||||
PRC_DESC("Controls how newlines are written by Panda applications writing "
|
||||
"to a text file. The default, \"native\", means to write newlines "
|
||||
"appropriate to the current platform. You may also specify \"binary\", "
|
||||
"to avoid molesting the file data, or one of \"msdos\", \"unix\", "
|
||||
"or \"mac\"."));
|
||||
|
||||
#endif // USE_PANDAFILESTREAM
|
||||
|
@ -24,9 +24,5 @@ NotifyCategoryDecl(prc, EXPCL_DTOOLCONFIG, EXPTP_DTOOLCONFIG);
|
||||
|
||||
extern ConfigVariableBool assert_abort;
|
||||
|
||||
#ifdef USE_PANDAFILESTREAM
|
||||
extern ConfigVariableEnum<PandaFileStreamBuf::NewlineMode> newline_mode;
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user