[BUILD][CMAKE] Update build scripts.

diff --git a/source/build-cmake/config_build.sh b/source/build-cmake/config_build.sh
index 67d1d15..182dacc 100755 (executable)
--- a/source/build-cmake/config_build.sh
+++ b/source/build-cmake/config_build.sh
@@ -40,8 +40,39 @@ esac
 # libCSPGui
 mkdir -p libCSPgui/build
 mkdir -p libCSPosd/build
-cd libCSPgui/build
+mkdir -p libCSPemu_utils/build
+
+cd libCSPemu_utils/build
+echo ${CMAKE_FLAGS1} ${CMAKE_FLAGS2}
+${CMAKE} -DCMAKE_C_COMPILER:STRING=${CCMAKE_CC}  \
+         -DCMAKE_CXX_COMPILER:STRING=${CCMAKE_CXX} \
+        "-DLIBCSP_INSTALL_DIR:STRING=${LIB_INSTALL}" \
+        ${CMAKE_FLAGS1} \
+        "${CMAKE_FLAGS2}=${MAKEFLAGS_LIB_CXX}" \
+        "${CMAKE_FLAGS3}=${MAKEFLAGS_LIB_CC}" \
+        ${CMAKE_APPENDFLAG} \
+        .. | tee make.log
+        
+${CMAKE} -DCMAKE_C_COMPILER:STRING=${CCMAKE_CC}  \
+        -DCMAKE_CXX_COMPILER:STRING=${CCMAKE_CXX} \
+        "-DLIBCSP_INSTALL_DIR:STRING=${LIB_INSTALL}" \
+        ${CMAKE_FLAGS1} \
+        "${CMAKE_FLAGS2}=${MAKEFLAGS_LIB_CXX}" \
+        "${CMAKE_FLAGS3}=${MAKEFLAGS_LIB_CC}" \
+        ${CMAKE_APPENDFLAG} \
+        .. | tee -a make.log
+
+make clean
+make ${MAKEFLAGS_GENERAL} 2>&1 | tee -a ./make.log
+case $? in
+      0 ) sudo make install 2>&1 | tee -a ./make.log ;;
+      * ) exit $? ;;
+    esac
     
+make clean
+cd ../..
+
+cd libCSPgui/build
 echo ${CMAKE_FLAGS1} ${CMAKE_FLAGS2}
 ${CMAKE} -DCMAKE_C_COMPILER:STRING=${CCMAKE_CC}  \
          -DCMAKE_CXX_COMPILER:STRING=${CCMAKE_CXX} \

diff --git a/source/build-cmake/config_build_cross_win32.sh b/source/build-cmake/config_build_cross_win32.sh
index 7f45ecf..9877897 100755 (executable)
--- a/source/build-cmake/config_build_cross_win32.sh
+++ b/source/build-cmake/config_build_cross_win32.sh
@@ -51,9 +51,43 @@ case ${BUILD_TYPE} in
 esac
 
 # libCSPGui
+mkdir -p libCSPemu_utils/build-win32
 mkdir -p libCSPgui/build-win32
 mkdir -p libCSPosd/build-win32
 
+cd libCSPemu_utils/build-win32
+echo ${CMAKE_FLAGS1} ${CMAKE_FLAGS2}
+${CMAKE} -DCMAKE_TOOLCHAIN_FILE=${TOOLCHAIN_SCRIPT} \
+       ${CMAKE_FLAGS1} \
+       "${CMAKE_FLAGS2}=${MAKEFLAGS_LIB_CXX}" \
+       "${CMAKE_FLAGS3}=${MAKEFLAGS_LIB_CC}" \
+       "-DUSE_SDL2=ON" \
+       ${CMAKE_APPENDFLAG} \
+       ${CMAKE_LINKFLAG} \
+       .. | tee make.log
+
+${CMAKE} ${CMAKE_FLAGS1} \
+       "${CMAKE_FLAGS2}=${MAKEFLAGS_LIB_CXX}" \
+       "${CMAKE_FLAGS3}=${MAKEFLAGS_LIB_CC}" \
+       "-DUSE_SDL2=ON" \
+       ${CMAKE_APPENDFLAG} \
+       ${CMAKE_LINKFLAG} \
+       .. | tee -a make.log
+       
+make clean
+    
+make ${MAKEFLAGS_GENERAL} 2>&1 | tee -a ./make.log
+#case $? in
+#      0 ) 
+#      cp ./qt/gui/libqt_gui.a ../../bin-win32/ 
+#      cp ./qt/gui/*.lib ../../bin-win32/ 
+#      cp ./qt/gui/*.dll ../../bin-win32/ 
+#      ;;
+#      * ) exit $? ;;
+#esac
+#make clean
+cd ../..
+
 cd libCSPgui/build-win32
     
 echo ${CMAKE_FLAGS1} ${CMAKE_FLAGS2}
