rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-02-26 15:54:15 +01:00
Code Issues Releases Activity

OP-1390 Copy only opengl32.dll 32bit version

Browse Source
This commit is contained in:
Laurent Lalanne 2014-07-05 14:12:27 +02:00
parent db63158bc6
commit 05e7339ecc
2 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ground/openpilotgcs/copydata.pro
View File

@ -159,8 +159,7 @@ GCS_LIBRARY_PATH
platforms \ platforms \
mediaservice \ mediaservice \
sqldrivers \ sqldrivers \
opengl32_32 \ opengl32_32
opengl32_64
for(dir, QT_PLUGIN_DIRS) { for(dir, QT_PLUGIN_DIRS) {
data_copy.commands += -@$(MKDIR) $$targetPath(\"$$GCS_APP_PATH/$$dir\") $$addNewline() 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() data_copy.commands += $(COPY_FILE) $$targetPath(\"$$(OPENSSL_DIR)/$$dll\") $$targetPath(\"$$GCS_APP_PATH/$$dll\") $$addNewline()
} }
# copy OpenGL DLLs # copy OpenGL DLL
OPENGL_DLLS = \ OPENGL_DLLS = \
opengl32_32/opengl32.dll \ opengl32_32/opengl32.dll
opengl32_64/opengl32.dll
for(dll, OPENGL_DLLS) { for(dll, OPENGL_DLLS) {
data_copy.commands += $(COPY_FILE) $$targetPath(\"$$(MESAWIN_DIR)/$$dll\") $$targetPath(\"$$GCS_APP_PATH/$$dll\") $$addNewline() data_copy.commands += $(COPY_FILE) $$targetPath(\"$$(MESAWIN_DIR)/$$dll\") $$targetPath(\"$$GCS_APP_PATH/$$dll\") $$addNewline()
} }

5
package/winx86/openpilotgcs.nsi
View File

@ -256,12 +256,9 @@ SectionEnd
; Copy Opengl32.dll if needed (disabled by default) ; Copy Opengl32.dll if needed (disabled by default)
Section /o "Mesa OpenGL driver" InSecInstallOpenGL Section /o "Mesa OpenGL driver" InSecInstallOpenGL
SetOutPath "$INSTDIR\bin" 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" File /r "${GCS_BUILD_TREE}\bin\opengl32_32\opengl32.dll"
${EndIf}
SectionEnd SectionEnd
; AeroSimRC plugin files ; AeroSimRC plugin files
Section "AeroSimRC plugin" InSecAeroSimRC Section "AeroSimRC plugin" InSecAeroSimRC
SetOutPath "$INSTDIR\misc\AeroSIM-RC" SetOutPath "$INSTDIR\misc\AeroSIM-RC"