From 7e0bd245f87e7a3e4dd73ee7920dbaa2d89317bb Mon Sep 17 00:00:00 2001
From: borutr <borutr@4a8a32a2-be11-0410-ad9d-d568d2c75423>
Date: Mon, 4 Sep 2006 19:49:53 +0000
Subject: [PATCH] * support/scripts/sdcc.nsi: move ucSim executables to a
 separate section * support/scripts/sdcc_cygwin_mingw32: don't disable ucsim, 
  -mno-cygwin is a part of the compiler name * support/scripts/sdcc_mingw32:
 don't disable ucsim

git-svn-id: https://sdcc.svn.sourceforge.net/svnroot/sdcc/trunk/sdcc@4357 4a8a32a2-be11-0410-ad9d-d568d2c75423
---
 ChangeLog                           |  7 +++++++
 support/scripts/sdcc.nsi            | 29 +++++++++++++++++++++++++----
 support/scripts/sdcc_cygwin_mingw32 |  5 ++---
 support/scripts/sdcc_mingw32        |  1 -
 4 files changed, 34 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index fb4b13dc..a8152337 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-09-04 Borut Razem <borut.razem AT siol.net>
+
+	* support/scripts/sdcc.nsi: move ucSim executables to a separate section
+	* support/scripts/sdcc_cygwin_mingw32: don't disable ucsim,
+	  -mno-cygwin is a part of the compiler name
+	* support/scripts/sdcc_mingw32: don't disable ucsim
+
 2006-09-03 Borut Razem <borut.razem AT siol.net>
 
 	* sdcc.spec: corrected for 2.6.0. Thanks to Christer Weinigel.
diff --git a/support/scripts/sdcc.nsi b/support/scripts/sdcc.nsi
index d9bf571e..0cf7c9fa 100644
--- a/support/scripts/sdcc.nsi
+++ b/support/scripts/sdcc.nsi
@@ -60,9 +60,9 @@ SetCompressor /SOLID lzma
 !system "unix2dos ${SDCC_ROOT}\doc\ChangeLog_head.txt" = 0
 !system "unix2dos ${SDCC_ROOT}\doc\README.TXT" = 0
 
-InstType "Full (Bin, Doc, Lib, Src)"
-InstType "Medium (Bin, Doc, Lib)"
-InstType "Compact (Bin, Doc)"
+InstType "Full (Bin, ucSim, Doc, Lib, Src)"
+InstType "Medium (Bin, ucSim, Doc, Lib)"
+InstType "Compact (Bin, ucSim, Doc)"
 
 ;--------------------------------
 ;Variables
@@ -140,7 +140,28 @@ SectionEnd
 Section "SDCC application files"
   SectionIn 1 2 3 RO
   SetOutPath "$INSTDIR\bin"
-  File "${SDCC_ROOT}\bin\*.exe"
+  File "${SDCC_ROOT}\bin\as-gbz80.exe"
+  File "${SDCC_ROOT}\bin\as-hc08.exe"
+  File "${SDCC_ROOT}\bin\as-z80.exe"
+  File "${SDCC_ROOT}\bin\asx8051.exe"
+  File "${SDCC_ROOT}\bin\aslink.exe"
+  File "${SDCC_ROOT}\bin\link-gbz80.exe"
+  File "${SDCC_ROOT}\bin\link-hc08.exe"
+  File "${SDCC_ROOT}\bin\link-z80.exe"
+  File "${SDCC_ROOT}\bin\makebin.exe"
+  File "${SDCC_ROOT}\bin\packihx.exe"
+  File "${SDCC_ROOT}\bin\sdcc.exe
+  File "${SDCC_ROOT}\bin\sdcclib.exe
+  File "${SDCC_ROOT}\bin\sdcpp.exe
+SectionEnd
+
+Section "ucSim application files"
+  SectionIn 1 2 3
+  SetOutPath "$INSTDIR\bin"
+  File "${SDCC_ROOT}\bin\s51.exe"
+  File "${SDCC_ROOT}\bin\savr.exe"
+  File "${SDCC_ROOT}\bin\shc08.exe"
+  File "${SDCC_ROOT}\bin\sz80.exe"
 SectionEnd
 
 Section "SDCC documentation"
diff --git a/support/scripts/sdcc_cygwin_mingw32 b/support/scripts/sdcc_cygwin_mingw32
index 28fbc31d..2c9dd210 100755
--- a/support/scripts/sdcc_cygwin_mingw32
+++ b/support/scripts/sdcc_cygwin_mingw32
@@ -2,14 +2,13 @@
 # Script to "cross" compile with mingw32 under Cygwin
 
 ./configure -C \
-CFLAGS="-mno-cygwin -O2" \
-LDFLAGS="-mno-cygwin" \
 --prefix="/sdcc" \
 --datadir="/sdcc" \
 docdir="/sdcc/doc" \
 include_dir_suffix="include" \
 lib_dir_suffix="lib" \
 sdccconf_h_dir_separator="\\\\" \
---disable-ucsim
+CC="gcc -mno-cygwin" \
+CXX="g++ -mno-cygwin"
 
 make 2>&1 | tee make.log
diff --git a/support/scripts/sdcc_mingw32 b/support/scripts/sdcc_mingw32
index 86e6784d..45848380 100755
--- a/support/scripts/sdcc_mingw32
+++ b/support/scripts/sdcc_mingw32
@@ -15,7 +15,6 @@ include_dir_suffix=include \
 lib_dir_suffix=lib \
 sdccconf_h_dir_separator=\\\\ \
 --disable-device-lib \
---disable-ucsim \
 --host=i586-mingw32msvc --build=unknown-unknown-linux-gnu"
 
 ./configure $SDCCCONFIGUREFLAGS
-- 
2.30.2