Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 49510: [CMAKE] - Add acledit.pdef
by akhaldi＠svn.reactos.org 06 Nov '10

06 Nov '10

Author: akhaldi Date: Sat Nov 6 11:43:26 2010 New Revision: 49510 URL: http://svn.reactos.org/svn/reactos?rev=49510&view=rev Log: [CMAKE] - Add acledit.pdef Added: branches/cmake-bringup/dll/win32/acledit/acledit.pdef (with props) Added: branches/cmake-bringup/dll/win32/acledit/acledit.pdef URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/acledit… ============================================================================== --- branches/cmake-bringup/dll/win32/acledit/acledit.pdef (added) +++ branches/cmake-bringup/dll/win32/acledit/acledit.pdef [iso-8859-1] Sat Nov 6 11:43:26 2010 @@ -1,0 +1,24 @@ +; File generated automatically, do not edit! + +LIBRARY acledit.dll + +EXPORTS +#define FOOL(x) x +#ifdef _MSC_VER +#define _NAME_STDCALL(name, stackbytes) name +#define _NAME_FASTCALL(name, stackbytes) name +#define _NAME_CDECL(name, stackbytes) name +#else +#define _NAME_STDCALL(name, stackbytes) FOOL(name)@stackbytes +#define _NAME_FASTCALL(name, stackbytes) FOOL(@)FOOL(name)@stackbytes +#define _NAME_CDECL(name, stackbytes) FOOL(name) +#endif +#define _NAME_EXTERN(name, stackbytes) name +#define _NAME(name, cc, stackbytes) _NAME_##cc(name, stackbytes) +_NAME(EditAuditInfo,STDCALL,4) +_NAME(EditOwnerInfo,STDCALL,4) +_NAME(EditPermissionInfo,STDCALL,4) +_NAME(FMExtensionProcW,STDCALL,12) +_NAME(SedDiscretionaryAclEditor,STDCALL,52) +_NAME(SedSystemAclEditor,STDCALL,48) +_NAME(SedTakeOwnership,STDCALL,56) Propchange: branches/cmake-bringup/dll/win32/acledit/acledit.pdef ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[akhaldi] 49509: [CMAKE] - Add a preprocessed definition file for acledit. - Add the pdef2def macro. - Include wpp into build, widl links to it. - Fix libmpg123.
by akhaldi＠svn.reactos.org 06 Nov '10

06 Nov '10

