Cleaning up for release

diff --git a/BuildConf/x86/default.mk b/BuildConf/x86/default.mk
index ec21227..a1911cd 100644 (file)
--- a/BuildConf/x86/default.mk
+++ b/BuildConf/x86/default.mk
@@ -6,5 +6,5 @@ MODULES += Display/VESA
 MODULES += Display/BochsGA
 MODULES += Input/PS2KbMouse
 MODULES += x86/ISADMA x86/VGAText
-MODULES += USB/Core USB/UHCI
+#MODULES += USB/Core USB/UHCI
 #MODULES += Interfaces/UDI

diff --git a/Kernel/Makefile b/Kernel/Makefile
index 48a2c9f..3b30049 100644 (file)
--- a/Kernel/Makefile
+++ b/Kernel/Makefile
@@ -91,7 +91,7 @@ install: $(BIN)
 apidoc:
        doxygen Doxyfile.api
 
-$(BIN): $(OBJ) $(MODS) arch/$(ARCHDIR)/link.ld Makefile
+$(BIN): $(OBJ) $(MODS) arch/$(ARCHDIR)/link.ld Makefile ../BuildConf/$(ARCH)/Makefile.cfg ../BuildConf/$(ARCH)/$(PLATFORM).mk
        @echo --- LD -o $(BIN)
        @$(LD) $(LDFLAGS) -o $(BIN) $(OBJ) $(MODS) --defsym __buildnum=$$(( $(BUILD_NUM) + 1 )) -Map ../Map.$(ARCH).txt
        @$(DISASM) -S $(BIN) > $(BIN).dsm

diff --git a/Kernel/arch/x86/mm_virt.c b/Kernel/arch/x86/mm_virt.c
index 6a29c56..d384142 100644 (file)
--- a/Kernel/arch/x86/mm_virt.c
+++ b/Kernel/arch/x86/mm_virt.c
@@ -530,7 +530,8 @@ void MM_ClearSpace(Uint32 CR3)
        }
 
        if( MM_GetRefCount(CR3) > 1 ) {
-               Log_Log("MMVirt", "CR3 %P is still referenced, not clearing", CR3);
+               MM_DerefPhys(CR3);
+               Log_Log("MMVirt", "CR3 %P is still referenced, not cleaning (but dereferenced)", CR3);
                return ;
        }
 

diff --git a/Usermode/Applications/axwin3_src/Makefile b/Usermode/Applications/axwin3_src/Makefile
index 1ee8c26..33fa974 100644 (file)
--- a/Usermode/Applications/axwin3_src/Makefile
+++ b/Usermode/Applications/axwin3_src/Makefile
@@ -11,12 +11,12 @@ SUBMAKE = $(MAKE) --no-print-directory
 
 all:
        @$(foreach DIR,$(DIRS), echo --- $(NAME)/$(DIR) && $(SUBMAKE) -C $(DIR) $@ &&) true
-install: $(FILES)
+install:
        @$(xMKDIR) $(DISTROOT)/Apps ; true
        @$(xMKDIR) $(DISTROOT)/Apps/AxWin ; true
        @$(xMKDIR) $(DISTROOT)/Apps/3.0 ; true
        @$(foreach DIR,$(DIRS), echo --- $(NAME)/$(DIR) && $(SUBMAKE) -C $(DIR) $@ &&) true
-#      @$(foreach FILE,$(FILES), $(SUBMAKE) -C $(FILE);) true
+       @$(foreach FILE,$(FILES), $(xCP) $(FILE:-%=%) $(DISTROOT)/Apps/AxWin/3.0/$(FILE:-%=%) &&) true
 
 clean:
        @$(foreach DIR,$(DIRS), $(SUBMAKE) -C $(DIR) $@ &&) true