Skip to content

Commit

Permalink
Merge remote-tracking branch 'internal/princeton'
Browse files Browse the repository at this point in the history
  • Loading branch information
@kgcm
kgcm committed May 30, 2014
2 parents 82daa2a + 16ef2b0 commit 270c4a3
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 57 deletions.
7 changes: 4 additions & 3 deletions README.markdown
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,10 +98,10 @@ Andrew Leifer is happy, however, to answer any questions about the code itself o
Step by step install for Windows 7 64 Bit
=========================================

* Install Bitflow SDK (Camera API)
* Install Bitflow SDK (Camera API) v. 5.60
* Install Karbon Bitflow Frame Grabber Board
* Hook up Camera via Cameralink
* Install Vialux & ALP Basic (DMD API)
* Install Vialux & ALP Basic (DMD API) ALP Basic 4.1
* Hook up DMD via USB
* Install git http://git-scm.com/downloads (note 1.8.5 has a bug w/ https, so use 1.8.4 for now)
* Install this git repo and the submodules it depends upon
Expand All @@ -115,7 +115,7 @@ Step by step install for Windows 7 64 Bit
* Prepare to Compile openCV by running `cmake`
* Point cmake to opencv's source directory: `C:/opencv/sources`
* Create a folder for the compiled opencv libraries: `C:/opencv/build_mingw64`
* Configure cmake as "unix makefile" and point it to the toolchain file template included in this repo: `mingw-w64-toolchain.cmake` note you may have to adjust the file paths
* Configure cmake as "unix makefile" or "MinGW Makefile" whichever works and point it to the toolchain file template included in this repo: `mingw-w64-toolchain.cmake` note you may have to adjust the file paths
* I had to manually add in some parameters for `cmake` to work, even if they were also included in the tool chain, specifically:
* `CMAKE_LINKER C:/mingw64/x86_64-w64-mingw32/bin/ld.exe`
* `CMAKE_MAKE_PROGRAM C:/mingw64/bin/mingw32-make.exe`
Expand All @@ -129,6 +129,7 @@ Step by step install for Windows 7 64 Bit
* `cd` into `/c/opencv/build_mingw64`
* run `/c/mingw64/bin/mingw32-make.exe install` (if you are rerunning, be sure to `make clean` first)
* At the end of a successful compilation, `C:\opencv\build_mingw64\lib\` should be full of `*.a` files. and `C:\opencv\build_mingw64\bin\` should be full of sample programs that actually run when invoked from a `cmd` Windows command line environment.
* Add `C:\opencv\build_mingw64\bin\` to the system path environment variables
* Adjust the mindcontrol software `makefile` in preparation of compiling the mindcontrol software. Sometimes, for example opencv changes the location of different header folders or modules and this needs to be updated. Also check that the locations of `git` is the same as this gets called during compilation.

* Compile the mindcontrol software
Expand Down
55 changes: 1 addition & 54 deletions makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ BitFlow_DIR = C:/BitFlow\ SDK\ 5.60/

#Git Version control
GIT=C:/Progra~2/Git/bin/git

#C:\Users\nji\AppData\Local\Programs\Git\bin\git.exe


#=========================
Expand Down Expand Up @@ -100,132 +100,79 @@ LinkerWinAPILibObj= -lcomctl32 -lgdi32 -lole32 -lavifil32 -lavicap32 -lwinmm -lm

#OpenCV objects
openCVobjs=$(OPENCV2_BUILD_DIR)/lib/libopencv_calib3d248.dll.a \
$(OPENCV2_BUILD_DIR)/lib/libopencv_calib3d248d.dll.a\
$(OPENCV2_BUILD_DIR)/lib/libopencv_calib3d_pch_dephelp.a\
$(OPENCV2_BUILD_DIR)/lib/libopencv_calib3d_pch_dephelpd.a\
$(OPENCV2_BUILD_DIR)/lib/libopencv_contrib248.dll.a\
$(OPENCV2_BUILD_DIR)/lib/libopencv_contrib_pch_dephelp.a\
$(OPENCV2_BUILD_DIR)/lib/libopencv_core248.dll.a\
$(OPENCV2_BUILD_DIR)/lib/libopencv_core248d.dll.a\
$(OPENCV2_BUILD_DIR)/lib/libopencv_core_pch_dephelp.a\
$(OPENCV2_BUILD_DIR)/lib/libopencv_core_pch_dephelpd.a\
$(OPENCV2_BUILD_DIR)/lib/libopencv_features2d248.dll.a\
$(OPENCV2_BUILD_DIR)/lib/libopencv_features2d248d.dll.a\
$(OPENCV2_BUILD_DIR)/lib/libopencv_features2d_pch_dephelp.a\
$(OPENCV2_BUILD_DIR)/lib/libopencv_features2d_pch_dephelpd.a\
$(OPENCV2_BUILD_DIR)/lib/libopencv_flann248.dll.a \
$(OPENCV2_BUILD_DIR)/lib/libopencv_flann248d.dll.a \
$(OPENCV2_BUILD_DIR)/lib/libopencv_flann_pch_dephelp.a \
$(OPENCV2_BUILD_DIR)/lib/libopencv_flann_pch_dephelpd.a \
$(OPENCV2_BUILD_DIR)/lib/libopencv_gpu248.dll.a \
$(OPENCV2_BUILD_DIR)/lib/libopencv_gpu248d.dll.a \
$(OPENCV2_BUILD_DIR)/lib/libopencv_gpu_pch_dephelp.a \
$(OPENCV2_BUILD_DIR)/lib/libopencv_gpu_pch_dephelpd.a \
$(OPENCV2_BUILD_DIR)/lib/libopencv_haartraining_engine.a \
$(OPENCV2_BUILD_DIR)/lib/libopencv_highgui248.dll.a \
$(OPENCV2_BUILD_DIR)/lib/libopencv_highgui248d.dll.a \
$(OPENCV2_BUILD_DIR)/lib/libopencv_highgui_pch_dephelp.a \
$(OPENCV2_BUILD_DIR)/lib/libopencv_highgui_pch_dephelpd.a \
$(OPENCV2_BUILD_DIR)/lib/libopencv_imgproc248.dll.a \
$(OPENCV2_BUILD_DIR)/lib/libopencv_imgproc248d.dll.a \
$(OPENCV2_BUILD_DIR)/lib/libopencv_imgproc_pch_dephelp.a \
$(OPENCV2_BUILD_DIR)/lib/libopencv_imgproc_pch_dephelpd.a \
$(OPENCV2_BUILD_DIR)/lib/libopencv_legacy248.dll.a \
$(OPENCV2_BUILD_DIR)/lib/libopencv_legacy248d.dll.a \
$(OPENCV2_BUILD_DIR)/lib/libopencv_legacy_pch_dephelp.a \
$(OPENCV2_BUILD_DIR)/lib/libopencv_legacy_pch_dephelpd.a \
$(OPENCV2_BUILD_DIR)/lib/libopencv_ml248.dll.a \
$(OPENCV2_BUILD_DIR)/lib/libopencv_ml248d.dll.a \
$(OPENCV2_BUILD_DIR)/lib/libopencv_ml_pch_dephelp.a \
$(OPENCV2_BUILD_DIR)/lib/libopencv_ml_pch_dephelpd.a \
$(OPENCV2_BUILD_DIR)/lib/libopencv_nonfree248.dll.a \
$(OPENCV2_BUILD_DIR)/lib/libopencv_nonfree_pch_dephelp.a \
$(OPENCV2_BUILD_DIR)/lib/libopencv_objdetect248.dll.a \
$(OPENCV2_BUILD_DIR)/lib/libopencv_objdetect248d.dll.a \
$(OPENCV2_BUILD_DIR)/lib/libopencv_objdetect_pch_dephelp.a \
$(OPENCV2_BUILD_DIR)/lib/libopencv_objdetect_pch_dephelpd.a \
$(OPENCV2_BUILD_DIR)/lib/libopencv_ocl248.dll.a \
$(OPENCV2_BUILD_DIR)/lib/libopencv_ocl_pch_dephelp.a \
$(OPENCV2_BUILD_DIR)/lib/libopencv_perf_calib3d_pch_dephelp.a \
$(OPENCV2_BUILD_DIR)/lib/libopencv_perf_calib3d_pch_dephelpd.a \
$(OPENCV2_BUILD_DIR)/lib/libopencv_perf_core_pch_dephelp.a \
$(OPENCV2_BUILD_DIR)/lib/libopencv_perf_core_pch_dephelpd.a \
$(OPENCV2_BUILD_DIR)/lib/libopencv_perf_features2d_pch_dephelp.a \
$(OPENCV2_BUILD_DIR)/lib/libopencv_perf_features2d_pch_dephelpd.a \
$(OPENCV2_BUILD_DIR)/lib/libopencv_perf_gpu_pch_dephelp.a \
$(OPENCV2_BUILD_DIR)/lib/libopencv_perf_gpu_pch_dephelpd.a \
$(OPENCV2_BUILD_DIR)/lib/libopencv_perf_highgui_pch_dephelp.a \
$(OPENCV2_BUILD_DIR)/lib/libopencv_perf_highgui_pch_dephelpd.a \
$(OPENCV2_BUILD_DIR)/lib/libopencv_perf_imgproc_pch_dephelp.a \
$(OPENCV2_BUILD_DIR)/lib/libopencv_perf_imgproc_pch_dephelpd.a \
$(OPENCV2_BUILD_DIR)/lib/libopencv_perf_nonfree_pch_dephelp.a \
$(OPENCV2_BUILD_DIR)/lib/libopencv_perf_objdetect_pch_dephelp.a \
$(OPENCV2_BUILD_DIR)/lib/libopencv_perf_objdetect_pch_dephelpd.a \
$(OPENCV2_BUILD_DIR)/lib/libopencv_perf_ocl_pch_dephelp.a \
$(OPENCV2_BUILD_DIR)/lib/libopencv_perf_photo_pch_dephelp.a \
$(OPENCV2_BUILD_DIR)/lib/libopencv_perf_photo_pch_dephelpd.a \
$(OPENCV2_BUILD_DIR)/lib/libopencv_perf_stitching_pch_dephelp.a \
$(OPENCV2_BUILD_DIR)/lib/libopencv_perf_superres_pch_dephelp.a \
$(OPENCV2_BUILD_DIR)/lib/libopencv_perf_video_pch_dephelp.a \
$(OPENCV2_BUILD_DIR)/lib/libopencv_perf_video_pch_dephelpd.a \
$(OPENCV2_BUILD_DIR)/lib/libopencv_photo248.dll.a \
$(OPENCV2_BUILD_DIR)/lib/libopencv_photo248d.dll.a \
$(OPENCV2_BUILD_DIR)/lib/libopencv_photo_pch_dephelp.a \
$(OPENCV2_BUILD_DIR)/lib/libopencv_photo_pch_dephelpd.a \
$(OPENCV2_BUILD_DIR)/lib/libopencv_stitching248.dll.a \
$(OPENCV2_BUILD_DIR)/lib/libopencv_stitching_pch_dephelp.a \
$(OPENCV2_BUILD_DIR)/lib/libopencv_superres248.dll.a \
$(OPENCV2_BUILD_DIR)/lib/libopencv_superres_pch_dephelp.a \
$(OPENCV2_BUILD_DIR)/lib/libopencv_test_calib3d_pch_dephelp.a \
$(OPENCV2_BUILD_DIR)/lib/libopencv_test_calib3d_pch_dephelpd.a \
$(OPENCV2_BUILD_DIR)/lib/libopencv_test_contrib_pch_dephelp.a \
$(OPENCV2_BUILD_DIR)/lib/libopencv_test_core_pch_dephelp.a \
$(OPENCV2_BUILD_DIR)/lib/libopencv_test_core_pch_dephelpd.a \
$(OPENCV2_BUILD_DIR)/lib/libopencv_test_features2d_pch_dephelp.a \
$(OPENCV2_BUILD_DIR)/lib/libopencv_test_features2d_pch_dephelpd.a \
$(OPENCV2_BUILD_DIR)/lib/libopencv_test_flann_pch_dephelp.a \
$(OPENCV2_BUILD_DIR)/lib/libopencv_test_flann_pch_dephelpd.a \
$(OPENCV2_BUILD_DIR)/lib/libopencv_test_gpu_pch_dephelp.a \
$(OPENCV2_BUILD_DIR)/lib/libopencv_test_highgui_pch_dephelp.a \
$(OPENCV2_BUILD_DIR)/lib/libopencv_test_highgui_pch_dephelpd.a \
$(OPENCV2_BUILD_DIR)/lib/libopencv_test_imgproc_pch_dephelp.a \
$(OPENCV2_BUILD_DIR)/lib/libopencv_test_imgproc_pch_dephelpd.a \
$(OPENCV2_BUILD_DIR)/lib/libopencv_test_legacy_pch_dephelp.a \
$(OPENCV2_BUILD_DIR)/lib/libopencv_test_legacy_pch_dephelpd.a \
$(OPENCV2_BUILD_DIR)/lib/libopencv_test_ml_pch_dephelp.a \
$(OPENCV2_BUILD_DIR)/lib/libopencv_test_ml_pch_dephelpd.a \
$(OPENCV2_BUILD_DIR)/lib/libopencv_test_nonfree_pch_dephelp.a \
$(OPENCV2_BUILD_DIR)/lib/libopencv_test_objdetect_pch_dephelp.a \
$(OPENCV2_BUILD_DIR)/lib/libopencv_test_objdetect_pch_dephelpd.a \
$(OPENCV2_BUILD_DIR)/lib/libopencv_test_ocl_pch_dephelp.a \
$(OPENCV2_BUILD_DIR)/lib/libopencv_test_photo_pch_dephelp.a \
$(OPENCV2_BUILD_DIR)/lib/libopencv_test_photo_pch_dephelpd.a \
$(OPENCV2_BUILD_DIR)/lib/libopencv_test_stitching_pch_dephelp.a \
$(OPENCV2_BUILD_DIR)/lib/libopencv_test_superres_pch_dephelp.a \
$(OPENCV2_BUILD_DIR)/lib/libopencv_test_video_pch_dephelp.a \
$(OPENCV2_BUILD_DIR)/lib/libopencv_test_video_pch_dephelpd.a \
$(OPENCV2_BUILD_DIR)/lib/libopencv_ts248.a \
$(OPENCV2_BUILD_DIR)/lib/libopencv_ts248d.a \
$(OPENCV2_BUILD_DIR)/lib/libopencv_ts_pch_dephelp.a \
$(OPENCV2_BUILD_DIR)/lib/libopencv_ts_pch_dephelpd.a \
$(OPENCV2_BUILD_DIR)/lib/libopencv_video248.dll.a \
$(OPENCV2_BUILD_DIR)/lib/libopencv_video248d.dll.a \
$(OPENCV2_BUILD_DIR)/lib/libopencv_video_pch_dephelp.a \
$(OPENCV2_BUILD_DIR)/lib/libopencv_video_pch_dephelpd.a \
$(OPENCV2_BUILD_DIR)/lib/libopencv_videostab248.dll.a \
$(OPENCV2_BUILD_DIR)/lib/libopencv_videostab_pch_dephelp.a \
$(OPENCV2_BUILD_DIR)/3rdparty/lib/libIlmImf.a \
$(OPENCV2_BUILD_DIR)/3rdparty/lib/libIlmImfd.a \
$(OPENCV2_BUILD_DIR)/3rdparty/lib/liblibjasper.a \
$(OPENCV2_BUILD_DIR)/3rdparty/lib/liblibjasperd.a \
$(OPENCV2_BUILD_DIR)/3rdparty/lib/liblibjpeg.a \
$(OPENCV2_BUILD_DIR)/3rdparty/lib/liblibjpegd.a \
$(OPENCV2_BUILD_DIR)/3rdparty/lib/liblibpng.a \
$(OPENCV2_BUILD_DIR)/3rdparty/lib/liblibpngd.a \
$(OPENCV2_BUILD_DIR)/3rdparty/lib/liblibtiff.a \
$(OPENCV2_BUILD_DIR)/3rdparty/lib/liblibtiffd.a \
$(OPENCV2_BUILD_DIR)/3rdparty/lib/libzlib.a \
$(OPENCV2_BUILD_DIR)/3rdparty/lib/libzlibd.a


#OpenCV library commands
Expand Down
1 change: 1 addition & 0 deletions mingw-w64-toolchain.cmake
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
set(CMAKE_SYSTEM_NAME Windows)
set(CMAKE_RC_COMPILER C:/mingw64/bin/windres.exe)
set(CMAKE_AR C:/mingw64/bin/ar.exe)
set(CMAKE_LINKER C:/mingw64/x86_64-w64-mingw32/bin/ld.exe)
set(CMAKE_MAKE_PROGRAM C:/mingw64/bin/mingw32-make.exe)
#set(_CMAKE_TOOLCHAIN_PREFIX x86_64-w64-mingw32-)
set(CMAKE_C_COMPILER C:/mingw64/bin/x86_64-w64-mingw32-gcc.exe)
Expand Down

0 comments on commit 270c4a3

Please sign in to comment.