Author: akhaldi Date: Sat Nov 6 11:31:38 2010 New Revision: 49509 URL: http://svn.reactos.org/svn/reactos?rev=49509&view=rev Log: [CMAKE] - Add a preprocessed definition file for acledit. - Add the pdef2def macro. - Include wpp into build, widl links to it. - Fix libmpg123. Modified: branches/cmake-bringup/dll/win32/acledit/CMakeLists.txt branches/cmake-bringup/gcc.cmake branches/cmake-bringup/lib/3rdparty/libmpg123/CMakeLists.txt branches/cmake-bringup/msc.cmake branches/cmake-bringup/tools/CMakeLists.txt Modified: branches/cmake-bringup/dll/win32/acledit/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/acledit… ============================================================================== --- branches/cmake-bringup/dll/win32/acledit/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/acledit/CMakeLists.txt [iso-8859-1] Sat Nov 6 11:31:38 2010 @@ -1,14 +1,16 @@ set_unicode() + +pdef2def(acledit.pdef) list(APPEND SOURCE acledit.c stubs.c acledit.rc - acledit.def) + ${CMAKE_CURRENT_BINARY_DIR}/acledit.def) if(NOT MSVC) - set_source_files_properties(acledit.def PROPERTIES EXTERNAL_OBJECT TRUE) + set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/acledit.def PROPERTIES EXTERNAL_OBJECT TRUE) endif() add_library(acledit SHARED ${SOURCE}) Modified: branches/cmake-bringup/gcc.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/gcc.cmake?rev=495… ============================================================================== --- branches/cmake-bringup/gcc.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/gcc.cmake [iso-8859-1] Sat Nov 6 11:31:38 2010 @@ -159,6 +159,16 @@ # empty for now, while import libs are shipped endmacro() +macro(pdef2def _pdef_file) + get_filename_component(_file ${_pdef_file} NAME_WE) + add_custom_command( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_file}.def + COMMAND ${MINGW_PREFIX}cpp -o ${CMAKE_CURRENT_BINARY_DIR}/${_file}.def -P -E ${CMAKE_CURRENT_SOURCE_DIR}/${_pdef_file} + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_pdef_file}) + set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${_file}.def + PROPERTIES GENERATED TRUE EXTERNAL_OBJECT TRUE) +endmacro(pdef2def _pdef_file) + #pseh lib, needed with mingw set(PSEH_LIB "pseh") Modified: branches/cmake-bringup/lib/3rdparty/libmpg123/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/3rdparty/libm… ============================================================================== --- branches/cmake-bringup/lib/3rdparty/libmpg123/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/3rdparty/libmpg123/CMakeLists.txt [iso-8859-1] Sat Nov 6 11:31:38 2010 @@ -7,7 +7,8 @@ -DEOVERFLOW=75 -Dlseek=_lseek -Dread=_read - -Dstrdup=_strdup) + -Dstrdup=_strdup + -D_DLL -D__USE_CRTIMP) include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/libs/libmpg123) Modified: branches/cmake-bringup/msc.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/msc.cmake?rev=495… ============================================================================== --- branches/cmake-bringup/msc.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/msc.cmake [iso-8859-1] Sat Nov 6 11:31:38 2010 @@ -121,6 +121,10 @@ endforeach() endmacro() +macro(pdef2def _pdef_file) +# Dummy for now +endmacro() + file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/importlibs) #pseh workaround Modified: branches/cmake-bringup/tools/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/tools/CMakeLists.… ============================================================================== --- branches/cmake-bringup/tools/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/tools/CMakeLists.txt [iso-8859-1] Sat Nov 6 11:31:38 2010 @@ -9,11 +9,12 @@ add_subdirectory(gendib) add_subdirectory(mkhive) add_subdirectory(nci) +#add_subdirectory(spec2pdef) add_subdirectory(unicode) add_subdirectory(winebuild) if(NOT MSVC) #add_subdirectory(rsym) -#add_subdirectory(wpp) +add_subdirectory(wpp) #add_subdirectory(wmc) add_subdirectory(widl) #add_subdirectory(wrc)

1 0

[tkreuzer] 49508: [spec2pdef] Add library name as 3rd parameter and use it in the header. Print syntax when less than 3 parameters are given.
by tkreuzer＠svn.reactos.org 06 Nov '10

06 Nov '10

Author: tkreuzer Date: Sat Nov 6 11:15:12 2010 New Revision: 49508 URL: http://svn.reactos.org/svn/reactos?rev=49508&view=rev Log: [spec2pdef] Add library name as 3rd parameter and use it in the header. Print syntax when less than 3 parameters are given. Modified: branches/cmake-bringup/tools/spec2pdef/spec2pdef.c Modified: branches/cmake-bringup/tools/spec2pdef/spec2pdef.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/tools/spec2pdef/s… ============================================================================== --- branches/cmake-bringup/tools/spec2pdef/spec2pdef.c [iso-8859-1] (original) +++ branches/cmake-bringup/tools/spec2pdef/spec2pdef.c [iso-8859-1] Sat Nov 6 11:15:12 2010 @@ -1,6 +1,7 @@ #include <stdio.h> #include <stdlib.h> #include <ctype.h> +#include <string.h> enum { @@ -265,11 +266,11 @@ } void -OutputHeader(FILE *file) +OutputHeader(FILE *file, char *libname) { fprintf(file, "; File generated automatically, do not edit!\n\n" - "LIBRARY ntoskrnl.exe\n\n" + "LIBRARY %s\n\n" "EXPORTS\n" "#define FOOL(x) x\n" "#ifdef _MSC_VER\n" @@ -282,9 +283,14 @@ "#define _NAME_CDECL(name, stackbytes) FOOL(name)\n" "#endif\n" "#define _NAME_EXTERN(name, stackbytes) name\n" - "#define _NAME(name, cc, stackbytes) _NAME_##cc(name, stackbytes)\n"); -} - + "#define _NAME(name, cc, stackbytes) _NAME_##cc(name, stackbytes)\n", + libname); +} + +void usage(void) +{ + printf("syntax: spec2pdef <source file> <dest file> <libname>\n"); +} int main(int argc, char *argv[]) { @@ -294,6 +300,12 @@ FILE *fileSource, *fileDest; EXPORT exp; + if (argc < 4) + { + usage(); + return 0; + } + /* Open input file argv[1] */ fileSource = fopen(argv[1], "r"); if (!fileSource) @@ -325,7 +337,7 @@ return -1; } - OutputHeader(fileDest); + OutputHeader(fileDest, argv[3]); pcLine = pszSource; for (nLine = 1; *pcLine != 0; pcLine = NextLine(pcLine), nLine++)

