Browse Source

Undoing accidental change

Josh Yelon 20 years ago
parent
commit
c536465235
2 changed files with 5 additions and 7 deletions
  1. 1 1
      doc/makepanda/makepanda71.vcproj
  2. 4 6
      dtool/src/dtoolutil/executionEnvironment.h

+ 1 - 1
doc/makepanda/makepanda71.vcproj

@@ -18,7 +18,7 @@
 			<Tool
 			<Tool
 				Name="VCNMakeTool"
 				Name="VCNMakeTool"
 				BuildCommandLine="cd .. &amp; makepanda\makepanda --everything --installer"
 				BuildCommandLine="cd .. &amp; makepanda\makepanda --everything --installer"
-				Output="..\built\python\python.exe"/>
+				Output="..\built\bin\ppython.exe"/>
 		</Configuration>
 		</Configuration>
 	</Configurations>
 	</Configurations>
 	<References>
 	<References>

+ 4 - 6
dtool/src/dtoolutil/executionEnvironment.h

@@ -51,15 +51,10 @@ public:
   INLINE static int get_num_args();
   INLINE static int get_num_args();
   INLINE static string get_arg(int n);
   INLINE static string get_arg(int n);
 
 
-  static Filename get_cwd();
-
-PUBLISHED:
   INLINE static string get_binary_name();
   INLINE static string get_binary_name();
   INLINE static string get_dtool_name();
   INLINE static string get_dtool_name();
 
 
-PUBLISHED:
-  string ns_get_binary_name() const;
-  string ns_get_dtool_name() const;
+  static Filename get_cwd();
 
 
 private:
 private:
   bool ns_has_environment_variable(const string &var) const;
   bool ns_has_environment_variable(const string &var) const;
@@ -71,6 +66,9 @@ private:
   int ns_get_num_args() const;
   int ns_get_num_args() const;
   string ns_get_arg(int n) const;
   string ns_get_arg(int n) const;
 
 
+  string ns_get_binary_name() const;
+  string ns_get_dtool_name() const;
+
   static ExecutionEnvironment *get_ptr();
   static ExecutionEnvironment *get_ptr();
 
 
   void read_environment_variables();
   void read_environment_variables();