diff --git a/.gitignore b/.gitignore index 4c01a3e..9d2217f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,7 @@ build-ekalappai-Desktop* +build-ekhook-Desktop* ekhook/Debug/* ekhook/Release/* ekhook/ekhook/* -*.user \ No newline at end of file +*.user +ekhook/ekhook.pro.* \ No newline at end of file diff --git a/ekhook/ekhook.pro.user b/ekhook/ekhook.pro.user deleted file mode 100644 index 5e6b591..0000000 --- a/ekhook/ekhook.pro.user +++ /dev/null @@ -1,247 +0,0 @@ - - - - - - ProjectExplorer.Project.ActiveTarget - 0 - - - ProjectExplorer.Project.EditorSettings - - true - false - true - - Cpp - - CppGlobal - - - - QmlJS - - QmlJSGlobal - - - 2 - UTF-8 - false - 4 - false - true - 1 - true - 0 - true - 0 - 8 - true - 1 - true - true - true - false - - - - ProjectExplorer.Project.PluginSettings - - - - ProjectExplorer.Project.Target.0 - - Desktop Qt 5.2.0 MinGW 32bit - Desktop Qt 5.2.0 MinGW 32bit - qt.520.win32_mingw48.essentials_kit - 0 - 0 - 0 - - D:/ekalappai/ekhook/build-ekhook-Desktop_Qt_5_2_0_MinGW_32bit-Debug - - - true - qmake - - QtProjectManager.QMakeBuildStep - false - true - - false - - - true - Make - - Qt4ProjectManager.MakeStep - - false - - - - 2 - Build - - ProjectExplorer.BuildSteps.Build - - - - true - Make - - Qt4ProjectManager.MakeStep - - true - clean - - - 1 - Clean - - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Debug - - Qt4ProjectManager.Qt4BuildConfiguration - 2 - true - - - D:/ekalappai/ekhook/build-ekhook-Desktop_Qt_5_2_0_MinGW_32bit-Release - - - true - qmake - - QtProjectManager.QMakeBuildStep - false - true - - false - - - true - Make - - Qt4ProjectManager.MakeStep - - false - - - - 2 - Build - - ProjectExplorer.BuildSteps.Build - - - - true - Make - - Qt4ProjectManager.MakeStep - - true - clean - - - 1 - Clean - - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Release - - Qt4ProjectManager.Qt4BuildConfiguration - 0 - true - - 2 - - - 0 - Deploy - - ProjectExplorer.BuildSteps.Deploy - - 1 - Deploy locally - - ProjectExplorer.DefaultDeployConfiguration - - 1 - - - - false - false - false - false - true - 0.01 - 10 - true - 1 - 25 - - 1 - true - false - true - valgrind - - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 - 12 - 13 - 14 - - 2 - - - - false - %{buildDir} - Custom Executable - - ProjectExplorer.CustomExecutableRunConfiguration - 3768 - true - false - false - false - true - - 1 - - - - ProjectExplorer.Project.TargetCount - 1 - - - ProjectExplorer.Project.Updater.EnvironmentId - {a9343f4c-2a4a-42d6-9030-856d14957145} - - - ProjectExplorer.Project.Updater.FileVersion - 15 - - diff --git a/installer/app/Qt5Core.dll b/installer/app/Qt5Core.dll new file mode 100644 index 0000000..c69c72a Binary files /dev/null and b/installer/app/Qt5Core.dll differ diff --git a/installer/app/Qt5Gui.dll b/installer/app/Qt5Gui.dll new file mode 100644 index 0000000..037034d Binary files /dev/null and b/installer/app/Qt5Gui.dll differ diff --git a/installer/app/Qt5Widgets.dll b/installer/app/Qt5Widgets.dll new file mode 100644 index 0000000..7fbc6da Binary files /dev/null and b/installer/app/Qt5Widgets.dll differ diff --git a/installer/app/QtCore4.dll b/installer/app/QtCore4.dll deleted file mode 100644 index f571b9a..0000000 Binary files a/installer/app/QtCore4.dll and /dev/null differ diff --git a/installer/app/QtGui4.dll b/installer/app/QtGui4.dll deleted file mode 100644 index c4f0fd8..0000000 Binary files a/installer/app/QtGui4.dll and /dev/null differ diff --git a/installer/app/ekalappai.exe b/installer/app/ekalappai.exe index 57dbacc..6bc97a6 100644 Binary files a/installer/app/ekalappai.exe and b/installer/app/ekalappai.exe differ diff --git a/installer/app/ekhook.dll b/installer/app/ekhook.dll index 5568503..8a36e39 100644 Binary files a/installer/app/ekhook.dll and b/installer/app/ekhook.dll differ diff --git a/installer/app/icudt51.dll b/installer/app/icudt51.dll new file mode 100644 index 0000000..01c50be Binary files /dev/null and b/installer/app/icudt51.dll differ diff --git a/installer/app/icuin51.dll b/installer/app/icuin51.dll new file mode 100644 index 0000000..7e199ec Binary files /dev/null and b/installer/app/icuin51.dll differ diff --git a/installer/app/icuuc51.dll b/installer/app/icuuc51.dll new file mode 100644 index 0000000..089ec7d Binary files /dev/null and b/installer/app/icuuc51.dll differ diff --git a/installer/app/libgcc_s_dw2-1.dll b/installer/app/libgcc_s_dw2-1.dll new file mode 100644 index 0000000..82b2776 Binary files /dev/null and b/installer/app/libgcc_s_dw2-1.dll differ diff --git a/installer/app/libstdc++-6.dll b/installer/app/libstdc++-6.dll new file mode 100644 index 0000000..fcce1f6 Binary files /dev/null and b/installer/app/libstdc++-6.dll differ diff --git a/installer/app/libwinpthread-1.dll b/installer/app/libwinpthread-1.dll new file mode 100644 index 0000000..22fa839 Binary files /dev/null and b/installer/app/libwinpthread-1.dll differ diff --git a/installer/ekalappai-installer-script.nsi b/installer/ekalappai-installer-script.nsi index 67f6e84..b9ba102 100644 --- a/installer/ekalappai-installer-script.nsi +++ b/installer/ekalappai-installer-script.nsi @@ -36,8 +36,15 @@ SetOutPath "$INSTDIR" #Installed files list File "app\ekalappai.exe" File "app\ekhook.dll" -File "app\QtCore4.dll" -File "app\QtGui4.dll" +File "app\icudt51.dll" +File "app\icuin51.dll" +File "app\icuuc51.dll" +File "app\libgcc_s_dw2-1.dll" +File "app\libstdc++-6.dll" +File "app\libwinpthread-1.dll" +File "app\Qt5Core.dll" +File "app\Qt5Gui.dll" +File "app\Qt5Widgets.dll" File "app\eksettings.ini" SetOutPath "$INSTDIR\keyboards" @@ -85,8 +92,7 @@ SetShellVarContext all Delete "$INSTDIR\ekuninstall.exe" Delete "$INSTDIR\ekalappai.exe" Delete "$INSTDIR\ekhook.dll" -Delete "$INSTDIR\QtCore4.dll" -Delete "$INSTDIR\QtGui4.dll" +Delete "$INSTDIR\*.dll" Delete "$INSTDIR\install.log" Delete "$INSTDIR\eksettings.ini" Delete "$INSTDIR\keyboards\*.in"