1 0

[fireball] 49507: Create a branch for Oleg's network bringup.
by fireball＠svn.reactos.org 06 Nov '10

06 Nov '10

Author: fireball Date: Sat Nov 6 09:37:26 2010 New Revision: 49507 URL: http://svn.reactos.org/svn/reactos?rev=49507&view=rev Log: Create a branch for Oleg's network bringup. Added: branches/baikalnet/ (props changed) - copied from r49501, trunk/reactos/ Propchange: branches/baikalnet/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sat Nov 6 09:37:26 2010 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: branches/baikalnet/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: branches/baikalnet/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: branches/baikalnet/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sat Nov 6 09:37:26 2010 @@ -1,0 +1,14 @@ +*.iso +makefile.auto +makefile-*.auto +config-*.rbuild +obj-* +output-* +reactos +reactos.* +RosBE-Logs +*.sln +*.ncb +*.suo +versionreport.xml +config.rbuild Propchange: branches/baikalnet/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Sat Nov 6 09:37:26 2010 @@ -1,0 +1,4 @@ +/branches/header-work:45691-47721 +/branches/reactos-yarotows:45219-46371,46373-48025,48027-49273 +/branches/ros-amd64-bringup:36852 +/branches/ros-amd64-bringup/reactos:34711-34712,34741,34743,34770,34780-34782,34803,34812,34839,34842,34864,34870,34874,34877,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35655,35683,35739,35746,35762,35771,35777,35781,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36011-36013,36172,36360,36380,36388-36389,36393,36397,36443,36445,36475,36502-36503,36505,36570,36614,36852,36898-36899,36930,36936,36949,36951,36958,36961,36964,36969,36972,36987-36988,36990,36992,37019,37322-37323,37333-37334,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38092,38100,38148-38151,38264-38265,38268,38355,39151,39333,39335,39345,39639,40120,40122-40123,40125,40127-40128,40155,40247,40324,40608,40753,40926-40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41070,41082-41086,41097-41098,41101,41449,41479-41480,41483-41485,41499-41500,41502,41531,41536,41540,41546-41547,41549,43080,43426,43451,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43836,43838-43840,43852,43857-43858,43860,43905-43907,43952,43954,43965,43969,43979,43981,43992,44002,44036-44037,44039-44040,44044-44045,44053,44065,44095,44123,44143-44144,44205,44238,44257,44259,44294,44338-44339,44385,44389,44391,44426,44460,44467-44468,44470-44471,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44634,44639,44772,44818,45124,45126-45127,45430,46394,46404,46478,46511,46523-46524,46526,46534-46535,46537-46539,46589,46805,46868,47472,47846-47847,47878,47882 Propchange: branches/baikalnet/ ------------------------------------------------------------------------------ tsvn:logminsize = 10

1 0

[tkreuzer] 49506: [MINGW] #if 0 _matherr(). We already have it in our crt and it's exported from msvcrt. MSVC doesn't like when it's there twice.
by tkreuzer＠svn.reactos.org 06 Nov '10

06 Nov '10

