commit bc0207f978bee5c2cc4a35973e7beabdd03b4509
parent 8cbfa235d11e057d1a0c46914a9503167bb59f06
Author: Michael Savage <mikejsavage@gmail.com>
Date: Wed, 26 Jun 2019 20:10:57 +0300
Add icon
Diffstat:
5 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/icon.ico b/icon.ico
Binary files differ.
diff --git a/make.lua b/make.lua
@@ -12,6 +12,7 @@ if OS == "windows" then
libs = { "lua", "lpeg", "lfs" }
end
-bin( "mudgangster", { platform_objs, "src/ui", "src/script", "src/textbox", "src/input", "src/platform_network" }, libs )
+bin( "mudgangster", { platform_objs, "src/ui", "src/script", "src/textbox", "src/input", "src/platform_network", "src/rc" }, libs )
+rc( "src/rc" )
msvc_bin_ldflags( "mudgangster", "gdi32.lib Ws2_32.lib" )
gcc_bin_ldflags( "mudgangster", "-lm -lX11 -llua" )
diff --git a/scripts/example_scripts.nsi b/scripts/example_scripts.nsi
@@ -0,0 +1,16 @@
+!include "MUI2.nsh"
+
+Name "Mud Gangster Example Scripts"
+Outfile "MudGangsterExampleScriptsInstaller.exe"
+
+InstallDir "$APPDATA\Mud Gangster\scripts"
+RequestExecutionLevel admin
+
+!insertmacro MUI_PAGE_DIRECTORY
+!insertmacro MUI_PAGE_INSTFILES
+
+Section "Install" SectionInstall
+ # Install stuff
+ SetOutPath $INSTDIR
+ FILE /r ..\example_scripts\*
+SectionEnd
diff --git a/scripts/gen_makefile.lua b/scripts/gen_makefile.lua
@@ -197,7 +197,7 @@ end
function rc( rc_name )
if OS == "windows" then
- printf( "%s/%s%s: %s.rc %s.xml", dir, rc_name, obj_suffix, rc_name, rc_name )
+ printf( "%s/%s%s: %s.rc", dir, rc_name, obj_suffix, rc_name, rc_name )
printf( "\t@printf \"\\033[1;33mbuilding $@\\033[0m\\n\"" )
printf( "\t@mkdir -p \"$(@D)\"" )
printf( "\t@rc.exe /fo$@ /nologo $<" )
diff --git a/src/rc.rc b/src/rc.rc
@@ -0,0 +1 @@
+1000 ICON DISCARDABLE "..\icon.ico"