Skip to content

Commit

Permalink
Merge branch 'devel-branch'
Browse files Browse the repository at this point in the history
  • Loading branch information
Helios-vmg committed Jun 13, 2016
2 parents 9d668ce + 37efd28 commit 15cbcd2
Show file tree
Hide file tree
Showing 120 changed files with 6,988 additions and 2,064 deletions.
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,9 @@ _ReSharper*/
*.sdf
bin64/
Borderless/GeneratedFiles/
*.opendb
*.ipch
*.generated.*
LLVM/
Installer/custom/lib/
Installer/custom/redist/*
8 changes: 8 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
[submodule "serialization"]
path = serialization
url = https://github.com/Helios-vmg/cppserialization.git
branch = master
[submodule "luajit-2.0"]
path = luajit-2.0
url = http://luajit.org/git/luajit-2.0.git
branch = master
96 changes: 96 additions & 0 deletions Borderless.pro
Original file line number Diff line number Diff line change
@@ -0,0 +1,96 @@
#-------------------------------------------------
#
# Project created by QtCreator 2016-05-27T04:24:14
#
#-------------------------------------------------

# Find Boost library.

# Try to use qmake variable's value.
_BOOST_ROOT = $$BOOST_ROOT
isEmpty(_BOOST_ROOT) {
message(\"Boost Library\" qmake value not detected...)

# Try to use the system environment value.
_BOOST_ROOT = $$(BOOST_ROOT)
}

isEmpty(_BOOST_ROOT) {
message(\"Boost Library\" environment variable not detected...)
} else {
message(\"Boost Library\" detected in BOOST_ROOT = \"$$_BOOST_ROOT\")
INCLUDEPATH += $$_BOOST_ROOT
}

QT += core gui network widgets

TARGET = Borderless
QMAKE_EXTRA_TARGETS += SerializationCode
TEMPLATE = app
QMAKE_CXXFLAGS += -std=c++11
INCLUDEPATH += $$PWD/serialization/postsrc $$PWD/src

SOURCES += src/ClangErrorMessage.cpp \
src/DirectoryListing.cpp \
src/ImageViewerApplication.cpp \
src/ImageViewport.cpp \
src/LoadedImage.cpp \
src/main.cpp \
src/MainWindow.cpp \
src/MainWindowMovement.cpp \
src/MainWindowSettings.cpp \
src/MainWindowShortcuts.cpp \
src/OptionsDialog.cpp \
src/RotateDialog.cpp \
src/Shortcuts.cpp \
src/SingleInstanceApplication.cpp \
src/ZoomModeDropDown.cpp \
src/plugin-core/capi.cpp \
src/plugin-core/ImageStore.cpp \
src/plugin-core/PluginCoreState.cpp \
src/serialization/Implementations.cpp \
src/serialization/Inlining.cpp \
src/serialization/MainSettings.cpp \
src/serialization/ShortcutsSettings.cpp \
src/serialization/WindowState.cpp

HEADERS += src/ClangErrorMessage.hpp \
src/DirectoryListing.h \
src/Enums.h \
src/GenericException.h \
src/ImageViewerApplication.h \
src/ImageViewport.h \
src/LoadedImage.h \
src/MainWindow.h \
src/Misc.h \
src/OptionsDialog.h \
src/Quadrangular.h \
src/resource.h \
src/RotateDialog.h \
src/ShortcutInfo.h \
src/Shortcuts.h \
src/SingleInstanceApplication.h \
src/stdafx.h \
src/StreamRedirector.h \
src/ZoomModeDropDown.h \
src/plugin-core/capi.h \
src/plugin-core/ImageStore.h \
src/plugin-core/PluginCoreState.h \
src/plugin-core/Cpp/main.h \
src/plugin-core/Lua/main.h

FORMS += src/ClangErrorMessage.ui \
src/InfoDialog.ui \
src/MainWindow.ui \
src/OptionsDialog.ui \
src/RotateDialog.ui

RESOURCES += src/resources.qrc

LASC.target = $$PWD/LAS
#LASC.depends = FORCE
LASC.commands = chmod +x build_las.sh; ./build_las.sh

SerializationCode.target = $$PWD/src/serialization/settings.generated.cpp
SerializationCode.depends = LASC $$PWD/src/serialization/settings.txt
SerializationCode.commands = chmod +x build_serialization.sh; ./build_serialization.sh
95 changes: 93 additions & 2 deletions Borderless.sln
Original file line number Diff line number Diff line change
@@ -1,9 +1,33 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
VisualStudioVersion = 12.0.31101.0
# Visual Studio 14
VisualStudioVersion = 14.0.25123.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Borderless", "Borderless\Borderless.vcxproj", "{B12702AD-ABFB-343A-A199-8E24837244A3}"
ProjectSection(ProjectDependencies) = postProject
{27EE8D4B-AD52-4888-A793-21C589739AB7} = {27EE8D4B-AD52-4888-A793-21C589739AB7}
{886936B8-F314-4A7A-915A-C1138AF46B83} = {886936B8-F314-4A7A-915A-C1138AF46B83}
{80D643C5-A28D-441E-9404-8ADF6FAF7FBF} = {80D643C5-A28D-441E-9404-8ADF6FAF7FBF}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LAS", "serialization\LAS\LAS.vcxproj", "{886936B8-F314-4A7A-915A-C1138AF46B83}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "luajit", "luajit\luajit.vcxproj", "{068B1B0F-54A0-4818-926F-B35A72F71BDE}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Lua", "Lua", "{D79D789A-1522-4F52-B3BF-6EAFE1599CEC}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LuaInterpreter", "LuaInterpreter\LuaInterpreter.vcxproj", "{27EE8D4B-AD52-4888-A793-21C589739AB7}"
ProjectSection(ProjectDependencies) = postProject
{068B1B0F-54A0-4818-926F-B35A72F71BDE} = {068B1B0F-54A0-4818-926F-B35A72F71BDE}
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Interpreters", "Interpreters", "{7AE2B9D8-5D7F-48C6-9A30-1A68BB46C581}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Cpp", "Cpp", "{AD2FEDF6-80CE-4BFA-8FDB-89DCE507826A}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CppInterpreter", "CppInterpreter\CppInterpreter.vcxproj", "{80D643C5-A28D-441E-9404-8ADF6FAF7FBF}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StdOutputRedirect", "StdOutputRedirect\StdOutputRedirect.vcxproj", "{FBC0C925-BDA0-496C-B897-DC7947573F8F}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand All @@ -27,8 +51,75 @@ Global
{B12702AD-ABFB-343A-A199-8E24837244A3}.Release|Win32.Build.0 = Release|Win32
{B12702AD-ABFB-343A-A199-8E24837244A3}.Release|x64.ActiveCfg = Release|x64
{B12702AD-ABFB-343A-A199-8E24837244A3}.Release|x64.Build.0 = Release|x64
{886936B8-F314-4A7A-915A-C1138AF46B83}.Debug|Win32.ActiveCfg = Release|Win32
{886936B8-F314-4A7A-915A-C1138AF46B83}.Debug|Win32.Build.0 = Release|Win32
{886936B8-F314-4A7A-915A-C1138AF46B83}.Debug|x64.ActiveCfg = Release|Win32
{886936B8-F314-4A7A-915A-C1138AF46B83}.Debug|x64.Build.0 = Release|Win32
{886936B8-F314-4A7A-915A-C1138AF46B83}.DebugRelease|Win32.ActiveCfg = Release|Win32
{886936B8-F314-4A7A-915A-C1138AF46B83}.DebugRelease|Win32.Build.0 = Release|Win32
{886936B8-F314-4A7A-915A-C1138AF46B83}.DebugRelease|x64.ActiveCfg = Release|Win32
{886936B8-F314-4A7A-915A-C1138AF46B83}.DebugRelease|x64.Build.0 = Release|Win32
{886936B8-F314-4A7A-915A-C1138AF46B83}.Release|Win32.ActiveCfg = Release|Win32
{886936B8-F314-4A7A-915A-C1138AF46B83}.Release|Win32.Build.0 = Release|Win32
{886936B8-F314-4A7A-915A-C1138AF46B83}.Release|x64.ActiveCfg = Release|Win32
{886936B8-F314-4A7A-915A-C1138AF46B83}.Release|x64.Build.0 = Release|Win32
{068B1B0F-54A0-4818-926F-B35A72F71BDE}.Debug|Win32.ActiveCfg = Debug|Win32
{068B1B0F-54A0-4818-926F-B35A72F71BDE}.Debug|Win32.Build.0 = Debug|Win32
{068B1B0F-54A0-4818-926F-B35A72F71BDE}.Debug|x64.ActiveCfg = Debug|x64
{068B1B0F-54A0-4818-926F-B35A72F71BDE}.Debug|x64.Build.0 = Debug|x64
{068B1B0F-54A0-4818-926F-B35A72F71BDE}.DebugRelease|Win32.ActiveCfg = Release|Win32
{068B1B0F-54A0-4818-926F-B35A72F71BDE}.DebugRelease|Win32.Build.0 = Release|Win32
{068B1B0F-54A0-4818-926F-B35A72F71BDE}.DebugRelease|x64.ActiveCfg = Release|x64
{068B1B0F-54A0-4818-926F-B35A72F71BDE}.DebugRelease|x64.Build.0 = Release|x64
{068B1B0F-54A0-4818-926F-B35A72F71BDE}.Release|Win32.ActiveCfg = Release|Win32
{068B1B0F-54A0-4818-926F-B35A72F71BDE}.Release|Win32.Build.0 = Release|Win32
{068B1B0F-54A0-4818-926F-B35A72F71BDE}.Release|x64.ActiveCfg = Release|x64
{068B1B0F-54A0-4818-926F-B35A72F71BDE}.Release|x64.Build.0 = Release|x64
{27EE8D4B-AD52-4888-A793-21C589739AB7}.Debug|Win32.ActiveCfg = Debug|Win32
{27EE8D4B-AD52-4888-A793-21C589739AB7}.Debug|Win32.Build.0 = Debug|Win32
{27EE8D4B-AD52-4888-A793-21C589739AB7}.Debug|x64.ActiveCfg = Debug|x64
{27EE8D4B-AD52-4888-A793-21C589739AB7}.Debug|x64.Build.0 = Debug|x64
{27EE8D4B-AD52-4888-A793-21C589739AB7}.DebugRelease|Win32.ActiveCfg = Release|Win32
{27EE8D4B-AD52-4888-A793-21C589739AB7}.DebugRelease|Win32.Build.0 = Release|Win32
{27EE8D4B-AD52-4888-A793-21C589739AB7}.DebugRelease|x64.ActiveCfg = Release|x64
{27EE8D4B-AD52-4888-A793-21C589739AB7}.DebugRelease|x64.Build.0 = Release|x64
{27EE8D4B-AD52-4888-A793-21C589739AB7}.Release|Win32.ActiveCfg = Release|Win32
{27EE8D4B-AD52-4888-A793-21C589739AB7}.Release|Win32.Build.0 = Release|Win32
{27EE8D4B-AD52-4888-A793-21C589739AB7}.Release|x64.ActiveCfg = Release|x64
{27EE8D4B-AD52-4888-A793-21C589739AB7}.Release|x64.Build.0 = Release|x64
{80D643C5-A28D-441E-9404-8ADF6FAF7FBF}.Debug|Win32.ActiveCfg = Debug|Win32
{80D643C5-A28D-441E-9404-8ADF6FAF7FBF}.Debug|Win32.Build.0 = Debug|Win32
{80D643C5-A28D-441E-9404-8ADF6FAF7FBF}.Debug|x64.ActiveCfg = Debug|x64
{80D643C5-A28D-441E-9404-8ADF6FAF7FBF}.Debug|x64.Build.0 = Debug|x64
{80D643C5-A28D-441E-9404-8ADF6FAF7FBF}.DebugRelease|Win32.ActiveCfg = Release|Win32
{80D643C5-A28D-441E-9404-8ADF6FAF7FBF}.DebugRelease|Win32.Build.0 = Release|Win32
{80D643C5-A28D-441E-9404-8ADF6FAF7FBF}.DebugRelease|x64.ActiveCfg = Release|x64
{80D643C5-A28D-441E-9404-8ADF6FAF7FBF}.DebugRelease|x64.Build.0 = Release|x64
{80D643C5-A28D-441E-9404-8ADF6FAF7FBF}.Release|Win32.ActiveCfg = Release|Win32
{80D643C5-A28D-441E-9404-8ADF6FAF7FBF}.Release|Win32.Build.0 = Release|Win32
{80D643C5-A28D-441E-9404-8ADF6FAF7FBF}.Release|x64.ActiveCfg = Release|x64
{80D643C5-A28D-441E-9404-8ADF6FAF7FBF}.Release|x64.Build.0 = Release|x64
{FBC0C925-BDA0-496C-B897-DC7947573F8F}.Debug|Win32.ActiveCfg = Debug|Win32
{FBC0C925-BDA0-496C-B897-DC7947573F8F}.Debug|Win32.Build.0 = Debug|Win32
{FBC0C925-BDA0-496C-B897-DC7947573F8F}.Debug|x64.ActiveCfg = Debug|x64
{FBC0C925-BDA0-496C-B897-DC7947573F8F}.Debug|x64.Build.0 = Debug|x64
{FBC0C925-BDA0-496C-B897-DC7947573F8F}.DebugRelease|Win32.ActiveCfg = Release|Win32
{FBC0C925-BDA0-496C-B897-DC7947573F8F}.DebugRelease|Win32.Build.0 = Release|Win32
{FBC0C925-BDA0-496C-B897-DC7947573F8F}.DebugRelease|x64.ActiveCfg = Release|x64
{FBC0C925-BDA0-496C-B897-DC7947573F8F}.DebugRelease|x64.Build.0 = Release|x64
{FBC0C925-BDA0-496C-B897-DC7947573F8F}.Release|Win32.ActiveCfg = Release|Win32
{FBC0C925-BDA0-496C-B897-DC7947573F8F}.Release|Win32.Build.0 = Release|Win32
{FBC0C925-BDA0-496C-B897-DC7947573F8F}.Release|x64.ActiveCfg = Release|x64
{FBC0C925-BDA0-496C-B897-DC7947573F8F}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{068B1B0F-54A0-4818-926F-B35A72F71BDE} = {D79D789A-1522-4F52-B3BF-6EAFE1599CEC}
{D79D789A-1522-4F52-B3BF-6EAFE1599CEC} = {7AE2B9D8-5D7F-48C6-9A30-1A68BB46C581}
{27EE8D4B-AD52-4888-A793-21C589739AB7} = {D79D789A-1522-4F52-B3BF-6EAFE1599CEC}
{AD2FEDF6-80CE-4BFA-8FDB-89DCE507826A} = {7AE2B9D8-5D7F-48C6-9A30-1A68BB46C581}
{80D643C5-A28D-441E-9404-8ADF6FAF7FBF} = {AD2FEDF6-80CE-4BFA-8FDB-89DCE507826A}
EndGlobalSection
EndGlobal
Loading

0 comments on commit 15cbcd2

Please sign in to comment.