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

use win_amd64 instead of win64, and win_i386 instead of win32

Browse Source
This commit is contained in:
David Rose 2012-10-01 18:24:13 +00:00
parent a098df8670
commit da9ee4c165
5 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
direct/src/p3d/pdeploy.py
View File

@ -72,7 +72,7 @@ Options:
separated list of platforms that the p3d package will be separated list of platforms that the p3d package will be
deployed for. If omitted, it will be built for all platforms. deployed for. If omitted, it will be built for all platforms.
This option may be specified multiple times. This option may be specified multiple times.
Examples of valid platforms are win32, linux_amd64 and osx_ppc. Examples of valid platforms are win_i386, linux_amd64 and osx_ppc.
-c -c
If this option is provided, any -P options are ignored and If this option is provided, any -P options are ignored and

10
direct/src/plugin/p3dInstanceManager.cxx
View File

@ -216,16 +216,18 @@ initialize(int api_version, const string &contents_filename,
// caller), we might in fact support multiple platforms. // caller), we might in fact support multiple platforms.
_platform = DTOOL_PLATFORM; _platform = DTOOL_PLATFORM;
#ifdef _WIN32 #ifdef _WIN32
if (_platform == "win64") { if (_platform == "win_amd64") {
_supported_platforms.push_back("win64"); _supported_platforms.push_back("win_amd64");
_supported_platforms.push_back("win_i386");
_supported_platforms.push_back("win32"); _supported_platforms.push_back("win32");
} else if (_platform == "win32") { } else if (_platform == "win_i386" || _platform == "win32") {
// This is a WIN32 process, but determine if the underlying OS // This is a WIN32 process, but determine if the underlying OS
// actually supports WIN64. // actually supports WIN64.
if (supports_win64()) { if (supports_win64()) {
_supported_platforms.push_back("win64"); _supported_platforms.push_back("win_amd64");
} }
_supported_platforms.push_back("win_i386");
_supported_platforms.push_back("win32"); _supported_platforms.push_back("win32");
} }
#endif // _WIN32 #endif // _WIN32

7
direct/src/plugin/p3dPackage.cxx
View File

@ -604,6 +604,8 @@ contents_file_redownload_finished(bool success) {
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
void P3DPackage:: void P3DPackage::
host_got_contents_file() { host_got_contents_file() {
P3DInstanceManager *inst_mgr = P3DInstanceManager::get_global_ptr();
if (!_alt_host.empty()) { if (!_alt_host.empty()) {
// If we have an alt host specification, maybe we need to change // If we have an alt host specification, maybe we need to change
// the host now. // the host now.
@ -619,7 +621,6 @@ host_got_contents_file() {
// host. // host.
_alt_host.clear(); _alt_host.clear();
P3DInstanceManager *inst_mgr = P3DInstanceManager::get_global_ptr();
if (!_host->has_current_contents_file(inst_mgr)) { if (!_host->has_current_contents_file(inst_mgr)) {
// Now go back and get the contents.xml file for the new host. // Now go back and get the contents.xml file for the new host.
download_contents_file(); download_contents_file();
@ -646,7 +647,8 @@ host_got_contents_file() {
set_fullname(); set_fullname();
} }
} else { } else {
nout << "Couldn't find a platform for " << get_package_name() << ".\n"; nout << "Couldn't find a platform for " << get_package_name()
<< " matching " << inst_mgr->get_platform() << ".\n";
} }
nout << "_per_platform for " << get_package_name() << " = " << _per_platform << "\n"; nout << "_per_platform for " << get_package_name() << " = " << _per_platform << "\n";
@ -662,7 +664,6 @@ host_got_contents_file() {
} }
// Ensure the package directory exists; create it if it does not. // Ensure the package directory exists; create it if it does not.
P3DInstanceManager *inst_mgr = P3DInstanceManager::get_global_ptr();
if (inst_mgr->get_verify_contents() != P3D_VC_never) { if (inst_mgr->get_verify_contents() != P3D_VC_never) {
mkdir_complete(_package_dir, nout); mkdir_complete(_package_dir, nout);
} }

3
direct/src/plugin_installer/make_xpi.py
View File

@ -46,7 +46,8 @@ assert options.host_url, "The host_url must be supplied!"
# going through this mechanism. # going through this mechanism.
FirefoxPlatformMap = { FirefoxPlatformMap = {
'win32' : 'WINNT_x86-msvc', 'win32' : 'WINNT_x86-msvc',
'win64' : 'WINNT_x86_64-msvc', 'win_i386' : 'WINNT_x86-msvc',
'win_amd64' : 'WINNT_x86_64-msvc',
# 'linux_i386' : 'Linux_x86-gcc3', # 'linux_i386' : 'Linux_x86-gcc3',
# 'linux_amd64' : 'Linux_x86_64-gcc3', # 'linux_amd64' : 'Linux_x86_64-gcc3',
# 'linux_ppc' : 'Linux_ppc-gcc3', # 'linux_ppc' : 'Linux_ppc-gcc3',

2
direct/src/showutil/FreezeTool.py
View File

@ -122,7 +122,7 @@ class CompilationEnvironment:
# MSVC/bin and /lib directories have a different location # MSVC/bin and /lib directories have a different location
# for win64. # for win64.
if self.platform == 'win64': if self.platform == 'win_amd64':
self.suffix64 = '\\amd64' self.suffix64 = '\\amd64'
# If it is run by makepanda, it handles the MSVC and PlatformSDK paths itself. # If it is run by makepanda, it handles the MSVC and PlatformSDK paths itself.