fix win64 installer

git-svn-id: file:///raid/svn-main/nishi-dataworks/trunk@417 d4a5a174-5a4a-5b4b-b672-37683c10d7d5

diff --git a/Makefiles/Platforms/win64.mk b/Makefiles/Platforms/win64.mk
index cf194ccdddb8f9320981c48126c6377413cd0223..aabdb9b8749523073de44861a68880bcae515b14 100644 (file)
--- a/Makefiles/Platforms/win64.mk
+++ b/Makefiles/Platforms/win64.mk
@@ -18,3 +18,4 @@ LINK_LIB += dataworks.res
 SERVLINK_LIB += -lws2_32
 RCLILINK_LIB += -lws2_32
 TO = PROGRAMFILES64
+CUSTOM_NSIS = StrCpy \$$InstDir "\$$PROGRAMFILES64\\\DataWorks"

diff --git a/Makefiles/installer.mk b/Makefiles/installer.mk
index f6f3640e86e7c00288746782556a29eb9470e44d..30c10461b13945ea74a37b28611b998b0ddfe5e3 100644 (file)
--- a/Makefiles/installer.mk
+++ b/Makefiles/installer.mk
@@ -94,6 +94,7 @@ dos-installer:
        echo "LangString HEADERS_SET_DESC \$${LANG_JAPANESE} \"ヘッダー\"" >> install.nsi
        echo "Function .onInit" >> install.nsi
        echo "  !insertmacro MUI_LANGDLL_DISPLAY" >> install.nsi
+       echo "  $(CUSTOM_NSIS)" >> install.nsi
        echo "FunctionEnd" >> install.nsi
        echo "Section -Pre" >> install.nsi
        echo "  CreateDirectory \"\$$SMPROGRAMS\\\DataWorks\"" >> install.nsi
@@ -181,4 +182,5 @@ dos-installer:
        echo "  !insertmacro MUI_DESCRIPTION_TEXT \$${HEADERS_SET} \"\$$(HEADERS_SET_DESC)\"" >> install.nsi
        echo "!insertmacro MUI_FUNCTION_DESCRIPTION_END" >> install.nsi
        makensis install.nsi
+       cat install.nsi
        rm install.nsi dataworks.bmp