diff --git a/.gitignore b/.gitignore index 9386734..9de94ef 100644 --- a/.gitignore +++ b/.gitignore @@ -15,4 +15,5 @@ *.vcxproj.user Debug Release +ipch diff --git a/OpenMPForVC2k5/omp.h b/OpenMPForVC2k5/omp.h deleted file mode 100644 index 867f10a..0000000 --- a/OpenMPForVC2k5/omp.h +++ /dev/null @@ -1,204 +0,0 @@ -//----------------------------------------------------------------------------- -// OpenMP runtime support library for Visual C++ -// Copyright (C) Microsoft Corporation. All rights reserved. -//----------------------------------------------------------------------------- - -// OpenMP C/C++ Version 2.0 March 2002 - -#pragma once - -#if defined(__cplusplus) -extern "C" { -#endif - -#define _OMPAPI __cdecl - -#if !defined(_OMP_LOCK_T) -#define _OMP_LOCK_T -typedef void * omp_lock_t; -#endif - -#if !defined(_OMP_NEST_LOCK_T) -#define _OMP_NEST_LOCK_T -typedef void * omp_nest_lock_t; -#endif - -#if !defined(_OPENMP) - -#if defined(_DEBUG) - #pragma comment(lib, "vcompd") -#else // _DEBUG - #pragma comment(lib, "vcomp") -#endif // _DEBUG - -#endif // _OPENMP - -#if !defined(_OPENMP_NOFORCE_MANIFEST) - - #include - - #if defined(_DEBUG) - - #if defined(_M_IX86) - #pragma comment(linker,"/manifestdependency:\"type='win32' " \ - "name='" __LIBRARIES_ASSEMBLY_NAME_PREFIX ".DebugOpenMP' " \ - "version='" _CRT_ASSEMBLY_VERSION "' " \ - "processorArchitecture='x86' " \ - "publicKeyToken='" _VC_ASSEMBLY_PUBLICKEYTOKEN "'\"") - #elif defined(_M_AMD64) - #pragma comment(linker,"/manifestdependency:\"type='win32' " \ - "name='" __LIBRARIES_ASSEMBLY_NAME_PREFIX ".DebugOpenMP' " \ - "version='" _CRT_ASSEMBLY_VERSION "' " \ - "processorArchitecture='amd64' " \ - "publicKeyToken='" _VC_ASSEMBLY_PUBLICKEYTOKEN "'\"") - #elif defined(_M_IA64) - #pragma comment(linker,"/manifestdependency:\"type='win32' " \ - "name='" __LIBRARIES_ASSEMBLY_NAME_PREFIX ".DebugOpenMP' " \ - "version='" _CRT_ASSEMBLY_VERSION "' " \ - "processorArchitecture='ia64' " \ - "publicKeyToken='" _VC_ASSEMBLY_PUBLICKEYTOKEN "'\"") - #endif - - #else // _DEBUG - - #if defined(_M_IX86) - #pragma comment(linker,"/manifestdependency:\"type='win32' " \ - "name='" __LIBRARIES_ASSEMBLY_NAME_PREFIX ".OpenMP' " \ - "version='" _CRT_ASSEMBLY_VERSION "' " \ - "processorArchitecture='x86' " \ - "publicKeyToken='" _VC_ASSEMBLY_PUBLICKEYTOKEN "'\"") - #elif defined(_M_AMD64) - #pragma comment(linker,"/manifestdependency:\"type='win32' " \ - "name='" __LIBRARIES_ASSEMBLY_NAME_PREFIX ".OpenMP' " \ - "version='" _CRT_ASSEMBLY_VERSION "' " \ - "processorArchitecture='amd64' " \ - "publicKeyToken='" _VC_ASSEMBLY_PUBLICKEYTOKEN "'\"") - #elif defined(_M_IA64) - #pragma comment(linker,"/manifestdependency:\"type='win32' " \ - "name='" __LIBRARIES_ASSEMBLY_NAME_PREFIX ".OpenMP' " \ - "version='" _CRT_ASSEMBLY_VERSION "' " \ - "processorArchitecture='ia64' " \ - "publicKeyToken='" _VC_ASSEMBLY_PUBLICKEYTOKEN "'\"") - #endif - - #endif // _DEBUG - -#endif // _OPENMP_NOFORCE_MANIFEST - -#if !defined(_OMPIMP) -#define _OMPIMP __declspec(dllimport) -#endif - -_OMPIMP void _OMPAPI -omp_set_num_threads( - int _Num_threads - ); - -_OMPIMP int _OMPAPI -omp_get_num_threads( - void - ); - -_OMPIMP int _OMPAPI -omp_get_max_threads( - void - ); - -_OMPIMP int _OMPAPI -omp_get_thread_num( - void - ); - -_OMPIMP int _OMPAPI -omp_get_num_procs( - void - ); - -_OMPIMP void _OMPAPI -omp_set_dynamic( - int _Dynamic_threads - ); - -_OMPIMP int _OMPAPI -omp_get_dynamic( - void - ); - -_OMPIMP int _OMPAPI -omp_in_parallel( - void - ); - -_OMPIMP void _OMPAPI -omp_set_nested( - int _Nested - ); - -_OMPIMP int _OMPAPI -omp_get_nested( - void - ); - -_OMPIMP void _OMPAPI -omp_init_lock( - omp_lock_t * _Lock - ); - -_OMPIMP void _OMPAPI -omp_destroy_lock( - omp_lock_t * _Lock - ); - -_OMPIMP void _OMPAPI -omp_set_lock( - omp_lock_t * _Lock - ); - -_OMPIMP void _OMPAPI -omp_unset_lock( - omp_lock_t * _Lock - ); - -_OMPIMP int _OMPAPI -omp_test_lock( - omp_lock_t * _Lock - ); - -_OMPIMP void _OMPAPI -omp_init_nest_lock( - omp_nest_lock_t * _Lock - ); - -_OMPIMP void _OMPAPI -omp_destroy_nest_lock( - omp_nest_lock_t * _Lock - ); - -_OMPIMP void _OMPAPI -omp_set_nest_lock( - omp_nest_lock_t * _Lock - ); - -_OMPIMP void _OMPAPI -omp_unset_nest_lock( - omp_nest_lock_t * _Lock - ); - -_OMPIMP int _OMPAPI -omp_test_nest_lock( - omp_nest_lock_t * _Lock - ); - -_OMPIMP double _OMPAPI -omp_get_wtime( - void - ); - -_OMPIMP double _OMPAPI -omp_get_wtick( - void - ); - -#if defined(__cplusplus) -} -#endif diff --git a/external_guard/external_guard.sh b/external_guard/external_guard.sh new file mode 100644 index 0000000..fda6420 --- /dev/null +++ b/external_guard/external_guard.sh @@ -0,0 +1,7 @@ +rm -f a.out +time g++ external_guard.cpp +rm -f a.out +time g++ external_guard.cpp -D_EXT__H_ +rm -f a.out +time g++ external_guard.cpp +rm -f a.out diff --git a/std_vs_qt.sh b/std_vs_qt.sh new file mode 100644 index 0000000..6d70ce0 --- /dev/null +++ b/std_vs_qt.sh @@ -0,0 +1,7 @@ +#g++ -g -L../fw/2007.12/3rd_party/qt/4.2.3/`synvariant`/lib -I../fw/2007.12/3rd_party/qt/4.2.3/`synvariant`/include -lQtCore std_vs_qt.cpp -o std_vs_qt.exe.`synvariant` +g++ -O2 -L../fw/2007.12/3rd_party/qt/4.2.3/`synvariant`/lib -I../fw/2007.12/3rd_party/qt/4.2.3/`synvariant`/include -lQtCore std_vs_qt.cpp -o std_vs_qt.exe.`synvariant` +#CC -L../fw/2007.12/3rd_party/qt/4.2.3/`synvariant`/lib -I../fw/2007.12/3rd_party/qt/4.2.3/`synvariant`/include -lQtCore std_vs_qt.cpp -o std_vs_qt.exe.`synvariant` +export LD_LIBRARY_PATH=../fw/2007.12/3rd_party/qt/4.2.3/`synvariant`/lib/ +#gdb ./std_vs_qt.exe.`synvariant` +./std_vs_qt.exe.`synvariant` + diff --git a/testX11.cpp b/testX11.cpp index 60fb595..3150c8d 100644 --- a/testX11.cpp +++ b/testX11.cpp @@ -1,3 +1,8 @@ +// +// To compile use: +// g++ -L/usr/X11R6/lib64 -pthread -lX11 testX11.cpp +// + /* first include the standard headers that we're likely to need */ #include #include diff --git a/test_lib/test_lib_dyn/Makefile b/test_lib/test_lib_dyn/Makefile new file mode 100644 index 0000000..d9743e3 --- /dev/null +++ b/test_lib/test_lib_dyn/Makefile @@ -0,0 +1,11 @@ +OBJFILES=test_lib_dyn.o + +all : $(OBJFILES) + $(CC) -shared -o libtest_lib_dyn.so $(OBJFILES) -L../test_lib_static -ltest_lib_static + +.cpp.o: + $(CXX) -fPIC -c -o $@ $< + +clean: + rm -f $(OBJFILES) + diff --git a/test_lib/test_lib_dyn/test_dyn_export.def b/test_lib/test_lib_dyn/test_dyn_export.def new file mode 100644 index 0000000..c4313ab --- /dev/null +++ b/test_lib/test_lib_dyn/test_dyn_export.def @@ -0,0 +1,5 @@ +LIBRARY "test_lib_dyn" + +EXPORTS +DllMain +func1 @1 NONAME diff --git a/test_lib/test_lib_static/Makefile b/test_lib/test_lib_static/Makefile new file mode 100644 index 0000000..2f89b75 --- /dev/null +++ b/test_lib/test_lib_static/Makefile @@ -0,0 +1,12 @@ +OBJFILES=method1.o method2.o method3.o obj1.o obj2.o obj3.o +CXXFLAGS=-I . + +all : $(OBJFILES) + $(AR) cr libtest_lib_static.a $(OBJFILES) + +.cpp.o: + $(CXX) -fPIC -c -o $@ $< + +clean: + rm -f $(OBJFILES) +