Check for previous installation

Author: mateoconlechuga

.gitmodules

@@ -1,6 +1,3 @@
-[submodule "src/tools/convtile"]
-	path = tools/convtile
-	url = https://github.com/MattWaltz/convtile
 [submodule "src/tools/convhex"]
 	path = tools/convhex
 	url = https://github.com/MattWaltz/convhex
@@ -9,4 +6,4 @@
 	url = https://github.com/MattWaltz/convpng
 [submodule "tools/spasm-ng"]
 	path = tools/spasm-ng
-	url = https://github.com/jacobly0/spasm-ng
+	url = https://github.com/MattWaltz/spasm-ng.git

installer/EnvVarUpdate.nsh

@@ -24,6 +24,7 @@
  *
  *  http://nsis.sourceforge.net/Environmental_Variables:_append%2C_prepend%2C_and_remove_entries
  *
+ *  Modified for CE C toolchain (Doesn't require uninstall support)
  */
 
 
@@ -32,18 +33,14 @@
 !verbose push
 !verbose 3
 !include "LogicLib.nsh"
-!include "WinMessages.NSH"
+!include "WinMessages.nsh"
 !include "StrFunc.nsh"
 
 ; ---- Fix for conflict if StrFunc.nsh is already includes in main file -----------------------
 !macro _IncludeStrFunction StrFuncName
   !ifndef ${StrFuncName}_INCLUDED
     ${${StrFuncName}}
   !endif
-  !ifndef Un${StrFuncName}_INCLUDED
-    ${Un${StrFuncName}}
-  !endif
-  !define un.${StrFuncName} "${Un${StrFuncName}}"
 !macroend
 
 !insertmacro _IncludeStrFunction StrTok
@@ -60,16 +57,6 @@
   Pop "${ResultVar}"
 !macroend
 !define EnvVarUpdate '!insertmacro "_EnvVarUpdateConstructor"'
- 
-!macro _unEnvVarUpdateConstructor ResultVar EnvVarName Action Regloc PathString
-  Push "${EnvVarName}"
-  Push "${Action}"
-  Push "${RegLoc}"
-  Push "${PathString}"
-    Call un.EnvVarUpdate
-  Pop "${ResultVar}"
-!macroend
-!define un.EnvVarUpdate '!insertmacro "_unEnvVarUpdateConstructor"'
 ; ---------------------------------- Macro Definitions end-------------------------------------
 
 ;----------------------------------- EnvVarUpdate start----------------------------------------
@@ -320,7 +307,6 @@ FunctionEnd
 
 !macroend   ; EnvVarUpdate UN
 !insertmacro EnvVarUpdate ""
-!insertmacro EnvVarUpdate "un."
 ;----------------------------------- EnvVarUpdate end----------------------------------------
 
 !verbose pop

installer/installer.nsi

@@ -51,6 +51,10 @@ Section ""
   ;Add installed folder (DIST_PATH is set from the makefile)
   File /r ${DIST_PATH}\*.*
 
+  ;Check for old path
+  ReadRegStr $R1 ${env_hkcu} "CEDEV"
+  ${EnvVarUpdate} $0 "PATH" "R" "HKLM" "$R1\bin"
+
   ;Add to PATH
   ${EnvVarUpdate} $0 "PATH" "A" "HKLM" "$INSTDIR\bin"
 

makefile

@@ -8,16 +8,18 @@ RELEASE_NAME := CEdev
 ifeq ($(OS),Windows_NT)
 NATIVEPATH = $(subst /,\,$(1))
 WINPATH    = $(NATIVEPATH)
+WINCHKDIR  = if exist $(1)
 RM         = del /f 2>nul
 RMDIR      = rmdir /s /q
 MKDIR      = mkdir
 PREFIX    ?= C:
 INSTALLLOC := $(call NATIVEPATH,$(DESTDIR)$(PREFIX))
 CP         = copy /y
+SPASMFLG   = MINGW_COMPILE=YES
 EXMPL_DIR  = $(call NATIVEPATH,$(INSTALLLOC)/CEdev/examples)
 CP_EXMPLS  = (if not exist "$(EXMPL_DIR)" mkdir $(EXMPL_DIR)) && xcopy /y /s /e $(call NATIVEPATH,$(CURDIR)/examples) $(EXMPL_DIR)
 ARCH       = makensis.exe /DDIST_PATH=$(call NATIVEPATH,$(DESTDIR)$(PREFIX)/CEdev) $(call NATIVEPATH,$(CURDIR)\installer\installer.nsi) && \
-             (if not exist "..\release" mkdir "..\release") && move /y installer\CEdev.exe release
+             (if not exist "release" mkdir "release") && move /y installer\CEdev.exe release\\
 else
 NATIVEPATH = $(subst \,/,$(1))
 WINPATH    = $(shell winepath --windows $(1))
@@ -72,12 +74,15 @@ all: $(SPASM) $(CONVHEX) $(CONVPNG) graphx fileioc keypadc ce std
 # tool rules
 #----------------------------
 $(SPASM) $(CONVHEX) $(CONVPNG):
-	$(MAKE) -C $(dir $@)
+	$(MAKE) -C $(SPASMDIR) $(SPASMFLG)
+	$(MAKE) -C $(CONVHEXDIR)
+	$(MAKE) -C $(CONVPNGDIR)
 
 clean: clean-graphx clean-fileioc clean-keypadc clean-ce clean-std
 	$(MAKE) -C $(SPASMDIR) clean
 	$(MAKE) -C $(CONVHEXDIR) clean
 	$(MAKE) -C $(CONVPNGDIR) clean
+	$(WINCHKDIR) $(RMDIR) release
 #----------------------------
 
 #----------------------------
@@ -127,7 +132,7 @@ clean-keypadc:
 #----------------------------
 
 uninstall:
-	$(RMDIR) $(call NATIVEPATH,$(INSTALLLOC)/CEdev)
+	$(WINCHKDIR) $(RMDIR) $(call NATIVEPATH,$(INSTALLLOC)/CEdev)
 
 install: $(DIRS)
 	$(CP_EXMPLS)