diff --git a/ground/openpilotgcs/copydata.pro b/ground/openpilotgcs/copydata.pro index 4a61693ba..933b77d76 100644 --- a/ground/openpilotgcs/copydata.pro +++ b/ground/openpilotgcs/copydata.pro @@ -159,8 +159,7 @@ GCS_LIBRARY_PATH platforms \ mediaservice \ sqldrivers \ - opengl32_32 \ - opengl32_64 + opengl32_32 for(dir, QT_PLUGIN_DIRS) { data_copy.commands += -@$(MKDIR) $$targetPath(\"$$GCS_APP_PATH/$$dir\") $$addNewline() } @@ -237,10 +236,9 @@ GCS_LIBRARY_PATH data_copy.commands += $(COPY_FILE) $$targetPath(\"$$(OPENSSL_DIR)/$$dll\") $$targetPath(\"$$GCS_APP_PATH/$$dll\") $$addNewline() } - # copy OpenGL DLLs + # copy OpenGL DLL OPENGL_DLLS = \ - opengl32_32/opengl32.dll \ - opengl32_64/opengl32.dll + opengl32_32/opengl32.dll for(dll, OPENGL_DLLS) { data_copy.commands += $(COPY_FILE) $$targetPath(\"$$(MESAWIN_DIR)/$$dll\") $$targetPath(\"$$GCS_APP_PATH/$$dll\") $$addNewline() } diff --git a/package/winx86/openpilotgcs.nsi b/package/winx86/openpilotgcs.nsi index 954e06ef8..f569ef6e2 100644 --- a/package/winx86/openpilotgcs.nsi +++ b/package/winx86/openpilotgcs.nsi @@ -256,12 +256,9 @@ SectionEnd ; Copy Opengl32.dll if needed (disabled by default) Section /o "Mesa OpenGL driver" InSecInstallOpenGL SetOutPath "$INSTDIR\bin" - ${If} ${RunningX64} - File /r "${GCS_BUILD_TREE}\bin\opengl32_64\opengl32.dll" - ${Else} File /r "${GCS_BUILD_TREE}\bin\opengl32_32\opengl32.dll" - ${EndIf} SectionEnd + ; AeroSimRC plugin files Section "AeroSimRC plugin" InSecAeroSimRC SetOutPath "$INSTDIR\misc\AeroSIM-RC"