Fix: Linking issue after 0de2a77

As the build flags are included at the place its required, linking also
must occur at that place. This also makes sense after all why would one
compile in one place and link in another.

The root CMakeLists.txt now just includes `src/kernel/CMakeLists.txt`
with the former now fully builds the Kernel and drivers.

Inclusion of targets into the global 'build-all' target also happens
where the target is defined not at the root CMakeLists.txt which seems
to me how it should have been (Dependency goes from parent to child
CMakeLists but not the other way).

Also includes:
* After decoupling of application build & kernel flags, all
  references of kernel definitions in applib headers & applications
  were removed or defined separately at the application level.

Author: coderarjob

CMakeLists.txt

@@ -101,43 +101,20 @@ if(CMAKE_CROSSCOMPILING)
     set(MOS_DISKIMAGE_PATH              ${MOS_DISKIMAGE_DIR}/mos.flp)
 
     #---------------------------------------------------------------------------
+    # Components which want to build by default should add themselves to this global target.
     add_custom_target(build-all ALL)
-    add_dependencies(build-all kernel.flt boot1.flt boot0.flt)
-    if (MOS_GRAPHICS_ENABLED)
-        add_dependencies(build-all gui0.flt)
-    else()
-        add_dependencies(build-all proc1.flt mpdemo.flt)
-    endif()
 
     #---------------------------------------------------------------------------
-    # Build & link kernel and process binaries
+    # Build & link bootloader, kernel and application library
     #---------------------------------------------------------------------------
     add_subdirectory(src/bootloader/${ARCH})
     add_subdirectory(src/kernel)
-    add_subdirectory(src/kernel/${ARCH})
-    add_subdirectory(src/apps)
     add_subdirectory(src/apps/applib)
-    add_subdirectory(src/kernel/drivers/${ARCH}/${MARCH})
-
-    set(KERNEL_RESOURCE_FILES)
-    if (MOS_GRAPHICS_ENABLED)
-        list (APPEND KERNEL_RESOURCE_FILES ${CMAKE_SOURCE_DIR}/docs/images/mos.rbm)
-    endif()
 
-    link(
-        FLATTEN
-        NAME kernel.flt
-        DEPENDS 
-            common
-            kernel
-            kernel_entry
-            kernel_X86
-            kernel_drivers
-        RESOURCES ${KERNEL_RESOURCE_FILES}
-        FLAGS ${MOS_LINKER_OPTIONS}
-        LINKER_FILE ${MOS_KERNEL_LINKER_SCRIPT_FILE}
-        LINK_LIBRARIES gcc
-        )
+    #---------------------------------------------------------------------------
+    # Build & link applications
+    #---------------------------------------------------------------------------
+    add_subdirectory(src/apps)
 
     #---------------------------------------------------------------------------
     # Create new floppy image and the copy flat binary files

include/applib/graphics.h

@@ -6,10 +6,6 @@
 
 #pragma once
 
-#ifndef GRAPHICS_MODE_ENABLED
-    #error "Gui demo only works in graphics mode"
-#endif
-
 #include <types.h>
 #ifdef KERNEL
     #include <applib/osif.h>

src/apps/CMakeLists.txt

@@ -48,6 +48,7 @@ compile_lib(
     SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/gui0.c
     FLAGS ${MOS_USER_GCC_FLAGS}
     DEFINITIONS ${MOS_USER_GCC_DEFINITIONS}
+                GRAPHICS_BPP=${MOS_GRAPHICS_BPP}
     INCLUDE_DIRECTORIES ${MOS_USER_GCC_INCLUDE_DIRS}
     )
 
@@ -59,3 +60,12 @@ link(
     LINKER_FILE ${MOS_USER_LINKER_SCRIPT_FILE}
     LINK_LIBRARIES app
     )
+
+#---------------------------------------------------------------------------
+# Add to the global 'build-all' target
+#---------------------------------------------------------------------------
+if (MOS_GRAPHICS_ENABLED)
+    add_dependencies(build-all gui0.flt)
+else()
+    add_dependencies(build-all proc1.flt mpdemo.flt)
+endif()

src/apps/gui0.c

@@ -3,10 +3,6 @@
 #include <app.h>
 #include <graphics.h>
 
-#ifndef GRAPHICS_MODE_ENABLED
-    #error "Gui demo only works in graphics mode"
-#endif
-
 void thread0();
 void thread1();
 

src/bootloader/x86/CMakeLists.txt

@@ -19,3 +19,8 @@ assemble_and_copy_bin(
         ${CMAKE_CURRENT_SOURCE_DIR}/boot1
         ${MOS_KERNEL_ASM_INCLUDE_DIRS}
     )
+
+#---------------------------------------------------------------------------
+# Add to the global 'build-all' target
+#---------------------------------------------------------------------------
+add_dependencies(build-all boot0.flt boot1.flt)

src/kernel/CMakeLists.txt

@@ -34,3 +34,37 @@ compile_lib(
     DEFINITIONS ${MOS_KERNEL_GCC_DEFINITIONS}
     INCLUDE_DIRECTORIES ${MOS_KERNEL_GCC_INCLUDE_DIRS}
     )
+
+#---------------------------------------------------------------------------
+# Build Arch dependent kernel & drivers
+#---------------------------------------------------------------------------
+add_subdirectory(${ARCH})
+add_subdirectory(drivers/${ARCH}/${MARCH})
+
+set(KERNEL_RESOURCE_FILES)
+
+#---------------------------------------------------------------------------
+# Link the kernel
+#---------------------------------------------------------------------------
+if (MOS_GRAPHICS_ENABLED)
+    list (APPEND KERNEL_RESOURCE_FILES ${PROJECT_SOURCE_DIR}/docs/images/mos.rbm)
+endif()
+
+link(
+    FLATTEN
+    NAME kernel.flt
+    DEPENDS
+        kernel
+        kernel_entry
+        kernel_X86
+        kernel_drivers
+    RESOURCES ${KERNEL_RESOURCE_FILES}
+    FLAGS ${MOS_LINKER_OPTIONS}
+    LINKER_FILE ${MOS_KERNEL_LINKER_SCRIPT_FILE}
+    LINK_LIBRARIES gcc
+    )
+
+#---------------------------------------------------------------------------
+# Add to the global 'build-all' target
+#---------------------------------------------------------------------------
+add_dependencies(build-all kernel.flt)