diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2014-01-03 10:35:14 +0100 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2014-01-03 10:35:34 +0100 |
| commit | 12dd00394b62d26d892cbd320fcb5652df6635e6 (patch) | |
| tree | cb90e889ab2463dc9864e59fbfbd7d5a8a812830 | |
| parent | 1a95a291666f82d15fc1fe6e91803d3a71816883 (diff) | |
Fix FSX manifest. Ouch!
| -rw-r--r-- | ftnoir_protocol_sc/ftnoir-protocol-sc.rc | 1 | ||||
| -rw-r--r-- | ftnoir_protocol_sc/ftnoir_protocol_sc.cpp | 8 | ||||
| -rw-r--r-- | ftnoir_protocol_sc/ftnoir_sccontrols.ui | 11 | ||||
| -rw-r--r-- | ftnoir_protocol_sc/scserver-acceleration.manifest | 13 |
4 files changed, 29 insertions, 4 deletions
diff --git a/ftnoir_protocol_sc/ftnoir-protocol-sc.rc b/ftnoir_protocol_sc/ftnoir-protocol-sc.rc index 693aa12e..80b6c12c 100644 --- a/ftnoir_protocol_sc/ftnoir-protocol-sc.rc +++ b/ftnoir_protocol_sc/ftnoir-protocol-sc.rc @@ -1,3 +1,4 @@ #include <winuser.h> 142 RT_MANIFEST scserver.manifest 143 RT_MANIFEST scserver-sp2.manifest +144 RT_MANIFEST scserver-acceleration.manifest
\ No newline at end of file diff --git a/ftnoir_protocol_sc/ftnoir_protocol_sc.cpp b/ftnoir_protocol_sc/ftnoir_protocol_sc.cpp index 9fb48527..2714e980 100644 --- a/ftnoir_protocol_sc/ftnoir_protocol_sc.cpp +++ b/ftnoir_protocol_sc/ftnoir_protocol_sc.cpp @@ -102,7 +102,12 @@ public: actx.cbSize = sizeof(ACTCTXA); actx.lpResourceName = MAKEINTRESOURCEA(resid); actx.dwFlags = ACTCTX_FLAG_RESOURCE_NAME_VALID; - QString path = QCoreApplication::applicationDirPath() + "/opentrack-proto-simconnect.dll"; +#ifdef _MSC_VER +# define PREFIX "" +#else +# define PREFIX "lib" +#endif + QString path = QCoreApplication::applicationDirPath() + "/" PREFIX "opentrack-proto-simconnect.dll"; QByteArray name = QFile::encodeName(path); actx.lpSource = name.constData(); hactctx = CreateActCtxA(&actx); @@ -135,6 +140,7 @@ bool FTNoIR_Protocol::checkServerInstallationOK() { ActivationContext ctx(142 + static_cast<int>(s.sxs_manifest)); + SCClientLib.setFileName("SimConnect.dll"); if (!SCClientLib.load()) { qDebug() << "SC load" << SCClientLib.errorString(); return false; diff --git a/ftnoir_protocol_sc/ftnoir_sccontrols.ui b/ftnoir_protocol_sc/ftnoir_sccontrols.ui index 17e94c4b..430b3912 100644 --- a/ftnoir_protocol_sc/ftnoir_sccontrols.ui +++ b/ftnoir_protocol_sc/ftnoir_sccontrols.ui @@ -9,8 +9,8 @@ <rect>
<x>0</x>
<y>0</y>
- <width>258</width>
- <height>61</height>
+ <width>290</width>
+ <height>79</height>
</rect>
</property>
<property name="windowTitle">
@@ -38,7 +38,7 @@ <widget class="QComboBox" name="comboBox">
<item>
<property name="text">
- <string>Acceleration</string>
+ <string>SP1</string>
</property>
</item>
<item>
@@ -46,6 +46,11 @@ <string>SP2</string>
</property>
</item>
+ <item>
+ <property name="text">
+ <string>Acceleration</string>
+ </property>
+ </item>
</widget>
</item>
<item row="1" column="1">
diff --git a/ftnoir_protocol_sc/scserver-acceleration.manifest b/ftnoir_protocol_sc/scserver-acceleration.manifest new file mode 100644 index 00000000..06459587 --- /dev/null +++ b/ftnoir_protocol_sc/scserver-acceleration.manifest @@ -0,0 +1,13 @@ +<?xml version='1.0' encoding='UTF-8' standalone='yes'?> +<assembly xmlns='urn:schemas-microsoft-com:asm.v1' manifestVersion='1.0'> + <dependency> + <dependentAssembly> + <assemblyIdentity type='win32' name='Microsoft.FlightSimulator.SimConnect ' version='10.0.61242.0' processorArchitecture='x86' publicKeyToken='67c7c14424d61b5b' /> + </dependentAssembly> + </dependency> + <dependency> + <dependentAssembly> + <assemblyIdentity type='win32' name='Microsoft.VC80.CRT' version='8.0.50608.0' processorArchitecture='x86' publicKeyToken='1fc8b3b9a1e18e3b' /> + </dependentAssembly> + </dependency> +</assembly> |