moved Makefile.osx stuff with conditions inside Makefile so that just…

… one

Makefile will be needed

Makefile

@@ -1,17 +1,26 @@
 ### Generated by Winemaker
 
-PREFIX                = /usr
+# For MacOS set a few things differently then everyone else
+PLATFORM := $(shell uname -s)
+ifeq ($(PLATFORM),Darwin)
+   PREFIX                = /usr/local
+   PLATDLL               = /usr/local/lib
+   INTSAMPLES            = -DASIOST32INT
+else
+   PREFIX                = /usr
+   PLATDLL               = /usr/lib32
+   INTSAMPLES            =
+endif
+
 SRCDIR                = .
 SUBDIRS               =
 DLLS                  = wineasio.dll
 EXES                  =
 
-
-
 ### Common settings
 
-CEXTRA                = -m32 -g -O2 -D__WINESRC__ -D_REENTRANT -fPIC -Wall -pipe -fno-strict-aliasing -Wdeclaration-after-statement -Wwrite-strings -Wpointer-arith
-CXXEXTRA              = -m32 -D__WINESRC__ -D_REENTRANT -fPIC -Wall -pipe -fno-strict-aliasing -Wdeclaration-after-statement -Wwrite-strings -Wpointer-arith
+CEXTRA                = -m32 -g -O2 $(INTSAMPLES) -D__WINESRC__ -D_REENTRANT -fPIC -Wall -pipe -fno-strict-aliasing -Wdeclaration-after-statement -Wwrite-strings -Wpointer-arith
+CXXEXTRA              = -m32 $(INTSAMPLES) -D__WINESRC__ -D_REENTRANT -fPIC -Wall -pipe -fno-strict-aliasing -Wdeclaration-after-statement -Wwrite-strings -Wpointer-arith
 RCEXTRA               =
 INCLUDE_PATH          = -I. -I/usr/include -I$(PREFIX)/include -I$(PREFIX)/include/wine -I$(PREFIX)/include/wine/windows
 DLL_PATH              =
@@ -31,8 +40,8 @@ wineasio_dll_LDFLAGS  = -shared \
 			-m32 \
 			$(wineasio_dll_MODULE:%=%.spec) \
 			-mnocygwin \
-			-L/usr/lib32/wine \
-			-L/usr/lib32
+			-L$(PLATDLL)/wine \
+			-L$(PLATDLL)
 wineasio_dll_DLL_PATH =
 wineasio_dll_DLLS     = odbc32 \
 			ole32 \
@@ -115,3 +124,4 @@ $(wineasio_dll_MODULE).so: $(wineasio_dll_OBJS)
 
 install:
 	if [ -d $(PREFIX)/lib32/wine ]; then cp wineasio.dll.so $(DESTDIR)$(PREFIX)/lib32/wine; else cp wineasio.dll.so $(DESTDIR)$(PREFIX)/lib/wine; fi
+

Makefile64

@@ -1,6 +1,17 @@
 ### Generated by Winemaker
 
-PREFIX                = /usr
+# For MacOS set a few things differently then everyone else
+PLATFORM := $(shell uname -s)
+ifeq ($(PLATFORM),Darwin)
+   PREFIX                = /usr/local
+   PLATDLL               = /usr/local/lib
+   INTSAMPLES            = -DASIOST32INT
+else
+   PREFIX                = /usr
+   PLATDLL               = /usr/lib
+   INTSAMPLES            =
+endif
+
 SRCDIR                = .
 SUBDIRS               =
 DLLS                  = wineasio.dll
@@ -10,8 +21,8 @@ EXES                  =
 
 ### Common settings
 
-CEXTRA                = -g -O2 -D__WINESRC__ -DNATIVE_INT64 -D_REENTRANT -fPIC -Wall -pipe -fno-strict-aliasing -Wdeclaration-after-statement -Wwrite-strings -Wpointer-arith
-CXXEXTRA              = -D__WINESRC__ -DNATIVE_INT64 -D_REENTRANT -fPIC -Wall -pipe -fno-strict-aliasing -Wdeclaration-after-statement -Wwrite-strings -Wpointer-arith
+CEXTRA                = -g -O2 $(INTSAMPLES) -D__WINESRC__ -DNATIVE_INT64 -D_REENTRANT -fPIC -Wall -pipe -fno-strict-aliasing -Wdeclaration-after-statement -Wwrite-strings -Wpointer-arith
+CXXEXTRA              = $(INTSAMPLES) -D__WINESRC__ -DNATIVE_INT64 -D_REENTRANT -fPIC -Wall -pipe -fno-strict-aliasing -Wdeclaration-after-statement -Wwrite-strings -Wpointer-arith
 RCEXTRA               =
 INCLUDE_PATH          = -I. -I/usr/include -I$(PREFIX)/include -I$(PREFIX)/include/wine -I$(PREFIX)/include/wine/windows
 DLL_PATH              =
@@ -30,8 +41,8 @@ wineasio_dll_RC_SRCS  =
 wineasio_dll_LDFLAGS  = -shared \
 			$(wineasio_dll_MODULE:%=%.spec) \
 			-mnocygwin \
-			-L/usr/lib/wine \
-			-L/usr/lib
+			-L$(PLATDLL)/wine \
+			-L$(PLATDLL)
 wineasio_dll_DLL_PATH =
 wineasio_dll_DLLS     = odbc32 \
 			ole32 \