Skip to content

Commit

Permalink
update cmake
Browse files Browse the repository at this point in the history
  • Loading branch information
dnasdw committed Jul 27, 2018
1 parent 9922950 commit ca418cf
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 6 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
/bin
/build
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ endif()
if(MSVC_VERSION EQUAL 1900 AND MSVC_IDE)
set(CMAKE_GENERATOR_TOOLSET "v140_xp" CACHE STRING "Name of generator toolset." FORCE)
endif()
if(MSVC_VERSION EQUAL 1910 AND MSVC_IDE)
if(MSVC_VERSION GREATER 1909 AND MSVC_VERSION LESS 1920 AND MSVC_IDE)
set(CMAKE_GENERATOR_TOOLSET "v141_xp" CACHE STRING "Name of generator toolset." FORCE)
endif()
if(MSVC_VERSION GREATER 1600 AND NOT MSVC_IDE)
Expand All @@ -24,7 +24,7 @@ if(APPLE)
endif()
set(BFLIMTOOL_MAJOR 1)
set(BFLIMTOOL_MINOR 1)
set(BFLIMTOOL_PATCHLEVEL 0)
set(BFLIMTOOL_PATCHLEVEL 1)
if(NOT MSVC_IDE AND NOT XCODE_VERSION AND NOT CMAKE_BUILD_TYPE)
set(CMAKE_BUILD_TYPE "Release" CACHE STRING "Choose the type of build, options are: None(CMAKE_CXX_FLAGS or CMAKE_C_FLAGS used) Debug Release RelWithDebInfo MinSizeRel." FORCE)
endif()
Expand Down
9 changes: 5 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ A tool for decoding/encoding bflim file.
## History

- v1.1.0 @ 2018.01.04 - A new beginning
- v1.1.1 @ 2018.07.27 - Update cmake

### v1.0

Expand All @@ -29,16 +30,16 @@ A tool for decoding/encoding bflim file.

- make 64-bit version
~~~
mkdir project
cd project
mkdir build
cd build
cmake -DUSE_DEP=OFF ..
make
~~~

- make 32-bit version
~~~
mkdir project
cd project
mkdir build
cd build
cmake -DBUILD64=OFF -DUSE_DEP=OFF ..
make
~~~
Expand Down

0 comments on commit ca418cf

Please sign in to comment.