• R/O
  • SSH
  • HTTPS

qrobosdk: コミット


コミットメタ情報

リビジョン1963 (tree)
日時2011-08-10 09:38:50
作者satofumi

ログメッセージ

fixed urg_exe make rules.

変更サマリ

差分

--- trunk/libs/packages/urg_exe_files/Makefile (revision 1962)
+++ trunk/libs/packages/urg_exe_files/Makefile (revision 1963)
@@ -4,27 +4,28 @@
44 # http://www.vector.co.jp/soft/winnt/util/se355605.html
55
66
7+#MINGW_FOLDER = /c/Qt/2010.05_static/mingw
8+#QT_FOLDER = /c/Qt/2010.05_static
9+MINGW_FOLDER = /c/mingw
10+QT_FOLDER = /c/Qt/4.7.2
711 PROGRAM_FOLDER = ../../../programs
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
11-
12+QT_CODECS_FOLDER = $(QT_FOLDER)/qt
1213 REQUILE_LIBS = /mingw/bin/libgcc_s_dw2-1.dll /mingw/bin/libstdc++-6.dll
1314
1415 all :
1516 mkdir -p DLL/
16- cp $(MINGW_FOLDER)/bin/mingwm10.dll DLL/
17- cp $(QT_FOLDER)/bin/QtCore4.dll DLL/
18- cp $(QT_FOLDER)/bin/QtGui4.dll DLL/
19- cp $(QT_FOLDER)/bin/QtNetwork4.dll DLL/
20- cp $(QT_FOLDER)/bin/QtOpenGL4.dll DLL/
21- cp -R $(QT_CODECS_FOLDER)/plugins/codecs DLL/
17+# cp $(MINGW_FOLDER)/bin/mingwm10.dll DLL/
18+# cp $(QT_FOLDER)/bin/QtCore4.dll DLL/
19+# cp $(QT_FOLDER)/bin/QtGui4.dll DLL/
20+# cp $(QT_FOLDER)/bin/QtNetwork4.dll DLL/
21+# cp $(QT_FOLDER)/bin/QtOpenGL4.dll DLL/
22+# cp -R $(QT_CODECS_FOLDER)/plugins/codecs DLL/
2223 \
2324 cd $(PROGRAM_FOLDER)/UrgViewer && qmake && make
2425 mkdir -p UrgViewer
2526 cp $(PROGRAM_FOLDER)/UrgViewer/release/UrgViewer.exe UrgViewer/
2627 cp $(PROGRAM_FOLDER)/UrgViewer/UrgViewer_ja.qm $(REQUILE_LIBS) UrgViewer/
27- #cp -R DLL/* UrgViewer/
28+# cp -R DLL/* UrgViewer/
2829 \
2930 cd $(PROGRAM_FOLDER)/UrgInformation && qmake && make
3031 mkdir -p UrgInformation
@@ -31,19 +32,19 @@
3132 cp $(PROGRAM_FOLDER)/UrgInformation/release/UrgInformation.exe $(REQUILE_LIBS) UrgInformation/
3233 cd UrgInformation/
3334 $(RM) UrgInformation/QtOpenGL*.dll
34- #cp -R DLL/* UrgInformation/
35+# cp -R DLL/* UrgInformation/
3536 cd UrgInformation/ && $(RM) -rf QtOpenGL*.dll codecs
3637 \
3738 cd $(PROGRAM_FOLDER)/UrgPorts && qmake && make
3839 mkdir -p UrgPorts
3940 cp $(PROGRAM_FOLDER)/UrgPorts/release/UrgPorts.exe $(REQUILE_LIBS) UrgPorts/
40- #cp -R DLL/* UrgPorts/
41+# cp -R DLL/* UrgPorts/
4142 cd UrgPorts/ && $(RM) -rf QtOpenGL*.dll QtNetwork*.dll codecs
4243 \
4344 cd $(PROGRAM_FOLDER)/UrgRecorder && qmake && make
4445 mkdir -p UrgRecorder
4546 cp $(PROGRAM_FOLDER)/UrgRecorder/release/UrgRecorder.exe $(REQUILE_LIBS) UrgRecorder/
46- #cp -R DLL/* UrgRecorder
47+# cp -R DLL/* UrgRecorder
4748 cd UrgRecorder/ && $(RM) -rf QtOpenGL*.dll codecs
4849 \
4950 cd $(PROGRAM_FOLDER)/ScipPlayer && qmake && make
@@ -50,13 +51,13 @@
5051 mkdir -p ScipPlayer
5152 cp $(PROGRAM_FOLDER)/ScipPlayer/release/ScipPlayer.exe $(REQUILE_LIBS) ScipPlayer/
5253 cp $(PROGRAM_FOLDER)/ScipPlayer/ScipPlayer_ja.qm ScipPlayer/
53- #cp -R DLL/* ScipPlayer/
54+# cp -R DLL/* ScipPlayer/
5455 cd ScipPlayer/ && $(RM) -rf QtNetwork*.dll
5556 \
5657 cd $(PROGRAM_FOLDER)/MultiUrgViewer && qmake && make
5758 mkdir -p MultiUrgViewer
5859 cp $(PROGRAM_FOLDER)/MultiUrgViewer/release/MultiUrgViewer.exe $(REQUILE_LIBS) MultiUrgViewer/
59- #cp -R DLL/* MultiUrgViewer/
60+# cp -R DLL/* MultiUrgViewer/
6061
6162 clean : zip_clean
6263 $(RM) -rf DLL/
@@ -71,9 +72,9 @@
7172 $(RM) *.zip
7273
7374 zip : zip_clean
74- cscript MakeZIP.VBS UrgViewer.zip UrgViewer/*
75- cscript MakeZIP.VBS UrgInformation.zip UrgInformation/*
76- cscript MakeZIP.VBS UrgPorts.zip UrgPorts/*
77- cscript MakeZIP.VBS UrgRecorder.zip UrgRecorder/*
78- cscript MakeZIP.VBS ScipPlayer.zip ScipPlayer/*
79- cscript MakeZIP.VBS MultiUrgViewer.zip MultiUrgViewer/*
75+ zip -r UrgViewer.zip UrgViewer/*
76+ zip -r UrgInformation.zip UrgInformation/*
77+ zip -r UrgPorts.zip UrgPorts/*
78+ zip -r UrgRecorder.zip UrgRecorder/*
79+ zip -r ScipPlayer.zip ScipPlayer/*
80+ zip -r MultiUrgViewer.zip MultiUrgViewer/*
旧リポジトリブラウザで表示