Skip to content

Commit

Permalink
Merge branch 'msvc2015'
Browse files Browse the repository at this point in the history
# Conflicts:
#	G19s-Imperial-Clock-Installer.exe
  • Loading branch information
nholthaus committed Aug 16, 2016
2 parents 01d3ca7 + 0821f3d commit b409a70
Show file tree
Hide file tree
Showing 7 changed files with 7 additions and 2 deletions.
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
[Bb]uild
[Mm][Ss][Vv][Cc]*


#################
## Eclipse
#################
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ SET(CPACK_RESOURCE_FILE_README "${PROJECT_SOURCE_DIR}/README.txt")
SET(CPACK_PACKAGE_FILE_NAME "G19s-Imperial-Clock-Installer")

set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "LCDImperialClock - a Star Wars themed clock applet for the Logitech G19s Keyboard")
set(CPACK_PACKAGE_VERSION "1.0.0")
set(CPACK_PACKAGE_VERSION "1.0.1")
set(CPACK_PACKAGE_VERSION_MAJOR "1")
set(CPACK_PACKAGE_VERSION_MINOR "0")
set(CPACK_PACKAGE_VERSION_PATCH "0")
Expand Down
Binary file modified G19s-Imperial-Clock-Installer.exe
Binary file not shown.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ To build the software, you'll need
- Qt 5.4 or later (used for image processing/GUI),
- CMAKE to build the makefile/visual studio project, and
- NSIS if you want to build the windows installer package.
- Visual Studio 2010 which is the only version the logitech library supports
- Visual Studio 2015 which is the only version the logitech library supports
As of writing this, the project is only really set up for windows, as I'm pretty
sure the logitech libraries only support windows. If that's not the case, the clock code itself should
be a trivial port since cmake/qt are natively cross-platform.
Expand Down
1 change: 1 addition & 0 deletions imperialClock.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,7 @@ void imperialClock::drawClock()
if (!twentyFourHourTimeCheckBox->isChecked())
{
hour = hour % 12;
if (hour == 0) hour = 12;
}
int minute = now.time().minute();
int second = now.time().second();
Expand Down
Binary file modified lib/LogitechLCDLib.lib
Binary file not shown.
Binary file added lib/LogitechLcd.dll
Binary file not shown.

0 comments on commit b409a70

Please sign in to comment.