Fixes for Windows jv
authorJan Vrany <jan.vrany@fit.cvut.cz>
Thu, 19 Jul 2012 00:01:58 +0100
branchjv
changeset 17953 e350c5153ee6
parent 17952 0b7d80888d37
child 17954 dc18846aa7b2
Fixes for Windows
bc.mak
libInit.cc
--- a/bc.mak	Wed Jul 18 18:28:45 2012 +0100
+++ b/bc.mak	Thu Jul 19 00:01:58 2012 +0100
@@ -382,11 +382,6 @@
 $(OUTDIR)Win32Process.$(O) Win32Process.$(H): Win32Process.st $(STCHDR)
 $(OUTDIR)PCFilename.$(O) PCFilename.$(H): PCFilename.st $(STCHDR)
 $(OUTDIR)WindowsDesktop.$(O) WindowsDesktop.$(H): WindowsDesktop.st $(INCLUDE_TOP)\stx\libbasic\AbstractDesktop.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
-$(OUTDIR)Win32Process.$(O) Win32Process.$(H): Win32Process.st $(STCHDR)
-$(OUTDIR)PCFilename.$(O) PCFilename.$(H): PCFilename.st $(STCHDR)
-$(OUTDIR)CharacterEncoderImplementations__MS_Baltic.$(O) CharacterEncoderImplementations__MS_Baltic.$(H): CharacterEncoderImplementations__MS_Baltic.st $(STCHDR)
-$(OUTDIR)CharacterEncoderImplementations__MS_Cyrillic.$(O) CharacterEncoderImplementations__MS_Cyrillic.$(H): CharacterEncoderImplementations__MS_Cyrillic.st $(STCHDR)
-$(OUTDIR)CharacterEncoderImplementations__MS_Greek.$(O) CharacterEncoderImplementations__MS_Greek.$(H): CharacterEncoderImplementations__MS_Greek.st $(STCHDR)
 $(OUTDIR)Win32Handle.$(O) Win32Handle.$(H): Win32Handle.st $(STCHDR)
 $(OUTDIR)Win32FILEHandle.$(O) Win32FILEHandle.$(H): Win32FILEHandle.st $(STCHDR)
 $(OUTDIR)Win32Constants.$(O) Win32Constants.$(H): Win32Constants.st $(STCHDR)
--- a/libInit.cc	Wed Jul 18 18:28:45 2012 +0100
+++ b/libInit.cc	Thu Jul 19 00:01:58 2012 +0100
@@ -346,9 +346,6 @@
 _DirectoryStream_Init(pass,__pRT__,snd);
 _InvalidEncodingError_Init(pass,__pRT__,snd);
 _PipeStream_Init(pass,__pRT__,snd);
-_UnixDesktop_Init(pass,__pRT__,snd);
-_XDGDesktop_Init(pass,__pRT__,snd);
-_GNOMEDesktop_Init(pass,__pRT__,snd);
 #ifdef WIN32
 _Win32Process_Init(pass,__pRT__,snd);
 _WindowsDesktop_Init(pass,__pRT__,snd);
@@ -362,6 +359,9 @@
 _UnixFileDescriptorHandle_Init(pass,__pRT__,snd);
 _UnixFileHandle_Init(pass,__pRT__,snd);
 _UnixOperatingSystem_Init(pass,__pRT__,snd);
+_UnixDesktop_Init(pass,__pRT__,snd);
+_XDGDesktop_Init(pass,__pRT__,snd);
+_GNOMEDesktop_Init(pass,__pRT__,snd);
 #endif /* UNIX */