diff --git a/direct/src/plugin_activex/P3DActiveX.sln b/direct/src/plugin_activex/P3DActiveX.sln index 888984fe2e..5263bf1e8b 100644 --- a/direct/src/plugin_activex/P3DActiveX.sln +++ b/direct/src/plugin_activex/P3DActiveX.sln @@ -1,32 +1,21 @@ -Microsoft Visual Studio Solution File, Format Version 8.00 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "P3DActiveX", "P3DActiveX.vcproj", "{74451B00-2D87-412B-9359-B5CA2C2FEC2A}" - ProjectSection(ProjectDependencies) = postProject - {1278896B-1978-40CC-B1A0-2D6A7450A32C} = {1278896B-1978-40CC-B1A0-2D6A7450A32C} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tinyxml", "..\..\..\wintools\sdk\tinyxml\tinyxml_lib_mfc_static.vcproj", "{1278896B-1978-40CC-B1A0-2D6A7450A32C}" - ProjectSection(ProjectDependencies) = postProject - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfiguration) = preSolution - Debug = Debug - Release = Release - EndGlobalSection - GlobalSection(ProjectDependencies) = postSolution - EndGlobalSection - GlobalSection(ProjectConfiguration) = postSolution - {74451B00-2D87-412B-9359-B5CA2C2FEC2A}.Debug.ActiveCfg = Debug|Win32 - {74451B00-2D87-412B-9359-B5CA2C2FEC2A}.Debug.Build.0 = Debug|Win32 - {74451B00-2D87-412B-9359-B5CA2C2FEC2A}.Release.ActiveCfg = Release|Win32 - {74451B00-2D87-412B-9359-B5CA2C2FEC2A}.Release.Build.0 = Release|Win32 - {1278896B-1978-40CC-B1A0-2D6A7450A32C}.Debug.ActiveCfg = Debug|Win32 - {1278896B-1978-40CC-B1A0-2D6A7450A32C}.Debug.Build.0 = Debug|Win32 - {1278896B-1978-40CC-B1A0-2D6A7450A32C}.Release.ActiveCfg = Release|Win32 - {1278896B-1978-40CC-B1A0-2D6A7450A32C}.Release.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - EndGlobalSection - GlobalSection(ExtensibilityAddIns) = postSolution - EndGlobalSection -EndGlobal +Microsoft Visual Studio Solution File, Format Version 8.00 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "P3DActiveX", "P3DActiveX.vcproj", "{74451B00-2D87-412B-9359-B5CA2C2FEC2A}" + ProjectSection(ProjectDependencies) = postProject + EndProjectSection +EndProject +Global + GlobalSection(SolutionConfiguration) = preSolution + Debug = Debug + Release = Release + EndGlobalSection + GlobalSection(ProjectConfiguration) = postSolution + {74451B00-2D87-412B-9359-B5CA2C2FEC2A}.Debug.ActiveCfg = Debug|Win32 + {74451B00-2D87-412B-9359-B5CA2C2FEC2A}.Debug.Build.0 = Debug|Win32 + {74451B00-2D87-412B-9359-B5CA2C2FEC2A}.Release.ActiveCfg = Release|Win32 + {74451B00-2D87-412B-9359-B5CA2C2FEC2A}.Release.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + EndGlobalSection + GlobalSection(ExtensibilityAddIns) = postSolution + EndGlobalSection +EndGlobal diff --git a/direct/src/plugin_activex/P3DActiveX.vcproj b/direct/src/plugin_activex/P3DActiveX.vcproj index dce7f9a40e..e729fb73d5 100644 --- a/direct/src/plugin_activex/P3DActiveX.vcproj +++ b/direct/src/plugin_activex/P3DActiveX.vcproj @@ -1,254 +1,260 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/direct/src/plugin_activex/PPBrowserObject.h b/direct/src/plugin_activex/PPBrowserObject.h index 634daf39ac..e51190db56 100644 --- a/direct/src/plugin_activex/PPBrowserObject.h +++ b/direct/src/plugin_activex/PPBrowserObject.h @@ -14,7 +14,7 @@ #pragma once -#include "plugin/p3d_plugin.h" +#include "p3d_plugin.h" #include class PPInterface; diff --git a/direct/src/plugin_activex/PPInstance.cpp b/direct/src/plugin_activex/PPInstance.cpp index a043cf8b85..30d9b865f6 100644 --- a/direct/src/plugin_activex/PPInstance.cpp +++ b/direct/src/plugin_activex/PPInstance.cpp @@ -33,13 +33,11 @@ #include "PPBrowserObject.h" #include "PPDownloadRequest.h" -#include "wintools/sdk/tinyxml/tinyxml.h" +#include "p3d_plugin_config.h" +#include "tinyxml.h" #define P3D_CONTENTS_FILENAME "contents.xml" -#define P3D_BASE_URL "http://www.ddrose.com/~drose/p3d_7/" -//#define P3D_BASE_URL "file:///C:/p3dstage/" - #define P3D_FILE_BASE_URL "http://www.ddrose.com/~drose/plugin/" //#define P3D_FILE_BASE_URL "file:///C:/temp/" @@ -171,13 +169,18 @@ int PPInstance::DownloadP3DComponents( std::string& p3dDllFilename, std::string& std::string localContentsFileName( tempFolderName, pathLength ); localContentsFileName += P3D_CONTENTS_FILENAME; - std::string remoteContentsFilename( P3D_BASE_URL ); + std::string hostUrl( PANDA_PACKAGE_HOST_URL ); + if (!hostUrl.empty() && hostUrl[hostUrl.size() - 1] != '/') { + hostUrl += '/'; + } + + std::string remoteContentsFilename( hostUrl ); remoteContentsFilename += P3D_CONTENTS_FILENAME; error = DownloadFile( remoteContentsFilename, localContentsFileName ); if ( !error ) { - std::string p3dRemoteModuleFileName( P3D_BASE_URL ); + std::string p3dRemoteModuleFileName( hostUrl ); error = ReadContents( localContentsFileName, p3dRemoteModuleFileName ); if ( !error ) { diff --git a/direct/src/plugin_activex/PPInstance.h b/direct/src/plugin_activex/PPInstance.h index 176090c5cd..19009f5187 100644 --- a/direct/src/plugin_activex/PPInstance.h +++ b/direct/src/plugin_activex/PPInstance.h @@ -18,7 +18,7 @@ #include #include "afxmt.h" -#include "plugin/p3d_plugin.h" +#include "p3d_plugin.h" #include "PPDownloadCallback.h" #include "PPLogger.h" diff --git a/direct/src/plugin_activex/PPInterface.h b/direct/src/plugin_activex/PPInterface.h index f9fec57620..97648afd92 100644 --- a/direct/src/plugin_activex/PPInterface.h +++ b/direct/src/plugin_activex/PPInterface.h @@ -14,7 +14,7 @@ #pragma once -#include "plugin/p3d_plugin.h" +#include "p3d_plugin.h" class PPInterface { diff --git a/direct/src/plugin_activex/PPPandaObject.h b/direct/src/plugin_activex/PPPandaObject.h index 8486e3c88a..7541d7b8c8 100644 --- a/direct/src/plugin_activex/PPPandaObject.h +++ b/direct/src/plugin_activex/PPPandaObject.h @@ -17,7 +17,7 @@ #include #include -#include "plugin/p3d_plugin.h" +#include "p3d_plugin.h" #include "PPInterface.h" class PPandaObject : public IDispatch