Author: tkreuzer Date: Sat Nov 6 09:17:04 2010 New Revision: 49506 URL: http://svn.reactos.org/svn/reactos?rev=49506&view=rev Log: [MINGW] #if 0 _matherr(). We already have it in our crt and it's exported from msvcrt. MSVC doesn't like when it's there twice. Modified: branches/cmake-bringup/lib/3rdparty/mingw/merr.c Modified: branches/cmake-bringup/lib/3rdparty/mingw/merr.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/3rdparty/ming… ============================================================================== --- branches/cmake-bringup/lib/3rdparty/mingw/merr.c [iso-8859-1] (original) +++ branches/cmake-bringup/lib/3rdparty/mingw/merr.c [iso-8859-1] Sat Nov 6 09:17:04 2010 @@ -10,6 +10,7 @@ int __defaultmatherr = 0; +#if 0 int __CRTDECL _matherr (struct _exception *pexcept) { @@ -51,3 +52,4 @@ return 0; } +#endif

1 0

[tkreuzer] 49505: [MINGW] Don't define __ImageBase to something else on MSVC builds
by tkreuzer＠svn.reactos.org 06 Nov '10

06 Nov '10

Author: tkreuzer Date: Sat Nov 6 00:25:57 2010 New Revision: 49505 URL: http://svn.reactos.org/svn/reactos?rev=49505&view=rev Log: [MINGW] Don't define __ImageBase to something else on MSVC builds Modified: branches/cmake-bringup/lib/3rdparty/mingw/crt_handler.c branches/cmake-bringup/lib/3rdparty/mingw/crtexe.c branches/cmake-bringup/lib/3rdparty/mingw/pesect.c branches/cmake-bringup/lib/3rdparty/mingw/pseudo-reloc.c Modified: branches/cmake-bringup/lib/3rdparty/mingw/crt_handler.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/3rdparty/ming… ============================================================================== --- branches/cmake-bringup/lib/3rdparty/mingw/crt_handler.c [iso-8859-1] (original) +++ branches/cmake-bringup/lib/3rdparty/mingw/crt_handler.c [iso-8859-1] Sat Nov 6 00:25:57 2010 @@ -16,7 +16,9 @@ #if defined (_WIN64) && defined (__ia64__) #error FIXME: Unsupported __ImageBase implementation. #else +#ifndef _MSC_VER #define __ImageBase __MINGW_LSYMBOL(_image_base__) +#endif /* This symbol is defined by the linker. */ extern IMAGE_DOS_HEADER __ImageBase; #endif Modified: branches/cmake-bringup/lib/3rdparty/mingw/crtexe.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/3rdparty/ming… ============================================================================== --- branches/cmake-bringup/lib/3rdparty/mingw/crtexe.c [iso-8859-1] (original) +++ branches/cmake-bringup/lib/3rdparty/mingw/crtexe.c [iso-8859-1] Sat Nov 6 00:25:57 2010 @@ -33,7 +33,10 @@ #endif /* Hack, for bug in ld. Will be removed soon. */ +#ifndef _MSC_VER #define __ImageBase __MINGW_LSYMBOL(_image_base__) +#endif + /* This symbol is defined by ld. */ extern IMAGE_DOS_HEADER __ImageBase; Modified: branches/cmake-bringup/lib/3rdparty/mingw/pesect.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/3rdparty/ming… ============================================================================== --- branches/cmake-bringup/lib/3rdparty/mingw/pesect.c [iso-8859-1] (original) +++ branches/cmake-bringup/lib/3rdparty/mingw/pesect.c [iso-8859-1] Sat Nov 6 00:25:57 2010 @@ -11,7 +11,9 @@ #error FIXME: Unsupported __ImageBase implementation. #else /* Hack, for bug in ld. Will be removed soon. */ +#ifndef _MSC_VER #define __ImageBase __MINGW_LSYMBOL(_image_base__) +#endif /* This symbol is defined by the linker. */ extern IMAGE_DOS_HEADER __ImageBase; #endif Modified: branches/cmake-bringup/lib/3rdparty/mingw/pseudo-reloc.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/3rdparty/ming… ============================================================================== --- branches/cmake-bringup/lib/3rdparty/mingw/pseudo-reloc.c [iso-8859-1] (original) +++ branches/cmake-bringup/lib/3rdparty/mingw/pseudo-reloc.c [iso-8859-1] Sat Nov 6 00:25:57 2010 @@ -46,7 +46,10 @@ extern char __RUNTIME_PSEUDO_RELOC_LIST__; extern char __RUNTIME_PSEUDO_RELOC_LIST_END__; -extern char __MINGW_LSYMBOL(_image_base__); +#ifndef _MSC_VER +#define __ImageBase __MINGW_LSYMBOL(_image_base__) +#endif +extern char __ImageBase; void _pei386_runtime_relocator (void); @@ -363,5 +366,5 @@ ++was_init; do_pseudo_reloc (&__RUNTIME_PSEUDO_RELOC_LIST__, &__RUNTIME_PSEUDO_RELOC_LIST_END__, - &__MINGW_LSYMBOL(_image_base__)); + &__ImageBase); }

