diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 2d1ee8e5ef..210caa7524 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,17 @@
    2008-12-31 13:59 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
 
+2008-08-04 16:02 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/common.mak
+  * harbour/source/compiler/Makefile
+  * harbour/source/compiler/cmdcheck.c
+  * harbour/source/compiler/hbmain.c
+  * harbour/source/compiler/hbusage.c
+    * disabled support for unfinished -gw compiler switch in
+      default builds. It can be enabled by developers who will
+      want to work on this code by recompiling Harbour with
+      HB_GEN_W32_OBJ macro (f.e. by setting it in C_USR envvar)
+
 2008-08-04 15:48 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/source/debug/dbgentry.c
     ! fixed some possible memory leaks or GPFs when wrong parameters
diff --git a/harbour/common.mak b/harbour/common.mak
index e1af0cdd9f..27a645da1b 100644
--- a/harbour/common.mak
+++ b/harbour/common.mak
@@ -372,7 +372,6 @@ COMPILER_LIB_OBJS = \
     $(OBJ_DIR)\genc$(OBJEXT)     \
     $(OBJ_DIR)\gencc$(OBJEXT)    \
     $(OBJ_DIR)\gencobj$(OBJEXT)  \
-    $(OBJ_DIR)\genobj32$(OBJEXT) \
     $(OBJ_DIR)\genhrb$(OBJEXT)   \
     $(OBJ_DIR)\expropta$(OBJEXT) \
     $(OBJ_DIR)\exproptb$(OBJEXT) \
diff --git a/harbour/source/compiler/Makefile b/harbour/source/compiler/Makefile
index 5ccce87ddf..81df807bb8 100644
--- a/harbour/source/compiler/Makefile
+++ b/harbour/source/compiler/Makefile
@@ -28,7 +28,6 @@ C_SOURCES=\
 	gencc.c \
 	gencobj.c \
 	genhrb.c \
-	genobj32.c \
 	hbcmplib.c \
 	hbcomp.c \
 	hbdbginf.c \
diff --git a/harbour/source/compiler/cmdcheck.c b/harbour/source/compiler/cmdcheck.c
index 48e8e043ab..09e8769295 100644
--- a/harbour/source/compiler/cmdcheck.c
+++ b/harbour/source/compiler/cmdcheck.c
@@ -315,10 +315,12 @@ static void hb_compChkEnvironVar( HB_COMP_DECL, char *szSwitch )
                      HB_COMP_PARAM->iLanguage = HB_LANG_PORT_OBJ;
                      break;
 
+#ifdef HB_GEN_W32_OBJ
                   case 'w':
                   case 'W':
                      HB_COMP_PARAM->iLanguage = HB_LANG_OBJ32;
                      break;
+#endif
 
                   default:
                      hb_compGenError( HB_COMP_PARAM, hb_comp_szErrors, 'F', HB_COMP_ERR_UNSUPPORTED_LANG, NULL, NULL );
diff --git a/harbour/source/compiler/hbmain.c b/harbour/source/compiler/hbmain.c
index fce98da4ca..0223f85141 100644
--- a/harbour/source/compiler/hbmain.c
+++ b/harbour/source/compiler/hbmain.c
@@ -4349,9 +4349,11 @@ static void hb_compGenOutput( HB_COMP_DECL, int iLanguage )
          hb_compGenCCode( HB_COMP_PARAM, HB_COMP_PARAM->pFileName );
          break;
 
+#ifdef HB_GEN_W32_OBJ
       case HB_LANG_OBJ32:
          hb_compGenObj32( HB_COMP_PARAM, HB_COMP_PARAM->pFileName );
          break;
+#endif
 
       case HB_LANG_PORT_OBJ:
          hb_compGenPortObj( HB_COMP_PARAM, HB_COMP_PARAM->pFileName );
diff --git a/harbour/source/compiler/hbusage.c b/harbour/source/compiler/hbusage.c
index f02dacc1b8..9591f1af1c 100644
--- a/harbour/source/compiler/hbusage.c
+++ b/harbour/source/compiler/hbusage.c
@@ -74,7 +74,9 @@ void hb_compPrintUsage( HB_COMP_DECL, char * szSelf )
            "\n                           <type>: 0=compact 1=normal 2=verbose (default)",
            "\n                                   3=generate real C code",
            "\n          %cgo              output type: Platform dependant object module",
+#ifdef HB_GEN_W32_OBJ
            "\n          %cgw              output type: Windows/DOS OBJ32 (.obj)",
+#endif
            "\n          %cgh              output type: Harbour Portable Object (.hrb)",
            "\n          %ci<path>         #include file search path",
            "\n          %cj[<file>]       generate i18n gettex file (.pot)",