[ros-diffs] [hbelusca] 66568: [KEYBOARDLAYOUTS]: Improve on r61053 and r64791 by moving the keyboard layout LD script to its correct directory.

Author: hbelusca
Date: Thu Mar  5 15:04:25 2015
New Revision: 66568

URL: http://svn.reactos.org/svn/reactos?rev=66568&view=rev
Log:
[KEYBOARDLAYOUTS]: Improve on r61053 and r64791 by moving the keyboard layout LD script to its correct directory.

Added:
    trunk/reactos/dll/keyboard/kbdlayout.lds
      - copied unchanged from r66567, trunk/reactos/kbdlayout.lds
Removed:
    trunk/reactos/kbdlayout.lds
Modified:
    trunk/reactos/dll/keyboard/CMakeLists.txt

Modified: trunk/reactos/dll/keyboard/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/CMakeLists.txt...
==============================================================================
--- trunk/reactos/dll/keyboard/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/reactos/dll/keyboard/CMakeLists.txt	[iso-8859-1] Thu Mar  5 15:04:25 2015
@@ -99,7 +99,7 @@
         add_target_link_flags(${_keyboard_layout} "/ignore:4254 /SECTION:.data,ER /MERGE:.text=.data /MERGE:.rdata=.data /MERGE:.bss=.data /MERGE:.edata=.data")
     else()
         # Use a custom linker script
-        add_target_link_flags(${_keyboard_layout} "-Wl,-T,${CMAKE_SOURCE_DIR}/kbdlayout.lds")
+        add_target_link_flags(${_keyboard_layout} "-Wl,-T,${CMAKE_CURRENT_SOURCE_DIR}/kbdlayout.lds")
     endif()

if (STACK_PROTECTOR)

Removed: trunk/reactos/kbdlayout.lds
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/kbdlayout.lds?rev=66567
==============================================================================
--- trunk/reactos/kbdlayout.lds	[iso-8859-1] (original)
+++ trunk/reactos/kbdlayout.lds	(removed)
@@ -1,35 +0,0 @@
-SECTIONS
-{
-  .data __image_base__ + __section_alignment__ :
-  {
-    *(.data)
-    *(SORT(.data*))
-    *(.rdata)
-    *(SORT(.rdata*))
-    *(.text)
-    *(SORT(.text*))
-    *(.bss)
-    *(COMMON)
-  }
-
-  .rsrc BLOCK(__section_alignment__) :
-  {
-    *(.rsrc)
-    *(SORT(.rsrc$*))
-  }
-
-  .reloc BLOCK(__section_alignment__) :
-  {
-    *(.reloc)
-  }
-
-  .edata BLOCK(__section_alignment__) :
-  {
-    *(.edata)
-  }
-
-  /DISCARD/ :
-  {
-    *(*)
-  }
-}