1 0

[akhaldi] 49504: [CMAKE] - Fix and enable browseui.
by akhaldi＠svn.reactos.org 05 Nov '10

05 Nov '10

Author: akhaldi Date: Fri Nov 5 23:25:51 2010 New Revision: 49504 URL: http://svn.reactos.org/svn/reactos?rev=49504&view=rev Log: [CMAKE] - Fix and enable browseui. Modified: branches/cmake-bringup/dll/win32/CMakeLists.txt branches/cmake-bringup/dll/win32/browseui/CMakeLists.txt Modified: branches/cmake-bringup/dll/win32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/CMakeLi… ============================================================================== --- branches/cmake-bringup/dll/win32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/CMakeLists.txt [iso-8859-1] Fri Nov 5 23:25:51 2010 @@ -12,7 +12,7 @@ add_subdirectory(batt) add_subdirectory(bcrypt) add_subdirectory(beepmidi) -#add_subdirectory(browseui) #FIXME: shellbrowser.cpp:152: error: expected constructor, destructor, or type conversion before 'SHAlloc' +add_subdirectory(browseui) add_subdirectory(cabinet) add_subdirectory(cards) add_subdirectory(cfgmgr32) @@ -40,7 +40,7 @@ add_subdirectory(gdi32) add_subdirectory(gdiplus) add_subdirectory(getuname) -add_subdirectory(glu32)# FIXME: set_cpp()? +add_subdirectory(glu32) add_subdirectory(hhctrl.ocx) add_subdirectory(hid) add_subdirectory(hlink) Modified: branches/cmake-bringup/dll/win32/browseui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/browseu… ============================================================================== --- branches/cmake-bringup/dll/win32/browseui/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/browseui/CMakeLists.txt [iso-8859-1] Fri Nov 5 23:25:51 2010 @@ -1,11 +1,17 @@ set_unicode() -add_definitions(-D__WINESRC__) +add_definitions( + -D__WINESRC__ + -DUNICODE -D_UNICODE + -DROS_Headers) + remove_definitions(-D_WIN32_WINNT=0x502) add_definitions(-D_WIN32_WINNT=0x600) -include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -include_directories(${REACTOS_SOURCE_DIR}/lib/atl) + +include_directories( + ${REACTOS_SOURCE_DIR}/include/reactos/wine + ${REACTOS_SOURCE_DIR}/lib/atl) spec2def(browseui.dll browseui.spec) @@ -34,13 +40,16 @@ set_module_type(browseui win32dll) +target_link_libraries(browseui stlport -lsupc++ -lgcc) + target_link_libraries(browseui atlnew uuid wine) add_importlibs(browseui - msvcrt + mingw32 + coldname shlwapi shell32 comctl32 @@ -49,6 +58,8 @@ oleaut32 user32 advapi32 + msvcrt + kernel32 ntdll) add_cab_target(browseui 1)

1 0

[akhaldi] 49503: [CMAKE] - Explicitly disable auto imports for executables. - Set a proper linker invocation for C++ modules.
by akhaldi＠svn.reactos.org 05 Nov '10

05 Nov '10

