From e4fbc0f34430ea13e42bd17a234cc4bfb23a18f9 Mon Sep 17 00:00:00 2001
From: ketmar <ketmar@ketmar.no-ip.org>
Date: Mon, 20 Aug 2012 03:30:10 +0300
Subject: [PATCH] removed traces of fuckin' windoze builds. bye-bye, assholes

---
 Jamrules         | 140 +++++++++++++++++++++++--------------------------------
 Jamrules.defines |   1 -
 Jamrules.windoze |  19 --------
 3 files changed, 58 insertions(+), 102 deletions(-)
 rewrite Jamrules (61%)
 delete mode 100644 Jamrules.windoze

diff --git a/Jamrules b/Jamrules
dissimilarity index 61%
index e703fa4..6c49de7 100644
--- a/Jamrules
+++ b/Jamrules
@@ -1,82 +1,58 @@
-if ! $(THIS_IS_K8JAM) {
-  Exit "You need k8jam to build Awish! Download it here: http://repo.or.cz/w/k8jam.git" ;
-}
-if $(WINDOZE) { OPT = default ; OPTIM_STANDARD = -O2 -march=i686 -mtune=i686 ; }
-if $(NT) { WINDOZE = 1 ; }
-set-profile ;
-set-default-locations ;
-OPTIM.all += -Wno-narrowing ;
-## if $(WINDOZE) {
-##   OPTIM.all += -static-libgcc -static-libstdc++ ;
-##   LINKFLAGS.all += -static-libgcc -static-libstdc++ ;
-## }
-
-HDRS += $(TOP)/src/felib ;
-
-
-if $(USE_SOUND) = 0 || $(USE_SOUND) = "ona" || $(USE_SOUND) = "no" || $(USE_SOUND) = "n" {
-  USE_SOUND = ;
-} else {
-  USE_SOUND = 1 ;
-}
-
-
-if $(WINDOZE) {
-  Echo "MSG: windoze build" ;
-  HAVE_IMLIB2 = ;
-  HAVE_LIBPNG = ;
-} else {
-  HAVE_SDL = [ pkg-config sdl ] ;
-  if ! $(HAVE_SDL) {
-    Exit "FATAL: you need SDL!" ;
-  }
-  HAVE_MIXER = [ pkg-config SDL_mixer ] ;
-  if ! $(HAVE_MIXER) {
-    USE_SOUND = ;
-  }
-  HAVE_IMLIB2 = [ pkg-config imlib2 ] ;
-  #if $(FORCE_LIBPNG) || ! $(HAVE_IMLIB2) {
-  #  HAVE_LIBPNG = [ lib-config-ex "pkg-config libpng --libs" ] ;
-  #  HAVE_IMLIB2 = ;
-  #} else {
-  #  HAVE_LIBPNG = ;
-  #}
-  HAVE_LIBPNG = ;
-  HAVE_ZLIB = [ pkg-config zlib ] ;
-}
-
-
-include $(TOP)/Jamrules.defines ;
-softinclude $(TOP)/Jamrules.windoze ;
-softinclude $(TOP)/Jamrules.push ;
-
-
-rule C++SDLMain {
-  local n ;
-
-  for n in $(<) {
-    #echo "$(n:S)" ;
-    C++Main "$(<)$(SUFEXE)" : $(>) ;
-    C++LINKLIBS on "$(<)$(SUFEXE)" += -lm ;
-    LinkLibraries "$(<)$(SUFEXE)" : libfelib.a ;
-    if $(WINDOZE) {
-      if $(USE_SOUND) { WINDOZE_SDL_MIXER = $(TOP)/SDL_mixer.dll ; } else { WINDOZE_SDL_MIXER = ; }
-      #C++LINKLIBS on "$(<)$(SUFEXE)" += -Lwinlib -lz ;
-      if $(HAVE_ZLIB) { WINDOZE_ZLIB = $(TOP)/zlib1.dll ; } else { WINDOZE_ZLIB = ;  }
-      LinkSharedLibraries "$(<)$(SUFEXE)" :
-        $(TOP)/SDL.dll
-        $(WINDOZE_SDL_MIXER)
-        $(WINDOZE_ZLIB)
-      ;
-    }
-  }
-}
-
-
-if ! $(NOGDB) {
-  OPTIM.all += -g ;
-  LINKFLAGS.all += -g ;
-} else {
-  OPTIM.all += -s ;
-  LINKFLAGS.all += -s ;
-}
+if ! $(THIS_IS_K8JAM) {
+  Exit "You need k8jam to build Awish! Download it here: http://repo.or.cz/w/k8jam.git" ;
+}
+set-profile ;
+set-default-locations ;
+OPTIM.all += -Wno-narrowing ;
+HDRS += $(TOP)/src/felib ;
+
+
+if $(USE_SOUND) = 0 || $(USE_SOUND) = "ona" || $(USE_SOUND) = "no" || $(USE_SOUND) = "n" {
+  USE_SOUND = ;
+} else {
+  USE_SOUND = 1 ;
+}
+
+
+HAVE_SDL = [ pkg-config sdl ] ;
+if ! $(HAVE_SDL) {
+  Exit "FATAL: you need SDL!" ;
+}
+HAVE_MIXER = [ pkg-config SDL_mixer ] ;
+if ! $(HAVE_MIXER) {
+  USE_SOUND = ;
+}
+HAVE_IMLIB2 = [ pkg-config imlib2 ] ;
+#if $(FORCE_LIBPNG) || ! $(HAVE_IMLIB2) {
+#  HAVE_LIBPNG = [ lib-config-ex "pkg-config libpng --libs" ] ;
+#  HAVE_IMLIB2 = ;
+#} else {
+#  HAVE_LIBPNG = ;
+#}
+HAVE_LIBPNG = ;
+HAVE_ZLIB = [ pkg-config zlib ] ;
+
+
+include $(TOP)/Jamrules.defines ;
+softinclude $(TOP)/Jamrules.push ;
+
+
+rule C++SDLMain {
+  local n ;
+
+  for n in $(<) {
+    #echo "$(n:S)" ;
+    C++Main "$(<)$(SUFEXE)" : $(>) ;
+    C++LINKLIBS on "$(<)$(SUFEXE)" += -lm ;
+    LinkLibraries "$(<)$(SUFEXE)" : libfelib.a ;
+  }
+}
+
+
+if ! $(NOGDB) {
+  OPTIM.all += -g ;
+  LINKFLAGS.all += -g ;
+} else {
+  OPTIM.all += -s ;
+  LINKFLAGS.all += -s ;
+}
diff --git a/Jamrules.defines b/Jamrules.defines
index ea3c9b1..4c5c0c8 100644
--- a/Jamrules.defines
+++ b/Jamrules.defines
@@ -61,7 +61,6 @@ if $(HAVE_IMLIB2) || $(HAVE_LIBPNG) {
   }
 }
 
-if $(WINDOZE) { HAVE_ZLIB = tan ; }
 if $(DISABLE_ZLIB) { HAVE_ZLIB = ; }
 
 if $(HAVE_ZLIB) {
diff --git a/Jamrules.windoze b/Jamrules.windoze
deleted file mode 100644
index e938a3a..0000000
--- a/Jamrules.windoze
+++ /dev/null
@@ -1,19 +0,0 @@
-if $(WINDOZE) {
-  HDRS += $(TOP)/windoze/include ;
-  HDRS += $(TOP)/windoze/include/SDL ;
-  #WINDOZE_THREADS = ;
-  if ! $(NT) || $(NO_CONSOLE) {
-    WINSUBSYS = "windows" ;
-  } else {
-    WINSUBSYS = "console" ;
-  }
-  #WINLIBS += -lkernel32 ;
-  windoze-fix ;
-}
-
-if $(NT) {
-  CC = $(CC) -pipe -static-libgcc ;
-  C++ = $(C++) -pipe -static-libgcc -static-libstdc++ ;
-  LINK = $(LINK) -pipe -static-libgcc ;
-  C++LINK = $(C++LINK) -pipe -static-libgcc -static-libstdc++ ;
-}
-- 
2.11.4.GIT