Browse Source

move OS_SIMPLE_THREADS to dtool_config.h

David Rose 15 years ago
parent
commit
5e8d539f1f

+ 4 - 0
dtool/LocalSetup.pp

@@ -407,6 +407,10 @@ $[cdefine HAVE_THREADS]
 /* Define if we want to use fast, user-space simulated threads.  */
 $[cdefine SIMPLE_THREADS]
 
+/* Define if SIMPLE_THREADS should be implemented with the OS-provided
+   threading layer (if available). */
+$[cdefine OS_SIMPLE_THREADS]
+
 /* Define to enable deadlock detection, mutex recursion checks, etc. */
 $[cdefine DEBUG_THREADS]
 

+ 0 - 2
panda/src/pipeline/Sources.pp

@@ -281,5 +281,3 @@
     test_setjmp.cxx
 
 #end test_bin_target
-
-#include $[THISDIRPREFIX]contextSwitchParameters.h.pp

+ 0 - 1
panda/src/pipeline/contextSwitch.c

@@ -13,7 +13,6 @@
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include "contextSwitch.h"
-#include "contextSwitchParameters.h"
 
 #include <stdlib.h>
 #include <stdio.h>

+ 0 - 18
panda/src/pipeline/contextSwitchParameters.h.pp

@@ -1,18 +0,0 @@
-// This file is read and processed by ppremake to generate
-// contextSwitchParameters.h, which is #included by configPageManager.cxx.
-// This mechanism is used, rather than just putting the parameters in
-// dtool_config.h, to (a) help keep the prc encryption key from
-// getting spread around to too many places, and (b) minimize the need
-// to rebuild the whole world just because you changed some low-level
-// prc parameters.
-
-#output contextSwitchParameters.h notouch
-/* contextSwitchParameters.h.  Generated automatically by $[PPREMAKE] $[PPREMAKE_VERSION] from $[notdir $[THISFILENAME]]. */
-/********************************** DO NOT EDIT ****************************/
-
-
-/* Define if SIMPLE_THREADS should be implemented with the OS-provided
-   threading layer (if available). */
-$[cdefine OS_SIMPLE_THREADS]
-
-#end contextSwitchParameters.h