reactos/CMake
1
0
Fork 0
mirror of https://github.com/reactos/CMake.git synced 2024-11-28 14:01:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix for shared libs and borland

Browse Source
This commit is contained in:
Bill Hoffman 2001-11-29 09:09:11 -05:00
parent 1be3b0fd99
commit 15805d260e
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Source/CMakeLists.txt
View File

@ -41,10 +41,9 @@ IF (WIN32)
SOURCE_FILES(SRCS cmBorlandMakefileGenerator.cpp) SOURCE_FILES(SRCS cmBorlandMakefileGenerator.cpp)
SOURCE_FILES(SRCS cmNMakeMakefileGenerator.cxx) SOURCE_FILES(SRCS cmNMakeMakefileGenerator.cxx)
IF(NOT UNIX) IF(NOT UNIX)
IF( CMAKE_CXX_COMPILER MATCHES Borland ) IF( NOT BORLAND )
ELSE (CMAKE_CXX_COMPILER MATCHES Borland )
SUBDIRS(MFCDialog) SUBDIRS(MFCDialog)
ENDIF( CMAKE_CXX_COMPILER MATCHES Borland) ENDIF( NOT BORLAND )
ENDIF(NOT UNIX) ENDIF(NOT UNIX)
ENDIF (WIN32) ENDIF (WIN32)

4
Source/cmBorlandMakefileGenerator2.cxx
View File

@ -315,14 +315,14 @@ void cmBorlandMakefileGenerator2::OutputSharedLibraryRule(std::ostream& fout,
command += "-e"; command += "-e";
command += cmSystemTools::EscapeSpaces(dllpath.c_str()); command += cmSystemTools::EscapeSpaces(dllpath.c_str());
command += " "; command += " ";
// then list of object files
command += " $(" + std::string(name) + "_SRC_OBJS) ";
std::strstream linklibs; std::strstream linklibs;
this->OutputLinkLibraries(linklibs, name, t); this->OutputLinkLibraries(linklibs, name, t);
linklibs << std::ends; linklibs << std::ends;
// then the linker options -L and libraries (any other order will fail!) // then the linker options -L and libraries (any other order will fail!)
command += linklibs.str(); command += linklibs.str();
delete [] linklibs.str(); delete [] linklibs.str();
// then list of object files
command += " $(" + std::string(name) + "_SRC_OBJS) ";
std::string command2 = "implib -w "; std::string command2 = "implib -w ";
command2 += libpath + " " + dllpath; command2 += libpath + " " + dllpath;
const std::vector<cmSourceFile>& sources = t.GetSourceFiles(); const std::vector<cmSourceFile>& sources = t.GetSourceFiles();

3
Source/cmakewizard.cxx
View File

@ -37,7 +37,7 @@ void Ask(const char* key, cmCacheManager::CacheEntry & entry)
} }
main(int ac, char** av) int main(int ac, char** av)
{ {
std::vector<std::string> args; std::vector<std::string> args;
for(int j=0; j < ac; ++j) for(int j=0; j < ac; ++j)
@ -105,4 +105,5 @@ main(int ac, char** av)
} }
while(asked); while(asked);
std::cout << "CMake complete, run make to build project.\n"; std::cout << "CMake complete, run make to build project.\n";
return 0;
} }

2
Templates/CMakeWindowsBorlandConfig2.cmake
View File

@ -6,7 +6,7 @@ FIND_PATH(BCB_BIN_PATH bcc32.exe
"/Borland/Bcc55/Bin" "/Borland/Bcc55/Bin"
[HKEY_LOCAL_MACHINE/SOFTWARE/Borland/C++Builder/5.0/RootDir]/Bin [HKEY_LOCAL_MACHINE/SOFTWARE/Borland/C++Builder/5.0/RootDir]/Bin
) )
SET (BORLAND 1)
SET (WORDS_BIGENDIAN ) SET (WORDS_BIGENDIAN )
SET (HAVE_LIMITS_H 1) SET (HAVE_LIMITS_H 1)
SET (HAVE_UNISTD_H 1) SET (HAVE_UNISTD_H 1)