Commit f026466a authored by Jonathan Wilkes's avatar Jonathan Wilkes
Browse files

fix up paths and gcc dll name for Windows 64, use __int64 in m_pd.h

parent b8b83837
...@@ -80,8 +80,15 @@ endif ...@@ -80,8 +80,15 @@ endif
# #
#==============================================================================# #==============================================================================#
#bin_src = /usr/local/bin TARGET_PLATFORM := $(shell uname -p)
bin_src = /mingw32/bin ifeq ($(TARGET_PLATFORM),i386)
bin_src = /mingw32/bin
lib_gcc = libgcc_s_dw2-1.dll
else
bin_src = /mingw64/bin
lib_gcc = libgcc_s_seh-1.dll
endif
system32 = /c/WINDOWS/system32 system32 = /c/WINDOWS/system32
lib_install: lib_install:
# ultimately, the DLLs should be installed in %SystemRoot%\system32 by # ultimately, the DLLs should be installed in %SystemRoot%\system32 by
...@@ -143,7 +150,7 @@ endif ...@@ -143,7 +150,7 @@ endif
-install -p $(system32)/msvcr71.dll $(DESTDIR)$(bindir) -install -p $(system32)/msvcr71.dll $(DESTDIR)$(bindir)
#-install -p $(system32)/pthreadVC.dll $(DESTDIR)$(bindir) #-install -p $(system32)/pthreadVC.dll $(DESTDIR)$(bindir)
install -p $(bin_src)/libwinpthread-1.dll $(DESTDIR)$(bindir) install -p $(bin_src)/libwinpthread-1.dll $(DESTDIR)$(bindir)
install -p $(bin_src)/libgcc_s_dw2-1.dll $(DESTDIR)$(bindir) install -p $(bin_src)/$(lib_gcc) $(DESTDIR)$(bindir)
install -p $(bin_src)/libstdc++-6.dll $(DESTDIR)$(bindir) install -p $(bin_src)/libstdc++-6.dll $(DESTDIR)$(bindir)
ifneq ($(LIGHT),yes) ifneq ($(LIGHT),yes)
# lyonpotpourri compiles its own shared lib. On Windows it needs to be # lyonpotpourri compiles its own shared lib. On Windows it needs to be
......
...@@ -88,7 +88,7 @@ typedef unsigned __int64 uint64_t; ...@@ -88,7 +88,7 @@ typedef unsigned __int64 uint64_t;
/* signed and unsigned integer types the size of a pointer: */ /* signed and unsigned integer types the size of a pointer: */
#if !defined(PD_LONGINTTYPE) #if !defined(PD_LONGINTTYPE)
#if defined(_WIN32) && defined(__x86_64__) #if defined(_WIN32) && defined(__x86_64__)
#define PD_LONGINTTYPE long long #define PD_LONGINTTYPE __int64
#else #else
#define PD_LONGINTTYPE long #define PD_LONGINTTYPE long
#endif #endif
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment