[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[cinvoke-svn] r25 - in trunk/cinvoke: . lib lib/arch test tools
From: |
will |
Subject: |
[cinvoke-svn] r25 - in trunk/cinvoke: . lib lib/arch test tools |
Date: |
15 Jun 2006 20:06:56 -0400 |
Author: will
Date: 2006-06-15 20:06:55 -0400 (Thu, 15 Jun 2006)
New Revision: 25
Removed:
trunk/cinvoke/tools/copyifnewer.c
trunk/cinvoke/tools/copyifnewer.exe
Modified:
trunk/cinvoke/Makefile
trunk/cinvoke/lib/Makefile
trunk/cinvoke/lib/arch/gcc_x86_unix.c
trunk/cinvoke/lib/cinvoke-arch.h
trunk/cinvoke/makeinstall.bat
trunk/cinvoke/test/Makefile
Log:
much easier unix configuration
Modified: trunk/cinvoke/Makefile
===================================================================
--- trunk/cinvoke/Makefile 2006-06-15 18:34:03 UTC (rev 24)
+++ trunk/cinvoke/Makefile 2006-06-16 00:06:55 UTC (rev 25)
@@ -5,7 +5,8 @@
cd test && $(MAKE)
install: all
- install lib/cinvoke.h lib/cinvoke-arch.h lib/cinvoke-archspec.h
$(PREFIX)/include
+ install lib/cinvoke.h lib/cinvoke-arch.h $(PREFIX)/include
+ install lib/arch/gcc_x86_unix.h $(PREFIX)/include/cinvoke-archspec.h
install lib/cinvoke.a $(PREFIX)/lib
clean:
Modified: trunk/cinvoke/lib/Makefile
===================================================================
--- trunk/cinvoke/lib/Makefile 2006-06-15 18:34:03 UTC (rev 24)
+++ trunk/cinvoke/lib/Makefile 2006-06-16 00:06:55 UTC (rev 25)
@@ -5,12 +5,7 @@
clean:
rm -f *.o $(TARGET)
-cinvoke-archspec.c: arch/gcc_x86_unix.c
- cp -f arch/gcc_x86_unix.c cinvoke-archspec.c
-cinvoke-archspec.h: arch/gcc_x86_unix.h
- cp -f arch/gcc_x86_unix.h cinvoke-archspec.h
-
-SRCS = cinvoke.c structure.c hashtable.c cinvoke-archspec.c
+SRCS = cinvoke.c structure.c hashtable.c arch/gcc_x86_unix.c
OBJS = $(SRCS:.c=.o)
@@ -20,12 +15,5 @@
ranlib $(TARGET)
.c.o:
- gcc -g -Wall -Werror -c $< -o $@
+ gcc -g -Wall -Werror -DARCH_GCC_X86_UNIX -DCINVOKE_BUILD -c $< -o $@
-cinvoke-archspec.o: cinvoke-archspec.c cinvoke.h cinvoke-arch.h \
- cinvoke-archspec.h cinvoke-private.h hashtable.h
-cinvoke.o: cinvoke.c cinvoke.h cinvoke-arch.h cinvoke-archspec.h \
- cinvoke-private.h hashtable.h
-hashtable.o: hashtable.c hashtable.h
-structure.o: structure.c cinvoke.h cinvoke-arch.h cinvoke-archspec.h \
- cinvoke-private.h hashtable.h
Modified: trunk/cinvoke/lib/arch/gcc_x86_unix.c
===================================================================
--- trunk/cinvoke/lib/arch/gcc_x86_unix.c 2006-06-15 18:34:03 UTC (rev 24)
+++ trunk/cinvoke/lib/arch/gcc_x86_unix.c 2006-06-16 00:06:55 UTC (rev 25)
@@ -25,8 +25,13 @@
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
*/
+#ifdef CINVOKE_BUILD
+#include "../cinvoke.h"
+#include "../cinvoke-private.h"
+#else
#include "cinvoke.h"
#include "cinvoke-private.h"
+#endif
#include <dlfcn.h>
#include <errno.h>
Modified: trunk/cinvoke/lib/cinvoke-arch.h
===================================================================
--- trunk/cinvoke/lib/cinvoke-arch.h 2006-06-15 18:34:03 UTC (rev 24)
+++ trunk/cinvoke/lib/cinvoke-arch.h 2006-06-16 00:06:55 UTC (rev 25)
@@ -62,7 +62,15 @@
CINV_CC_FASTCALL /**< Yet another, rarely used, Windows calling
convention */
} cinv_callconv_t;
+#ifdef ARCH_GCC_X86_UNIX
+#include "arch/gcc_x86_unix.h"
+#endif
+#ifdef ARCH_CL_X86_WIN
+#include "arch/cl_x86_win.h"
+#endif
+#ifndef CINVOKE_BUILD
#include "cinvoke-archspec.h"
+#endif
typedef struct _CInvContext {
cinv_int32_t errorcode;
Modified: trunk/cinvoke/makeinstall.bat
===================================================================
--- trunk/cinvoke/makeinstall.bat 2006-06-15 18:34:03 UTC (rev 24)
+++ trunk/cinvoke/makeinstall.bat 2006-06-16 00:06:55 UTC (rev 25)
@@ -1,5 +1,5 @@
mkdir install
copy lib\cinvoke.h install
copy lib\cinvoke-arch.h install
-copy lib\cinvoke-archspec.h install
+copy lib\arch\cl_x86_win.h install\cinvoke_archspec.h
copy lib\Release\cinvoke.lib install
Modified: trunk/cinvoke/test/Makefile
===================================================================
--- trunk/cinvoke/test/Makefile 2006-06-15 18:34:03 UTC (rev 24)
+++ trunk/cinvoke/test/Makefile 2006-06-16 00:06:55 UTC (rev 25)
@@ -7,4 +7,4 @@
gcc -g -shared -fPIC lib.c -o lib.so -Wall -Werror
runtests: runtests.c lib.so
- gcc -g -o runtests runtests.c -Wall -Werror ../lib/cinvoke.a -I../lib
`sh ../tools/libdl.sh` -lm
+ gcc -g -DCINVOKE_BUILD -DARCH_GCC_X86_UNIX -o runtests runtests.c -Wall
-Werror ../lib/cinvoke.a -I../lib `sh ../tools/libdl.sh` -lm
Deleted: trunk/cinvoke/tools/copyifnewer.c
===================================================================
--- trunk/cinvoke/tools/copyifnewer.c 2006-06-15 18:34:03 UTC (rev 24)
+++ trunk/cinvoke/tools/copyifnewer.c 2006-06-16 00:06:55 UTC (rev 25)
@@ -1,34 +0,0 @@
-// copyifnewer.cpp : Defines the entry point for the console application.
-//
-
-#include <stdio.h>
-#include <windows.h>
-
-int main(int argc, char* argv[])
-{
- int skip = 0;
- WIN32_FIND_DATA finddata1, finddata2;
-
- if (argc != 3) {
- fprintf(stderr, "Usage: copyifnewer src dst\n");
- return 1;
- }
- if (FindFirstFile(argv[1], &finddata1) == INVALID_HANDLE_VALUE) {
- fprintf(stderr, "Error opening source file: %d\n",
GetLastError());
- return 1;
- }
- if (FindFirstFile(argv[2], &finddata2) == INVALID_HANDLE_VALUE) {
- skip = 1;
- }
-
- if (skip || CompareFileTime(&finddata1.ftLastWriteTime,
&finddata2.ftLastWriteTime) > 0) {
- char buf[MAX_PATH * 2 + 9];
- _snprintf(buf, sizeof(buf), "copy \"%s\" \"%s\"", argv[1],
argv[2]);
- system(buf);
- } else {
- printf("Not copying file because source file is older\n");
- }
-
- return 0;
-}
-
Deleted: trunk/cinvoke/tools/copyifnewer.exe
===================================================================
(Binary files differ)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [cinvoke-svn] r25 - in trunk/cinvoke: . lib lib/arch test tools,
will <=