Author: akhaldi Date: Fri Nov 5 23:17:29 2010 New Revision: 49503 URL: http://svn.reactos.org/svn/reactos?rev=49503&view=rev Log: [CMAKE] - Explicitly disable auto imports for executables. - Set a proper linker invocation for C++ modules. Modified: branches/cmake-bringup/gcc.cmake Modified: branches/cmake-bringup/gcc.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/gcc.cmake?rev=495… ============================================================================== --- branches/cmake-bringup/gcc.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/gcc.cmake [iso-8859-1] Fri Nov 5 23:17:29 2010 @@ -1,9 +1,7 @@ - if(NOT CMAKE_CROSSCOMPILING) add_definitions(-fshort-wchar) - else() @@ -11,14 +9,14 @@ link_directories("${REACTOS_SOURCE_DIR}/importlibs" ${REACTOS_BINARY_DIR}/lib/3rdparty/mingw) set(CMAKE_C_LINK_EXECUTABLE "<CMAKE_C_COMPILER> <FLAGS> <CMAKE_C_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES>") set(CMAKE_CXX_LINK_EXECUTABLE "<CMAKE_CXX_COMPILER> <FLAGS> <CMAKE_CXX_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES>") -set(CMAKE_EXE_LINKER_FLAGS "-nodefaultlibs -nostdlib -Wl,--enable-auto-image-base -Wl,--kill-at") +set(CMAKE_EXE_LINKER_FLAGS "-nodefaultlibs -nostdlib -Wl,--enable-auto-image-base -Wl,--kill-at -Wl,--disable-auto-import") # -Wl,-T,${REACTOS_SOURCE_DIR}/global.lds # Compiler Core add_definitions(-pipe -fms-extensions) set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>") - +set(CMAKE_CXX_CREATE_SHARED_LIBRARY "<CMAKE_CXX_COMPILER> <CMAKE_SHARED_LIBRARY_CXX_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>") set(CMAKE_RC_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>") # Debugging (Note: DWARF-4 on 4.5.1 when we ship)

1 0

[spetreolle] 49502: [CMAKE] Bootcd/Livecd : Add dplayx, ntfs and mup. Add forgotten wined3d importlib, my bad.
by spetreolle＠svn.reactos.org 05 Nov '10

05 Nov '10

