diff options
| -rw-r--r-- | MSVC_NMake/filelist.am | 1 | ||||
| -rw-r--r-- | MSVC_NMake/gendef/gendef.cc | 94 | ||||
| -rw-r--r-- | Makefile.am | 1 | ||||
| -rw-r--r-- | cairomm/meson.build | 2 |
4 files changed, 1 insertions, 97 deletions
diff --git a/MSVC_NMake/filelist.am b/MSVC_NMake/filelist.am index dfe199e..3706372 100644 --- a/MSVC_NMake/filelist.am +++ b/MSVC_NMake/filelist.am @@ -10,7 +10,6 @@ msvc_nmake_data = \ detectenv-msvc.mak \ info-msvc.mak \ install.mak \ - gendef/gendef.cc \ generate-msvc.mak \ Makefile.vc \ README diff --git a/MSVC_NMake/gendef/gendef.cc b/MSVC_NMake/gendef/gendef.cc deleted file mode 100644 index cf66560..0000000 --- a/MSVC_NMake/gendef/gendef.cc +++ /dev/null @@ -1,94 +0,0 @@ -/* - * MICO --- an Open Source CORBA implementation - * Copyright (c) 2003 Harald Böhme - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - * - * For more information, visit the MICO Home Page at - * http://www.mico.org/ - */ - -/* Modified by Cedric Gustin <cedric.gustin@gmail.com> on 2006/01/13 : - * Redirect the output of dumpbin to dumpbin.out instead of reading the - * output stream of popen, as it fails with Visual Studio 2005 in - * pre-link build events. - */ - -#include <iostream> -#include <fstream> -#include <stdio.h> - -using namespace std; - -int main(int argc,char** argv) -{ - if (argc < 4) { - cerr << "Usage: " << argv[0] << " <def-file-name> <dll-base-name> <obj-file> ...." << endl; - return 2; - } - - // CG : Explicitly redirect stdout to dumpbin.out. - string dumpbin = "dumpbin /SYMBOLS /OUT:dumpbin.out"; - int i = 3; - - for(;i<argc;) { - dumpbin += " "; - dumpbin += argv[i++]; - } - - FILE * dump; - - if( (dump = _popen(dumpbin.c_str(),"r")) == NULL ) { - cerr << "could not popen dumpbin" << endl; - return 3; - } - - // CG : Wait for the dumpbin process to finish and open dumpbin.out. - _pclose(dump); - dump=fopen("dumpbin.out","r"); - - ofstream def_file(argv[1]); - - def_file << "LIBRARY " << argv[2] << endl; - def_file << "EXPORTS" << endl; - - i=0; - while( !feof(dump)) { - char buf [65000]; - - if( fgets( buf, 64999, dump ) != NULL ) { - if(!strstr(buf," UNDEF ") && strstr(buf," External ")) { - char *s = strchr(buf,'|') + 1; - while(*s == ' ' || *s == '\t') s++; - char *e=s; - while(*e != ' ' && *e != '\t' && *e != '\0' && *e!= '\n') e++; - *e = '\0'; - - if(strchr(s,'?')==0 && s[0]=='_' && strchr(s,'@') == 0 )//this is a C export type: _fct -> fct - def_file << " " << (s+1) << endl; - else - if(strchr(s,'?')!=0 && strncmp(s,"??_G",4)!=0 && strncmp(s,"??_E",4)!=0) { - def_file << " " << s << endl; - } - } - } - } - - // CG : Close dumpbin.out and delete it. - fclose(dump); - remove("dumpbin.out"); - - cout << dumpbin.c_str() << endl; -} diff --git a/Makefile.am b/Makefile.am index 36c5240..f78ac02 100644 --- a/Makefile.am +++ b/Makefile.am @@ -46,7 +46,6 @@ EXTRA_DIST = \ meson_options.txt \ cairommconfig.h.meson \ MSVC_NMake/cairomm/meson.build \ - MSVC_NMake/gendef/meson.build \ data/meson.build \ docs/reference/meson.build \ cairomm/meson.build \ diff --git a/cairomm/meson.build b/cairomm/meson.build index 42303c7..afc724f 100644 --- a/cairomm/meson.build +++ b/cairomm/meson.build @@ -1,7 +1,7 @@ # cairomm # Input: cairomm_build_dep, cairomm_pcname, cairomm_libversion, cairomm_rc, -# is_msvc, gendef +# is_msvc # Output: source_h_files, cairomm_dep # There are no built source files in cairomm. |