@@ -156,6 +190,12 @@ for SRCDATA in $@ ; do\
     make clean
     cd ../..
 done
+
+exit 0
+cd libCSPemu_utils/build-win32
+make clean
+cd ../..
+
 cd libCSPgui/build-win32
 make clean
 cd ../..

diff --git a/source/build-cmake/config_build_mingw.sh b/source/build-cmake/config_build_mingw.sh
index d2a5a79..fd735a3 100755 (executable)
--- a/source/build-cmake/config_build_mingw.sh
+++ b/source/build-cmake/config_build_mingw.sh
@@ -46,8 +46,47 @@ case ${BUILD_TYPE} in
            ;;
 esac
 #libCSPgui
+mkdir -p libCSPemu_utils/build-win32
 mkdir -p libCSPgui/build-win32
 mkdir -p libCSPosd/build-win32
+
+cd libCSPemu_utils/build-win32
+echo ${CMAKE_FLAGS1} ${CMAKE_FLAGS2}
+${CMAKE} -G "${CMAKE_GENTYPE}" \
+        ${CMAKE_GENFLAGS} \
+         -D CMAKE_C_COMPILER:STRING=${CCMAKE_CC}  \
+        -D CMAKE_CXX_COMPILER:STRING=${CCMAKE_CXX} \
+        ${CMAKE_FLAGS1} \
+        "${CMAKE_FLAGS2}=${MAKEFLAGS_LIB_CXX}" \
+        "${CMAKE_FLAGS3}=${MAKEFLAGS_LIB_CC}" \
+        ${CMAKE_APPENDFLAG} \
+        ${CMAKE_LINKFLAG} \
+        .. | tee make.log
+
+${CMAKE} -D CMAKE_C_COMPILER:STRING=${CCMAKE_CC}  \
+         -D CMAKE_CXX_COMPILER:STRING=${CCMAKE_CXX} \
+        ${CMAKE_FLAGS1} \
+        "${CMAKE_FLAGS2}=${MAKEFLAGS_LIB_CXX}" \
+        "${CMAKE_FLAGS3}=${MAKEFLAGS_LIB_CC}" \
+        ${CMAKE_APPENDFLAG} \
+        ${CMAKE_LINKFLAG} \
+        .. | tee -a make.log
+        
+mingw32-make clean
+mingw32-make ${MAKEFLAGS_GENERAL} 2>&1 | tee -a ./make.log
+
+case $? in
+      0 ) 
+#      cp ./qt/gui/libqt_gui.a ../../bin-win32/ 
+#      cp ./qt/gui/*.lib ../../bin-win32/ 
+#      cp ./qt/gui/*.dll ../../bin-win32/ 
+      ;;
+      * ) exit $? ;;
+esac
+#mingw32-make clean
+cd ../..
+
+
 cd libCSPgui/build-win32
 echo ${CMAKE_FLAGS1} ${CMAKE_FLAGS2}
 ${CMAKE} -G "${CMAKE_GENTYPE}" \
@@ -159,6 +198,10 @@ for SRCDATA in $@ ; do\
     cd ../..
 done
 
+cd libCSPemu_utils/build-win32
+mingw32-make clean
+cd ../..
+
 cd libCSPgui/build-win32
 mingw32-make clean
 cd ../..