Author: spetreolle Date: Fri Nov 5 23:14:29 2010 New Revision: 49502 URL: http://svn.reactos.org/svn/reactos?rev=49502&view=rev Log: [CMAKE] Bootcd/Livecd : Add dplayx, ntfs and mup. Add forgotten wined3d importlib, my bad. Added: branches/cmake-bringup/dll/directx/dplayx/CMakeLists.txt (with props) branches/cmake-bringup/importlibs/libwined3d.a (with props) Modified: branches/cmake-bringup/dll/directx/CMakeLists.txt branches/cmake-bringup/drivers/filesystems/mup/CMakeLists.txt branches/cmake-bringup/drivers/filesystems/ntfs/CMakeLists.txt branches/cmake-bringup/media/CMakeLists.txt Modified: branches/cmake-bringup/dll/directx/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/CMake… ============================================================================== --- branches/cmake-bringup/dll/directx/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/directx/CMakeLists.txt [iso-8859-1] Fri Nov 5 23:14:29 2010 @@ -10,7 +10,7 @@ add_subdirectory(dinput8) add_subdirectory(dmusic) add_subdirectory(dplay) -#add_subdirectory(dplayx) +add_subdirectory(dplayx) add_subdirectory(dsound) #add_subdirectory(dsound_new) add_subdirectory(dxdiagn) Added: branches/cmake-bringup/dll/directx/dplayx/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/dplay… ============================================================================== --- branches/cmake-bringup/dll/directx/dplayx/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/directx/dplayx/CMakeLists.txt [iso-8859-1] Fri Nov 5 23:14:29 2010 @@ -1,0 +1,38 @@ +set_rc_compiler() + +spec2def(dplayx.dll dplayx.spec) + +list(APPEND SOURCE + dpclassfactory.c + dplay.c + dplaysp.c + dplayx_global.c + dplayx_main.c + dplayx_messages.c + dplobby.c + lobbysp.c + name_server.c + regsvr.c + version.rc + dplayx.def) + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +add_library(dplayx SHARED ${SOURCE}) +set_module_type(dplayx win32dll) + +target_link_libraries(dplayx + ${CMAKE_CURRENT_BINARY_DIR}/dplayx.def + wine + uuid + dxguid) + +add_importlibs(dplayx + advapi32 + ole32 + user32 + winmm + msvcrt + kernel32 + ntdll) + Propchange: branches/cmake-bringup/dll/directx/dplayx/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/cmake-bringup/drivers/filesystems/mup/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/filesyste… ============================================================================== --- branches/cmake-bringup/drivers/filesystems/mup/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/filesystems/mup/CMakeLists.txt [iso-8859-1] Fri Nov 5 23:14:29 2010 @@ -6,3 +6,5 @@ set_module_type(mup kernelmodedriver) add_importlibs(mup ntoskrnl hal) + +add_cab_target(mup 2) Modified: branches/cmake-bringup/drivers/filesystems/ntfs/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/filesyste… ============================================================================== --- branches/cmake-bringup/drivers/filesystems/ntfs/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/filesystems/ntfs/CMakeLists.txt [iso-8859-1] Fri Nov 5 23:14:29 2010 @@ -23,3 +23,6 @@ add_importlibs(ntfs ntoskrnl hal) add_pch(ntfs ${CMAKE_CURRENT_SOURCE_DIR}/ntfs.h ${SOURCE}) + +add_minicd_target(ntfs reactos) +add_livecd_target(ntfs reactos/system32/drivers) Added: branches/cmake-bringup/importlibs/libwined3d.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libwin… ============================================================================== Binary file - no diff available. Propchange: branches/cmake-bringup/importlibs/libwined3d.a ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: branches/cmake-bringup/media/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/media/CMakeLists.… ============================================================================== --- branches/cmake-bringup/media/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/media/CMakeLists.txt [iso-8859-1] Fri Nov 5 23:14:29 2010 @@ -7,6 +7,7 @@ add_minicd(${CMAKE_CURRENT_SOURCE_DIR}/drivers/etc/KDBinit reactos KDBinit) add_minicd(${CMAKE_CURRENT_SOURCE_DIR}/drivers/etc/services reactos services) -add_livecd(${CMAKE_CURRENT_SOURCE_DIR}/drivers/etc/hosts reactos/system32/drivers/etc hosts) -add_livecd(${CMAKE_CURRENT_SOURCE_DIR}/drivers/etc/KDBinit reactos/system32/drivers/etc KDBinit) -add_livecd(${CMAKE_CURRENT_SOURCE_DIR}/drivers/etc/services reactos/system32/drivers/etc services) +add_cab(${CMAKE_CURRENT_SOURCE_DIR}/drivers/etc/hosts 5) +add_cab(${CMAKE_CURRENT_SOURCE_DIR}/drivers/etc/KDBinit 5) +add_cab(${CMAKE_CURRENT_SOURCE_DIR}/drivers/etc/services 5) +add_cab(${CMAKE_CURRENT_SOURCE_DIR}/sounds/ReactOS_LogOn.wav 8)

1 0

[tkreuzer] 49501: Fix build
by tkreuzer＠svn.reactos.org 05 Nov '10

05 Nov '10

Author: tkreuzer Date: Fri Nov 5 23:12:59 2010 New Revision: 49501 URL: http://svn.reactos.org/svn/reactos?rev=49501&view=rev Log: Fix build Modified: trunk/reactos/lib/sdk/crt/printf/streamout.c trunk/reactos/lib/sdk/crt/printf/vsprintf.c Modified: trunk/reactos/lib/sdk/crt/printf/streamout.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/printf/streamo… ============================================================================== --- trunk/reactos/lib/sdk/crt/printf/streamout.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/printf/streamout.c [iso-8859-1] Fri Nov 5 23:12:59 2010 @@ -11,6 +11,7 @@ #include <tchar.h> #include <strings.h> #include <math.h> +#include <float.h> #ifdef _UNICODE #define streamout wstreamout Modified: trunk/reactos/lib/sdk/crt/printf/vsprintf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/printf/vsprint… ============================================================================== --- trunk/reactos/lib/sdk/crt/printf/vsprintf.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/printf/vsprintf.c [iso-8859-1] Fri Nov 5 23:12:59 2010 @@ -1,4 +1,3 @@ -#include "myfunc.h" /* * COPYRIGHT: GNU GPL, see COPYING in the top level directory * PROJECT: ReactOS crt library

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs