diff --git a/.gitignore b/.gitignore index 0084b2a..152f41e 100644 --- a/.gitignore +++ b/.gitignore @@ -2,5 +2,6 @@ *.a *.dll *.deb +*.exe build/ diff --git a/Makefile b/Makefile index cc3a134..8b5e76f 100644 --- a/Makefile +++ b/Makefile @@ -32,7 +32,7 @@ $(PACKAGE_DIR): mkdir -p $(PACKAGE_TOOLCHAIN_PATH)/lib GeneratePackage-linux: ./package $(PACKAGE_DIR) - cp -R ./package $(PACKAGE_DIR) + cp -R ./package/* $(PACKAGE_DIR) mkdir -p $(PACKAGE_DOC_DIR) cp -f Readme.md $(PACKAGE_DOC_DIR) cp -f LICENSE $(PACKAGE_DOC_DIR)/copyright @@ -40,9 +40,9 @@ GeneratePackage-linux: ./package $(PACKAGE_DIR) GeneratePackage-exe: $(PACKAGE_DIR) -BuildLua: $(PACKAGE_TOOLCHAIN_PATH)/lib Lua/src/liblua$(LUA_VER).dll.a Lua/src/liblua$(LUA_VER).a - -MoveLuaLibs: Lua/src/liblua$(LUA_VER).dll.a Lua/src/liblua$(LUA_VER).a +BuildLua: Lua/src/liblua$(LUA_VER).dll.a Lua/src/liblua$(LUA_VER).a + +MoveLuaLibs: BuildLua $(PACKAGE_TOOLCHAIN_PATH)/lib cp -f Lua/src/liblua$(LUA_VER).dll.a $(PACKAGE_TOOLCHAIN_PATH)/lib cp -f Lua/src/liblua$(LUA_VER).a $(PACKAGE_TOOLCHAIN_PATH)/lib @@ -53,7 +53,7 @@ build-deb: change_lua_ver clean-package MoveHeadersToPackage LuaLibs GenerateCon dpkg --build $(PACKAGE_DIR) kos32-liblua$(LUA_VER).deb build-exe-deps: MoveHeadersToPackage LuaLibs installer.iss - iscc /Obuild /DMyAppName=kos32-aboba /DMyAppVersion=$(PACKAGE_VER) installer.iss + iscc /O. /DMyAppName=$(PACKAGE_NAME) /DMyAppVersion=$(PACKAGE_VER) /DPackageName=$(PACKAGE_NAME) installer.iss # build windows installer build-exe: change_lua_ver clean-package @@ -95,8 +95,6 @@ $(PACKAGE_TOOLCHAIN_PATH)/lib: $(PACKAGE_DIR) $(PACKAGE_TOOLCHAIN_PATH)/include/lua$(LUA_VER): $(PACKAGE_DIR) $(PACKAGE_TOOLCHAIN_PATH)/lib/liblua$(LUA_VER).a: MoveLuaLibs $(PACKAGE_TOOLCHAIN_PATH)/lib/liblua$(LUA_VER).dll.a: MoveLuaLibs -Lua/src/liblua$(LUA_VER).dll.a: BuildLua -Lua/src/liblua$(LUA_VER).a: BuildLua Lua/src/liblua$(LUA_VER).dll.a: make -C Lua/src "KOLIBRIOS_REPO=$(KOLIBRIOS_REPO)" shared diff --git a/installer.iss b/installer.iss index c34bb86..692c0e4 100644 --- a/installer.iss +++ b/installer.iss @@ -3,7 +3,6 @@ #define MyAppPublisher "Egor00f" #define MyAppURL "https://git.kolibrios.org/Lua/kos32-liblua" -#define MyAppExeName "MyProg-x64.exe" [Setup] ; NOTE: The value of AppId uniquely identifies this application. Do not use the same AppId value in installers for other applications. @@ -19,21 +18,23 @@ AppUpdatesURL={#MyAppURL} DefaultDirName=C:\MinGW\msys\1.0\home\autobuild\tools\win32\ ; "ArchitecturesAllowed=x64compatible" specifies that Setup cannot run ; on anything but x64 and Windows 11 on Arm. -ArchitecturesAllowed=x64compatible +ArchitecturesAllowed=x86compatible ; "ArchitecturesInstallIn64BitMode=x64compatible" requests that the ; install be done in "64-bit mode" on x64 or Windows 11 on Arm, ; meaning it should use the native 64-bit Program Files directory and ; the 64-bit view of the registry. -ArchitecturesInstallIn64BitMode=x64compatible +ArchitecturesInstallIn64BitMode=x86compatible DisableProgramGroupPage=yes -LicenseFile=C:\Users\yyari\Documents\KolibriOS\kos32-liblua\LICENSE +LicenseFile=.\LICENSE ; Uncomment the following line to run in non administrative install mode (install for current user only.) ;PrivilegesRequired=lowest -OutputDir=C:\Users\yyari\Documents\KolibriOS\kos32-liblua\build -OutputBaseFilename=setup +OutputDir=.\build +OutputBaseFilename={#PackageName} Compression=lzma SolidCompression=yes WizardStyle=modern +DirExistsWarning=no + [Languages] Name: "english"; MessagesFile: "compiler:Default.isl" @@ -65,7 +66,5 @@ Name: "turkish"; MessagesFile: "compiler:Languages\Turkish.isl" Name: "ukrainian"; MessagesFile: "compiler:Languages\Ukrainian.isl" [Files] -Source: "C:\Users\yyari\Documents\KolibriOS\kos32-liblua\build\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs +Source: ".\build\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs ; NOTE: Don't use "Flags: ignoreversion" on any shared system files - -