TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-03 10:22:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix static-init order issue

Browse Source
This commit is contained in:
David Rose 2008-11-11 02:00:12 +00:00
parent 9e76c93d1e
commit 0ae9a55bdb
3 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dtool/src/prc/configPageManager.cxx
View File

@ -352,6 +352,13 @@ reload_implicit_pages() {
#ifdef USE_PANDAFILESTREAM #ifdef USE_PANDAFILESTREAM
// Update this very low-level config variable here, for lack of any // Update this very low-level config variable here, for lack of any
// better place. // 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; PandaFileStreamBuf::_newline_mode = newline_mode;
#endif // USE_PANDAFILESTREAM #endif // USE_PANDAFILESTREAM
} }

12
dtool/src/prc/config_prc.cxx
View File

@ -21,15 +21,3 @@ NotifyCategoryDef(prc, "");
ConfigVariableBool assert_abort ConfigVariableBool assert_abort
("assert-abort", false, ("assert-abort", false,
PRC_DESC("Set this true to trigger a core dump and/or stack trace when the first assertion fails")); 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

4
dtool/src/prc/config_prc.h
View File

@ -24,9 +24,5 @@ NotifyCategoryDecl(prc, EXPCL_DTOOLCONFIG, EXPTP_DTOOLCONFIG);
extern ConfigVariableBool assert_abort; extern ConfigVariableBool assert_abort;
#ifdef USE_PANDAFILESTREAM
extern ConfigVariableEnum<PandaFileStreamBuf::NewlineMode> newline_mode;
#endif
#endif #endif