* MinGWResourceCompiler: change output directory and name of compiled resource file (old resource object files have to be deleted manually, eg. cvpcb/cvpcb_rc.o since the 'make clean' target does not remove them).
* Add some comments.
This commit is contained in:
f3nix 2008-04-18 08:04:54 +00:00
parent 721d878fcf
commit 5cd2fad850
6 changed files with 7 additions and 1 deletions

View File

@ -10,7 +10,7 @@ macro(mingw_resource_compiler _NAME)
dbg_msg("_IN: ${_IN}") dbg_msg("_IN: ${_IN}")
# Output file. # Output file.
set(_OUT "${CMAKE_CURRENT_BINARY_DIR}/${_NAME}_rc.o") set(_OUT "${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/${_NAME}.dir/${_NAME}_rc.obj")
dbg_msg("_OUT: ${_OUT}") dbg_msg("_OUT: ${_OUT}")
# Include directories. # Include directories.
@ -28,6 +28,7 @@ macro(mingw_resource_compiler _NAME)
add_custom_command(OUTPUT ${_OUT} add_custom_command(OUTPUT ${_OUT}
COMMAND windres.exe COMMAND windres.exe
ARGS ${_ARGS} ARGS ${_ARGS}
COMMENT "Compiling ${_NAME} resource file."
VERBATIM) VERBATIM)
# Set a NAME_RESOURCES variable # Set a NAME_RESOURCES variable

View File

@ -58,6 +58,7 @@ set(CVPCB_EXTRA_SRCS
if(WIN32) if(WIN32)
if(MINGW) if(MINGW)
# CVPCB_RESOURCES variable is set by the macro.
mingw_resource_compiler(cvpcb) mingw_resource_compiler(cvpcb)
else(MINGW) else(MINGW)
set(CVPCB_RESOURCES cvpcb.rc) set(CVPCB_RESOURCES cvpcb.rc)

View File

@ -103,6 +103,7 @@ set(EESCHEMA_EXTRA_SRCS
if(WIN32) if(WIN32)
if(MINGW) if(MINGW)
# EESCHEMA_RESOURCES variable is set by the macro.
mingw_resource_compiler(eeschema) mingw_resource_compiler(eeschema)
else(MINGW) else(MINGW)
set(EESCHEMA_RESOURCES eeschema.rc) set(EESCHEMA_RESOURCES eeschema.rc)

View File

@ -60,6 +60,7 @@ set(GERBVIEW_EXTRA_SRCS
if(WIN32) if(WIN32)
if(MINGW) if(MINGW)
# GERBVIEW_RESOURCES variable is set by the macro.
mingw_resource_compiler(gerbview) mingw_resource_compiler(gerbview)
else(MINGW) else(MINGW)
set(GERBVIEW_RESOURCES gerbview.rc) set(GERBVIEW_RESOURCES gerbview.rc)

View File

@ -15,6 +15,7 @@ set(KICAD_SRCS
if(WIN32) if(WIN32)
if(MINGW) if(MINGW)
# KICAD_RESOURCES variable is set by the macro.
mingw_resource_compiler(kicad) mingw_resource_compiler(kicad)
else(MINGW) else(MINGW)
set(KICAD_RESOURCES kicad.rc) set(KICAD_RESOURCES kicad.rc)

View File

@ -151,6 +151,7 @@ set(PCBNEW_EXTRA_SRCS
if(WIN32) if(WIN32)
if(MINGW) if(MINGW)
# PCBNEW_RESOURCES variable is set by the macro.
mingw_resource_compiler(pcbnew) mingw_resource_compiler(pcbnew)
else(MINGW) else(MINGW)
set(PCBNEW_RESOURCES pcbnew.rc) set(PCBNEW_RESOURCES pcbnew.rc)