[CMAKE]

* Adopt the retar, I mean, actual way of handling resource files. This is a temporary measure until a windres issue is fixed. svn path=/branches/cmake-bringup/; revision=51381
2026-09-03 04:13:31 +00:00 · 2011-04-17 16:54:57 +00:00
parent e720b65b6d
commit 0bc61591d7
79 changed files with 125 additions and 19 deletions
@@ -58,7 +58,7 @@ if(NOT CMAKE_CROSSCOMPILING)
    add_subdirectory(lib)

    if(NOT MSVC)
-        export(TARGETS widl gendib cabman cdmake mkhive spec2def geninc FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- )
+        export(TARGETS widl wrc gendib cabman cdmake mkhive spec2def geninc FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- )
    else()
        export(TARGETS gendib cabman cdmake mkhive spec2def geninc FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- )
    endif()
@@ -1,5 +1,6 @@

 set_unicode()
+set_rc_compiler()

 list(APPEND SOURCE cacls.c cacls.rc)

@@ -1,5 +1,6 @@

 set_unicode()
+set_rc_compiler()

 add_definitions(-DDISABLE_HTMLHELP_SUPPORT=1)

@@ -1,5 +1,6 @@

 set_unicode()
+set_rc_compiler()

 list(APPEND SOURCE
    about.c
@@ -1,5 +1,6 @@

 set_unicode()
+set_rc_compiler()

 add_executable(doskey doskey.c doskey.rc)

@@ -1,5 +1,6 @@

 set_unicode()
+set_rc_compiler()

 add_executable(control control.c control.rc)

@@ -1,5 +1,6 @@

 set_unicode()
+set_rc_compiler()

 list(APPEND SOURCE
    system.c
@@ -1,4 +1,5 @@

+set_rc_compiler()
 add_executable(fontview
    display.c
    fontview.c
@@ -1,6 +1,7 @@

 set_unicode()
 set_cpp()
+set_rc_compiler()

 include_directories(${REACTOS_SOURCE_DIR}/lib/3rdparty/cardlib)

@@ -1,4 +1,5 @@

+set_rc_compiler()
 add_executable(hh main.c hh.rc)
 set_module_type(hh win32gui)
 add_importlibs(hh gdi32 user32 msvcrt kernel32)
@@ -1,4 +1,5 @@

+set_rc_compiler()
 add_executable(iexplore main.c iexplore.rc)
 set_module_type(iexplore win32gui)
 add_importlibs(iexplore shdocvw msvcrt kernel32)
@@ -1,5 +1,6 @@

 set_unicode()
+set_rc_compiler()

 add_executable(kbswitch kbswitch.c kbswitch.rc)

@@ -1,4 +1,6 @@

+set_rc_compiler()
+
 add_executable(magnify
    magnifier.c
    settings.c
@@ -1,4 +1,5 @@

+set_rc_compiler()
 set_unicode()

 list(APPEND SOURCE
@@ -1,5 +1,6 @@

 set_unicode()
+set_rc_compiler()

 add_executable(mplay32 mplay32.c mplay32.rc)

@@ -1,5 +1,6 @@

 set_unicode()
+set_rc_compiler()

 list(APPEND SOURCE
    toolspage.c
@@ -1,5 +1,6 @@

 set_unicode()
+set_rc_compiler()

 list(APPEND SOURCE
    about.c
@@ -2,6 +2,7 @@
 add_definitions(-D_DLL -D__USE_CRTIMP)

 set_unicode()
+set_rc_compiler()

 include_directories(BEFORE .)

@@ -1,5 +1,6 @@

 set_unicode()
+set_rc_compiler()

 add_executable(regedt32 regedt32.c resource.rc)

@@ -1,5 +1,6 @@

 set_unicode()
+set_rc_compiler()

 list(APPEND SOURCE
    about.c
@@ -10,7 +10,7 @@
 #include "lang/hu-HU.rc"
 #include "lang/id-ID.rc"
 #include "lang/it-IT.rc"
-#include "lang/ja-JP.rc"
+// #include "lang/ja-JP.rc" Error: Invalid character in string 'ÃåIÃåvÃåVÃåÔÇíÃåÔÇ�(&O)' for codepage 932
 #include "lang/ko-KR.rc"
 #include "lang/no-NO.rc"
 #include "lang/nl-NL.rc"
@@ -1,4 +1,6 @@

+set_rc_compiler()
+
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)

 add_definitions(
@@ -1,5 +1,6 @@

 set_unicode()
+set_rc_compiler()

 add_executable(reactos reactos.c reactos.rc)

@@ -7,6 +7,8 @@ add_definitions(

 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)

+set_rc_compiler()
+
 list(APPEND SOURCE main.c cmd.rc)

 list(APPEND SOURCE
@@ -3,6 +3,8 @@ set_unicode()

 add_definitions(-DWIN32)

+set_rc_compiler()
+
 list(APPEND SOURCE
    desktop.c
    dragdrop.c
@@ -5,6 +5,8 @@ add_definitions(

 include_directories(${REACTOS_SOURCE_DIR}/include/wine)

+set_rc_compiler()
+
 add_executable(msiexec
    msiexec.c
    service.c
@@ -1,5 +1,6 @@

 set_unicode()
+set_rc_compiler()

 add_executable(runonce runonce.c runonce.rc)

@@ -1,5 +1,6 @@

 set_unicode()
+set_rc_compiler()

 spec2def(access.cpl access.spec)

@@ -1,5 +1,6 @@

 set_unicode()
+set_rc_compiler()

 spec2def(appwiz.cpl appwiz.spec)

@@ -5,6 +5,7 @@ add_definitions(
    -D_WIN32
    -D_DLL -D__USE_CRTIMP)

+set_rc_compiler()
 spec2def(desk.cpl desk.spec)

 add_library(desk SHARED
@@ -1,5 +1,6 @@

 set_unicode()
+set_rc_compiler()

 spec2def(hdwwiz.cpl hdwwiz.spec)

@@ -1,5 +1,6 @@

 set_unicode()
+set_rc_compiler()

 spec2def(input.dll input.spec)

@@ -1,5 +1,6 @@

 set_unicode()
+set_rc_compiler()

 add_definitions(-D_DLL -D__USE_CRTIMP)

@@ -1,5 +1,6 @@

 set_unicode()
+set_rc_compiler()

 spec2def(joy.cpl joy.spec)

@@ -1,5 +1,6 @@

 set_unicode()
+set_rc_compiler()

 add_definitions(-D_DLL -D__USE_CRTIMP)

@@ -1,5 +1,6 @@

 set_unicode()
+set_rc_compiler()

 add_definitions(-D_DLL -D__USE_CRTIMP)

@@ -1,5 +1,6 @@

 set_unicode()
+set_rc_compiler()

 spec2def(powercfg.cpl powercfg.spec)

@@ -1,5 +1,6 @@

 set_unicode()
+set_rc_compiler()

 spec2def(sysdm.cpl sysdm.spec)

@@ -1,5 +1,6 @@

 set_unicode()
+set_rc_compiler()

 spec2def(telephon.cpl telephon.spec)

@@ -1,5 +1,6 @@

 set_unicode()
+set_rc_compiler()

 spec2def(timedate.cpl timedate.spec)

@@ -3,6 +3,8 @@ set_unicode()

 include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/wine)

+set_rc_compiler()
+
 spec2def(usrmgr.cpl usrmgr.spec)

 add_library(usrmgr SHARED
@@ -1,6 +1,6 @@

 set_unicode()
-
+set_rc_compiler()
 spec2def(deskadp.dll deskadp.spec)

 list(APPEND SOURCE
@@ -1,5 +1,6 @@

 set_unicode()
+set_rc_compiler()

 spec2def(deskmon.dll deskmon.spec)

@@ -1,5 +1,6 @@

 set_unicode()
+set_rc_compiler()

 spec2def(devcpux.dll devcpux.spec)

@@ -1,6 +1,6 @@

 set_unicode()
-
+set_rc_compiler()
 spec2def(fontext.dll fontext.spec)

 add_library(fontext SHARED
@@ -1,5 +1,6 @@

 set_unicode()
+set_rc_compiler()

 spec2def(slayer.dll slayer.spec)

@@ -1,6 +1,6 @@

 set_unicode()
-
+set_rc_compiler()
 spec2def(acledit.dll acledit.spec)

 list(APPEND SOURCE
@@ -1,6 +1,6 @@

 spec2def(aclui.dll aclui.spec)
-
+set_rc_compiler()
 set_unicode()

 add_definitions(-DSUPPORT_UXTHEME)
@@ -8,6 +8,8 @@ add_definitions(-D_WIN32_WINNT=0x600)

 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)

+set_rc_compiler()
+
 spec2def(avifil32.dll avifil32.spec)

 add_library(avifil32 SHARED
@@ -2,6 +2,7 @@
 spec2def(batt.dll batt.spec)

 set_unicode()
+set_rc_compiler()

 add_library(batt SHARED
    batt.c
@@ -4,6 +4,8 @@ set_unicode()
 # Possible definitions: CARDSTYLE_DEFAULT or CARDSTYLE_BAVARIAN
 add_definitions(-DCARDSTYLE_DEFAULT)

+set_rc_compiler()
+
 spec2def(cards.dll cards.spec)

 list(APPEND SOURCE
@@ -1,5 +1,6 @@

 set_unicode()
+set_rc_compiler()

 add_definitions(
    -D__WINESRC__
@@ -1,5 +1,6 @@

 set_unicode()
+set_rc_compiler()

 spec2def(devmgr.dll devmgr.spec)

@@ -6,6 +6,7 @@ add_definitions(-D_WIN32_WINNT=0x600)

 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)

+set_rc_compiler()
 spec2def(hhctrl.ocx hhctrl.ocx.spec)

 add_library(hhctrl SHARED
@@ -3,6 +3,8 @@ add_definitions(-D__WINESRC__)

 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)

+set_rc_compiler()
+
 spec2def(iccvid.dll iccvid.spec)

 list(APPEND SOURCE
@@ -15,6 +15,8 @@ add_definitions(

 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)

+set_rc_compiler()
+
 spec2def(jscript.dll jscript.spec)

 list(APPEND SOURCE
@@ -6,6 +6,10 @@ add_definitions(-D_WIN32_WINNT=0x600)

 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/subsys)

+set_rc_compiler()
+
+set_rc_compiler()
+
 spec2def(kernel32.dll kernel32.spec)

 list(APPEND SOURCE
@@ -2,6 +2,8 @@
 add_definitions(-D__WINESRC__)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)

+set_rc_compiler()
+
 spec2def(localui.dll localui.spec)

 list(APPEND SOURCE
@@ -1,5 +1,6 @@

 set_unicode()
+set_rc_compiler()

 spec2def(modemui.dll modemui.spec)

@@ -5,6 +5,7 @@ add_definitions(-D__WINESRC__ -DMSIRUNMODE=MSIRUNMODE_T)
 remove_definitions(-D_WIN32_WINNT=0x502)
 add_definitions(-D_WIN32_WINNT=0x600)

+set_rc_compiler()
 spec2def(msi.dll msi.spec)

 generate_idl_iids(msiserver.idl)
@@ -5,6 +5,8 @@ add_definitions(

 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)

+set_rc_compiler()
+
 spec2def(msrle32.dll msrle32.spec)

 list(APPEND SOURCE
@@ -9,6 +9,8 @@ add_definitions(-D_WIN32_WINNT=0x600)

 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)

+set_rc_compiler()
+
 generate_idl_iids(mstask_local.idl)

 spec2def(mstask.dll mstask.spec)
@@ -1,5 +1,6 @@

 spec2def(netid.dll netid.spec)
+set_rc_compiler()

 list(APPEND SOURCE
    netid.c
@@ -1,4 +1,6 @@

+set_rc_compiler()
+
 spec2def(ole32.dll ole32.spec)
 generate_idl_iids(dcom.idl)
 add_idl_headers(ole32idl dcom.idl irot.idl)
@@ -2,6 +2,8 @@
 add_definitions(-D__WINESRC__)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)

+set_rc_compiler()
+
 generate_idl_iids(qmgr_local.idl)

 spec2def(qmgr.dll qmgr.spec)
@@ -1,4 +1,5 @@

+set_rc_compiler()
 spec2def(rasdlg.dll rasdlg.spec)

 list(APPEND SOURCE
@@ -6,6 +6,7 @@ add_definitions(
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)

 spec2def(riched20.dll riched20.spec)
+set_rc_compiler()

 list(APPEND SOURCE
    caret.c
@@ -1,6 +1,6 @@

 set_unicode()
-
+set_rc_compiler()
 spec2def(serialui.dll serialui.spec)

 list(APPEND SOURCE
@@ -1,8 +1,11 @@

 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)

+set_rc_compiler()
 spec2def(shdoclc.dll shdoclc.spec)

+set_rc_compiler()
+
 add_library(shdoclc SHARED rsrc.rc
    ${CMAKE_CURRENT_BINARY_DIR}/shdoclc.def)

@@ -5,6 +5,8 @@ add_dependencies(shdocvw_v1 stdole2)
 add_definitions(-D_SHDOCVW_)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)

+set_rc_compiler()
+
 spec2def(shdocvw.dll shdocvw.spec)

 list(APPEND SOURCE
@@ -1,4 +1,5 @@

+set_rc_compiler()
 spec2def(shimgvw.dll shimgvw.spec)

 list(APPEND SOURCE
@@ -32,17 +32,17 @@ FONT 8, "MS Shell Dlg"
 {
 LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20
 LTEXT "", IDS_ERR_USER_MSG, 15, 5, 210, 8
- CHECKBOX "Ne jelení&tse meg ezt az üzenetet mégegyszer", IDC_ERR_DONT_SHOW, 5, 20, 210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+ CHECKBOX "Ne jelení&tse meg ezt az üzenetet mégegyszer", IDC_ERR_DONT_SHOW, 5, 20, 210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
 PUSHBUTTON L"&OK", IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON L"&Mégse", IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON L"&Mégse", IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP
 PUSHBUTTON L"&Igen", IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP
 PUSHBUTTON L"&Nem", IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP
 }

 STRINGTABLE
 {
-    IDS_BYTES_FORMAT    "%ld bájt"
-    IDS_TIME_INTERVAL_HOURS    " óra"
+    IDS_BYTES_FORMAT    "%ld bájt"
+    IDS_TIME_INTERVAL_HOURS    " óra"
    IDS_TIME_INTERVAL_MINUTES  " perc"
    IDS_TIME_INTERVAL_SECONDS  " mp"
 }
@@ -2,8 +2,8 @@
 * Portuguese resources for shlwapi
 *
 * Copyright 2004 Marcelo Duarte
- * Copyright 2006 Américo José Melo
- * Copyright 2010 Gustavo Henrique Milaré
+ * Copyright 2006 Américo José Melo
+ * Copyright 2010 Gustavo Henrique Milaré
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser General Public
@@ -33,11 +33,11 @@ FONT 8, "MS Shell Dlg"
 {
 LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20
 LTEXT "", IDS_ERR_USER_MSG, 15, 5, 210, 8
- CHECKBOX "Não &mostrar esta mensagem novamente", IDC_ERR_DONT_SHOW, 5, 20, 210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+ CHECKBOX "Não &mostrar esta mensagem novamente", IDC_ERR_DONT_SHOW, 5, 20, 210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
 PUSHBUTTON L"&OK", IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP
 PUSHBUTTON L"&Cancelar", IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP
 PUSHBUTTON L"&Sim", IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON L"&Não", IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON L"&Não", IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP
 }

 STRINGTABLE
@@ -1,6 +1,9 @@

+set_rc_compiler()
+
+set_rc_compiler()
+
 add_library(tapiui SHARED tapiui.rc)
 set_entrypoint(tapiui 0)
 add_dependencies(tapiui psdk)
-
 add_cab_target(tapiui 1)
@@ -6,6 +6,8 @@ add_definitions(-D_WIN32_WINNT=0x600)

 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)

+set_rc_compiler()
+
 spec2def(urlmon.dll urlmon.spec)

 add_rpcproxy_library(urlmonproxy urlmon_urlmon.idl)
@@ -1,6 +1,8 @@

 spec2def(userenv.dll userenv.spec)

+set_rc_compiler()
+
 list(APPEND SOURCE
    desktop.c
    directory.c
@@ -2,6 +2,7 @@
 include_directories(inc)

 set_cpp()
+set_rc_compiler()

 add_library(uniata SHARED
    id_ata.cpp
@@ -1,4 +1,6 @@

+set_rc_compiler()
+
 add_library(buslogic SHARED BusLogic958.c BusLogic958.rc)

 target_link_libraries(buslogic libcntpr)
@@ -10,7 +10,14 @@ set(CMAKE_EXE_LINKER_FLAGS "-nodefaultlibs -nostdlib -Wl,--enable-auto-image-bas
 # -Wl,-T,${REACTOS_SOURCE_DIR}/global.lds
 set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS_INIT} -Wl,--disable-stdcall-fixup")

-set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> -i <SOURCE> <CMAKE_C_LINK_FLAGS> <DEFINES> -I${REACTOS_SOURCE_DIR}/include/psdk -I${REACTOS_BINARY_DIR}/include/psdk -I${REACTOS_SOURCE_DIR}/include/ -I${REACTOS_SOURCE_DIR}/include/reactos -I${REACTOS_BINARY_DIR}/include/reactos -I${REACTOS_SOURCE_DIR}/include/reactos/wine -I${REACTOS_SOURCE_DIR}/include/crt -I${REACTOS_SOURCE_DIR}/include/crt/mingw32 -O coff -o <OBJECT>")
+#set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> -i <SOURCE> <CMAKE_C_LINK_FLAGS> <DEFINES> -I${REACTOS_SOURCE_DIR}/include/psdk -I${REACTOS_BINARY_DIR}/include/psdk -I${REACTOS_SOURCE_DIR}/include/ -I${REACTOS_SOURCE_DIR}/include/reactos -I${REACTOS_BINARY_DIR}/include/reactos -I${REACTOS_SOURCE_DIR}/include/reactos/wine -I${REACTOS_SOURCE_DIR}/include/crt -I${REACTOS_SOURCE_DIR}/include/crt/mingw32 -O coff -o <OBJECT>")
+
+# Temporary, until windres issues are fixed
+get_target_property(WRC native-wrc IMPORTED_LOCATION_NOCONFIG)
+set(CMAKE_RC_COMPILE_OBJECT
+    "<CMAKE_C_COMPILER> -DRC_INVOKED -D__WIN32__=1 -D__FLAT__=1 <DEFINES> -I${REACTOS_SOURCE_DIR}/include/psdk -I${REACTOS_BINARY_DIR}/include/psdk -I${REACTOS_SOURCE_DIR}/include/ -I${REACTOS_SOURCE_DIR}/include/reactos -I${REACTOS_BINARY_DIR}/include/reactos -I${REACTOS_SOURCE_DIR}/include/reactos/wine -I${REACTOS_SOURCE_DIR}/include/crt -I${REACTOS_SOURCE_DIR}/include/crt/mingw32 -xc -E <SOURCE> -o <OBJECT>"
+    "${WRC} -i <OBJECT> -o <OBJECT>"
+    "<CMAKE_RC_COMPILER> -i <OBJECT> -J res -O coff -o <OBJECT>")

 if(NOT CMAKE_HOST_SYSTEM_NAME MATCHES Windows)
 	set(CMAKE_C_CREATE_STATIC_LIBRARY "<CMAKE_AR> crs <TARGET> <LINK_FLAGS> <OBJECTS>")
@@ -190,7 +197,7 @@ macro(set_module_type MODULE TYPE)
        endif(NOT IS_UNICODE)
        target_link_libraries(${MODULE} mingw_common)
    elseif(${TYPE} MATCHES win32dll)
-        set_entrypoint(${MODULE} DllMain 12)
+		set_entrypoint(${MODULE} DllMain 12)
        target_link_libraries(${MODULE} mingw_dllmain mingw_common)
        if(DEFINED baseaddress_${MODULE})
            set_image_base(${MODULE} ${baseaddress_${MODULE}})
@@ -236,7 +243,11 @@ macro(set_rc_compiler)
        set(rc_result_incs "-I${arg} ${rc_result_incs}")
    endforeach()

-    set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> ${rc_result_defs} ${rc_result_incs} -i <SOURCE> -O coff -o <OBJECT>")
+    #set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> ${rc_result_defs} ${rc_result_incs} -i <SOURCE> -O coff -o <OBJECT>")
+    set(CMAKE_RC_COMPILE_OBJECT
+    "<CMAKE_C_COMPILER> -DRC_INVOKED -D__WIN32__=1 -D__FLAT__=1 ${rc_result_defs} -I${CMAKE_CURRENT_SOURCE_DIR} ${rc_result_incs} -xc -E <SOURCE> -o <OBJECT>"
+    "${WRC} -I${CMAKE_CURRENT_SOURCE_DIR} -i <OBJECT> -o <OBJECT>"
+    "<CMAKE_RC_COMPILER> -i <OBJECT> -J res -O coff -o <OBJECT>")
 endmacro()

 #idl files support