فهرست منبع

Added icon to Makefile_win32 and installer NSI source code

Artur Efimov 8 سال پیش
والد
کامیت
47ef2d1838
2فایلهای تغییر یافته به همراه12 افزوده شده و 7 حذف شده
  1. 7 6
      src/Installer.nsi
  2. 5 1
      src/Makefile_win32

+ 7 - 6
src/Installer.nsi

@@ -10,11 +10,14 @@
 ; The name of the installer
 Name "FreeOberon"
 
+;!include "MUI.nsh"
+;!define MUI_ICON "FreeOberon\data\images\icon.ico"
+
 ; The file to write
-OutFile "FreeOberon_Setup.exe"
+OutFile "FreeOberon_Setup_v0.1.0.exe"
 
 ; The default installation directory
-InstallDir $PROGRAMFILES\FreeOberon
+InstallDir C:\FreeOberon
 
 ; Registry key to check for directory (so if you install again, it will 
 ; overwrite the old one automatically)
@@ -30,7 +33,6 @@ RequestExecutionLevel admin
 Page components
 Page directory
 Page instfiles
-
 UninstPage uninstConfirm
 UninstPage instfiles
 
@@ -41,11 +43,10 @@ Section "FreeOberon (required)"
 
   SectionIn RO
   
-  ; Set output path to the installation directory.
+  ; Set output path to the installation directory
   SetOutPath $INSTDIR
   
-  ; Put file there
-  ; File "FreeOberon.exe"
+  ; Files to install
   File /r "FreeOberon\*"
   
   ; Write the installation path into the registry

+ 5 - 1
src/Makefile_win32

@@ -9,12 +9,13 @@ $(PROG): $(PROG).sym
 	-o $(PROG).exe $(PROG).o Graph.o SDL2.o \
 	OV.o Editor.o Term.o Terminal.o \
 	EditorText.o Config.o term/term.o \
+	resources.o \
 	-L"..\data\bin\voc\lib" -lvoc-OC \
 	$(SDL2Opts) -lSDL2_image && \
 	mv $(PROG).exe ..
 
 $(PROG).sym: $(PROG).Mod EditorText.sym Terminal.sym OV.sym \
-		Editor.sym Term.sym Graph.sym SDL2.sym
+		Editor.sym Term.sym Graph.sym SDL2.sym resources.o
 	voc -OC -cesF -m $(PROG).Mod
 
 OV.sym: OV.Mod Terminal.sym Graph.sym
@@ -44,6 +45,9 @@ Graph.sym: Graph.Mod SDL2.sym
 SDL2.sym: SDL2.Mod
 	voc -OC -cesF SDL2.Mod
 
+resources.o: resources.rc
+	windres resources.rc resources.o
+
 .PHONY: clean cleanall install
 
 clean: