Build cleanup and general fixes. fprintf() is now fdprintf(), the separation

between uisimulator files and firmware/apps files are better done.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@6031 a1c6a512-1295-4272-9138-f99709370657

2 files changed, 13 insertions, 3 deletions

diff --git a/tools/configure b/tools/configure
index 364a3d707e..c56f28edba 100755
--- a/tools/configure
+++ b/tools/configure
@@ -48,19 +48,29 @@ simcc () {
  # default tool setup for native building
  prefixtools ""
 
- GCCOPTS='-W -Wall -g -fno-builtin -I$(ROOTDIR)/uisimulator/common -I$(ROOTDIR)/uisimulator/$(SIMVER)'
+ GCCOPTS='-W -Wall -g -fno-builtin'
 
  output="rockboxui" # use this as default output binary name
 
  case $uname in
    CYGWIN*)
    echo "Cygwin host detected"
-   LDOPTS='-L/usr/X11R6/lib -lSM -lICE -lXt -lX11 -lXmu -lSM -lICE -lX11 -lpthread'
+
+   if [ "$simver" = "win32" ]; then
+       # win32 version
+       GCCOPTS="$GCCOPTS -mno-cygwin -DNOCYGWIN"
+       LDOPTS="-lgdi32 -luser32 -mno-cygwin"
+   else
+       # x11 version
+       GCCOPTS="$GCCOPTS -DNOCYGWIN"
+       LDOPTS='-L/usr/X11R6/lib -lSM -lICE -lXt -lX11 -lXmu -lSM -lICE -lX11 -lpthread'
+   fi
    output="rockboxui.exe" # use this as output binary name
    ;;
 
    Linux)
    echo "Linux host detected"
+   GCCOPTS="$GCCOPTS"
    LDOPTS='-L/usr/X11R6/lib -lX11 -lm -lXt -lXmu -lnsl -ldl -lpthread'
    if [ "$simver" = "win32" ]; then
      crosswincc # setup cross-compiler
diff --git a/tools/make.inc b/tools/make.inc
index 0da7a8b17c..7823d08b67 100644
--- a/tools/make.inc
+++ b/tools/make.inc
@@ -3,7 +3,7 @@
 $(OBJDIR)/%.o: %.c
         @mkdir -p `dirname $@`
         @echo "CC $<"
-        @$(CC) $(CFLAGS) -c $< -o $@
+        $(CC) $(CFLAGS) -c $< -o $@
 
 $(OBJDIR)/%.o: %.S
         @mkdir -p `dirname $@`