• R/O
  • SSH
  • HTTPS

qrobosdk: コミット


コミットメタ情報

リビジョン1946 (tree)
日時2011-03-07 09:09:16
作者satofumi

ログメッセージ

make zip のルールをコンパイル環境にあわせて更新

変更サマリ

差分

--- trunk/libs/packages/urg_exe_files/Makefile (revision 1945)
+++ trunk/libs/packages/urg_exe_files/Makefile (revision 1946)
@@ -5,26 +5,30 @@
55
66
77 PROGRAM_FOLDER = ../../../programs
8-QT_FOLDER = /c/Qt/4.5.3_mingw
8+QT_FOLDER = /c/Qt/2010.05_static
9+QT_CODECS_FOLDER = /c/Qt/2010.05_static/qt
10+MINGW_FOLDER = /c/Qt/2010.05_static/mingw
911
12+REQUILE_LIBS = /mingw/bin/libgcc_s_dw2-1.dll /mingw/bin/libstdc++-6.dll
13+
1014 all :
1115 mkdir -p DLL/
12- cp $(QT_FOLDER)/bin/mingwm10.dll DLL/
16+ cp $(MINGW_FOLDER)/bin/mingwm10.dll DLL/
1317 cp $(QT_FOLDER)/bin/QtCore4.dll DLL/
1418 cp $(QT_FOLDER)/bin/QtGui4.dll DLL/
1519 cp $(QT_FOLDER)/bin/QtNetwork4.dll DLL/
1620 cp $(QT_FOLDER)/bin/QtOpenGL4.dll DLL/
17- cp -R $(QT_FOLDER)/plugins/codecs DLL/
21+ cp -R $(QT_CODECS_FOLDER)/plugins/codecs DLL/
1822 \
1923 cd $(PROGRAM_FOLDER)/UrgViewer && qmake && make
2024 mkdir -p UrgViewer
2125 cp $(PROGRAM_FOLDER)/UrgViewer/release/UrgViewer.exe UrgViewer/
22- cp $(PROGRAM_FOLDER)/UrgViewer/UrgViewer_ja.qm UrgViewer/
26+ cp $(PROGRAM_FOLDER)/UrgViewer/UrgViewer_ja.qm $(REQUILE_LIBS) UrgViewer/
2327 #cp -R DLL/* UrgViewer/
2428 \
2529 cd $(PROGRAM_FOLDER)/UrgInformation && qmake && make
2630 mkdir -p UrgInformation
27- cp $(PROGRAM_FOLDER)/UrgInformation/release/UrgInformation.exe UrgInformation/
31+ cp $(PROGRAM_FOLDER)/UrgInformation/release/UrgInformation.exe $(REQUILE_LIBS) UrgInformation/
2832 cd UrgInformation/
2933 $(RM) UrgInformation/QtOpenGL*.dll
3034 #cp -R DLL/* UrgInformation/
@@ -32,19 +36,19 @@
3236 \
3337 cd $(PROGRAM_FOLDER)/UrgPorts && qmake && make
3438 mkdir -p UrgPorts
35- cp $(PROGRAM_FOLDER)/UrgPorts/release/UrgPorts.exe UrgPorts/
39+ cp $(PROGRAM_FOLDER)/UrgPorts/release/UrgPorts.exe $(REQUILE_LIBS) UrgPorts/
3640 #cp -R DLL/* UrgPorts/
3741 cd UrgPorts/ && $(RM) -rf QtOpenGL*.dll QtNetwork*.dll codecs
3842 \
3943 cd $(PROGRAM_FOLDER)/UrgRecorder && qmake && make
4044 mkdir -p UrgRecorder
41- cp $(PROGRAM_FOLDER)/UrgRecorder/release/UrgRecorder.exe UrgRecorder/
45+ cp $(PROGRAM_FOLDER)/UrgRecorder/release/UrgRecorder.exe $(REQUILE_LIBS) UrgRecorder/
4246 #cp -R DLL/* UrgRecorder
4347 cd UrgRecorder/ && $(RM) -rf QtOpenGL*.dll codecs
4448 \
4549 cd $(PROGRAM_FOLDER)/ScipPlayer && qmake && make
4650 mkdir -p ScipPlayer
47- cp $(PROGRAM_FOLDER)/ScipPlayer/release/ScipPlayer.exe ScipPlayer/
51+ cp $(PROGRAM_FOLDER)/ScipPlayer/release/ScipPlayer.exe $(REQUILE_LIBS) ScipPlayer/
4852 cp $(PROGRAM_FOLDER)/ScipPlayer/ScipPlayer_ja.qm ScipPlayer/
4953 #cp -R DLL/* ScipPlayer/
5054 cd ScipPlayer/ && $(RM) -rf QtNetwork*.dll
@@ -51,7 +55,7 @@
5155 \
5256 cd $(PROGRAM_FOLDER)/MultiUrgViewer && qmake && make
5357 mkdir -p MultiUrgViewer
54- cp $(PROGRAM_FOLDER)/MultiUrgViewer/release/MultiUrgViewer.exe MultiUrgViewer/
58+ cp $(PROGRAM_FOLDER)/MultiUrgViewer/release/MultiUrgViewer.exe $(REQUILE_LIBS) MultiUrgViewer/
5559 #cp -R DLL/* MultiUrgViewer/
5660
5761 clean : zip_clean
旧リポジトリブラウザで表示