Browse Source
Fixup Makefiles to work with latest wine
Signed-off-by: falkTX <falktx@falktx.com>tags/v1.0.0
2 changed files with 46 additions and 35 deletions
Unified View
Diff Options
-
+22 -17Makefile
-
+24 -18Makefile64
+ 22
- 17
Makefile
View File
| @@ -10,14 +10,26 @@ EXES = | |||||
| ### Common settings | ### 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 -D_REENTRANT -fPIC -Wall -pipe | |||||
| CEXTRA += -fno-strict-aliasing -Wdeclaration-after-statement -Wwrite-strings -Wpointer-arith | |||||
| CEXTRA += -Werror=implicit-function-declaration | |||||
| CEXTRA += $(shell pkg-config --cflags jack) | |||||
| RCEXTRA = | RCEXTRA = | ||||
| INCLUDE_PATH = -I. -I/usr/include -I$(PREFIX)/include -I$(PREFIX)/include/wine -I$(PREFIX)/include/wine/windows | |||||
| INCLUDE_PATH = -I. -Irtaudio/include | |||||
| INCLUDE_PATH += -I$(PREFIX)/include/wine | |||||
| INCLUDE_PATH += -I$(PREFIX)/include/wine/windows | |||||
| INCLUDE_PATH += -I$(PREFIX)/include/wine-development | |||||
| INCLUDE_PATH += -I$(PREFIX)/include/wine-development/wine/windows | |||||
| DLL_PATH = | DLL_PATH = | ||||
| LIBRARY_PATH = | LIBRARY_PATH = | ||||
| LIBRARIES = -ljack | LIBRARIES = -ljack | ||||
| ifeq ($(DEBUG),true) | |||||
| CEXTRA += -O0 -DDEBUG -g -D__WINESRC__ | |||||
| LIBRARIES += | |||||
| else | |||||
| CEXTRA += -O2 -DNDEBUG -fvisibility=hidden | |||||
| endif | |||||
| ### wineasio.dll sources and settings | ### wineasio.dll sources and settings | ||||
| @@ -25,14 +37,16 @@ wineasio_dll_MODULE = wineasio.dll | |||||
| wineasio_dll_C_SRCS = asio.c \ | wineasio_dll_C_SRCS = asio.c \ | ||||
| main.c \ | main.c \ | ||||
| regsvr.c | regsvr.c | ||||
| wineasio_dll_CXX_SRCS = | |||||
| wineasio_dll_RC_SRCS = | wineasio_dll_RC_SRCS = | ||||
| wineasio_dll_LDFLAGS = -shared \ | wineasio_dll_LDFLAGS = -shared \ | ||||
| -m32 \ | -m32 \ | ||||
| $(wineasio_dll_MODULE:%=%.spec) \ | |||||
| -mnocygwin \ | -mnocygwin \ | ||||
| $(wineasio_dll_MODULE:%=%.spec) \ | |||||
| -L/usr/lib32/wine \ | -L/usr/lib32/wine \ | ||||
| -L/usr/lib32 | |||||
| -L/usr/lib/i386-linux-gnu/wine \ | |||||
| -L/usr/lib/i386-linux-gnu/wine-development \ | |||||
| -L/opt/wine-staging/lib \ | |||||
| -L/opt/wine-staging/lib/wine | |||||
| wineasio_dll_DLL_PATH = | wineasio_dll_DLL_PATH = | ||||
| wineasio_dll_DLLS = odbc32 \ | wineasio_dll_DLLS = odbc32 \ | ||||
| ole32 \ | ole32 \ | ||||
| @@ -41,7 +55,6 @@ wineasio_dll_LIBRARY_PATH= | |||||
| wineasio_dll_LIBRARIES= uuid | wineasio_dll_LIBRARIES= uuid | ||||
| wineasio_dll_OBJS = $(wineasio_dll_C_SRCS:.c=.o) \ | wineasio_dll_OBJS = $(wineasio_dll_C_SRCS:.c=.o) \ | ||||
| $(wineasio_dll_CXX_SRCS:.cpp=.o) \ | |||||
| $(wineasio_dll_RC_SRCS:.rc=.res) | $(wineasio_dll_RC_SRCS:.rc=.res) | ||||
| @@ -49,21 +62,19 @@ wineasio_dll_OBJS = $(wineasio_dll_C_SRCS:.c=.o) \ | |||||
| ### Global source lists | ### Global source lists | ||||
| C_SRCS = $(wineasio_dll_C_SRCS) | C_SRCS = $(wineasio_dll_C_SRCS) | ||||
| CXX_SRCS = $(wineasio_dll_CXX_SRCS) | |||||
| RC_SRCS = $(wineasio_dll_RC_SRCS) | RC_SRCS = $(wineasio_dll_RC_SRCS) | ||||
| ### Tools | ### Tools | ||||
| CC = gcc | CC = gcc | ||||
| CXX = g++ | |||||
| WINECC = winegcc | WINECC = winegcc | ||||
| RC = wrc | RC = wrc | ||||
| ### Generic targets | ### Generic targets | ||||
| all: asio.h $(SUBDIRS) $(DLLS:%=%.so) $(EXES:%=%.so) | |||||
| all: rtaudio/include/asio.h $(SUBDIRS) $(DLLS:%=%.so) $(EXES:%=%.so) | |||||
| ### Build rules | ### Build rules | ||||
| @@ -80,12 +91,6 @@ DEFINCL = $(INCLUDE_PATH) $(DEFINES) $(OPTIONS) | |||||
| .c.o: | .c.o: | ||||
| $(CC) -c $(DEFINCL) $(CFLAGS) $(CEXTRA) -o $@ $< | $(CC) -c $(DEFINCL) $(CFLAGS) $(CEXTRA) -o $@ $< | ||||
| .cpp.o: | |||||
| $(CXX) -c $(CXXFLAGS) $(CXXEXTRA) $(DEFINCL) -o $@ $< | |||||
| .cxx.o: | |||||
| $(CXX) -c $(CXXFLAGS) $(CXXEXTRA) $(DEFINCL) -o $@ $< | |||||
| .rc.res: | .rc.res: | ||||
| $(RC) $(RCFLAGS) $(RCEXTRA) $(DEFINCL) -fo$@ $< | $(RC) $(RCFLAGS) $(RCEXTRA) $(DEFINCL) -fo$@ $< | ||||
| @@ -95,7 +100,7 @@ CLEAN_FILES = y.tab.c y.tab.h lex.yy.c core *.orig *.rej \ | |||||
| \\\#*\\\# *~ *% .\\\#* | \\\#*\\\# *~ *% .\\\#* | ||||
| clean:: $(SUBDIRS:%=%/__clean__) $(EXTRASUBDIRS:%=%/__clean__) | clean:: $(SUBDIRS:%=%/__clean__) $(EXTRASUBDIRS:%=%/__clean__) | ||||
| $(RM) $(CLEAN_FILES) $(RC_SRCS:.rc=.res) $(C_SRCS:.c=.o) $(CXX_SRCS:.cpp=.o) | |||||
| $(RM) $(CLEAN_FILES) $(RC_SRCS:.rc=.res) $(C_SRCS:.c=.o) | |||||
| $(RM) $(DLLS:%=%.so) $(EXES:%=%.so) $(EXES:%.exe=%) | $(RM) $(DLLS:%=%.so) $(EXES:%=%.so) $(EXES:%.exe=%) | ||||
| $(SUBDIRS:%=%/__clean__): dummy | $(SUBDIRS:%=%/__clean__): dummy | ||||
+ 24
- 18
Makefile64
View File
| @@ -10,14 +10,26 @@ EXES = | |||||
| ### Common settings | ### 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 = -m64 -DNATIVE_INT64 -D_REENTRANT -fPIC -Wall -pipe | |||||
| CEXTRA += -fno-strict-aliasing -Wdeclaration-after-statement -Wwrite-strings -Wpointer-arith | |||||
| CEXTRA += -Werror=implicit-function-declaration | |||||
| CEXTRA += $(shell pkg-config --cflags jack) | |||||
| RCEXTRA = | RCEXTRA = | ||||
| INCLUDE_PATH = -I. -I/usr/include -I$(PREFIX)/include -I$(PREFIX)/include/wine -I$(PREFIX)/include/wine/windows | |||||
| INCLUDE_PATH = -I. -Irtaudio/include | |||||
| INCLUDE_PATH += -I$(PREFIX)/include/wine | |||||
| INCLUDE_PATH += -I$(PREFIX)/include/wine/windows | |||||
| INCLUDE_PATH += -I$(PREFIX)/include/wine-development | |||||
| INCLUDE_PATH += -I$(PREFIX)/include/wine-development/wine/windows | |||||
| DLL_PATH = | DLL_PATH = | ||||
| LIBRARY_PATH = | LIBRARY_PATH = | ||||
| LIBRARIES = -ljack | LIBRARIES = -ljack | ||||
| ifeq ($(DEBUG),true) | |||||
| CEXTRA += -O0 -DDEBUG -g -D__WINESRC__ | |||||
| LIBRARIES += | |||||
| else | |||||
| CEXTRA += -O2 -DNDEBUG -fvisibility=hidden | |||||
| endif | |||||
| ### wineasio.dll sources and settings | ### wineasio.dll sources and settings | ||||
| @@ -25,13 +37,16 @@ wineasio_dll_MODULE = wineasio.dll | |||||
| wineasio_dll_C_SRCS = asio.c \ | wineasio_dll_C_SRCS = asio.c \ | ||||
| main.c \ | main.c \ | ||||
| regsvr.c | regsvr.c | ||||
| wineasio_dll_CXX_SRCS = | |||||
| wineasio_dll_RC_SRCS = | wineasio_dll_RC_SRCS = | ||||
| wineasio_dll_LDFLAGS = -shared \ | wineasio_dll_LDFLAGS = -shared \ | ||||
| $(wineasio_dll_MODULE:%=%.spec) \ | |||||
| -m64 \ | |||||
| -mnocygwin \ | -mnocygwin \ | ||||
| -L/usr/lib/wine \ | |||||
| -L/usr/lib | |||||
| $(wineasio_dll_MODULE:%=%.spec) \ | |||||
| -L/usr/lib64/wine \ | |||||
| -L/usr/lib/x86_64-linux-gnu/wine \ | |||||
| -L/usr/lib/x86_64-linux-gnu/wine-development \ | |||||
| -L/opt/wine-staging/lib \ | |||||
| -L/opt/wine-staging/lib/wine | |||||
| wineasio_dll_DLL_PATH = | wineasio_dll_DLL_PATH = | ||||
| wineasio_dll_DLLS = odbc32 \ | wineasio_dll_DLLS = odbc32 \ | ||||
| ole32 \ | ole32 \ | ||||
| @@ -40,7 +55,6 @@ wineasio_dll_LIBRARY_PATH= | |||||
| wineasio_dll_LIBRARIES= uuid | wineasio_dll_LIBRARIES= uuid | ||||
| wineasio_dll_OBJS = $(wineasio_dll_C_SRCS:.c=.o) \ | wineasio_dll_OBJS = $(wineasio_dll_C_SRCS:.c=.o) \ | ||||
| $(wineasio_dll_CXX_SRCS:.cpp=.o) \ | |||||
| $(wineasio_dll_RC_SRCS:.rc=.res) | $(wineasio_dll_RC_SRCS:.rc=.res) | ||||
| @@ -48,21 +62,19 @@ wineasio_dll_OBJS = $(wineasio_dll_C_SRCS:.c=.o) \ | |||||
| ### Global source lists | ### Global source lists | ||||
| C_SRCS = $(wineasio_dll_C_SRCS) | C_SRCS = $(wineasio_dll_C_SRCS) | ||||
| CXX_SRCS = $(wineasio_dll_CXX_SRCS) | |||||
| RC_SRCS = $(wineasio_dll_RC_SRCS) | RC_SRCS = $(wineasio_dll_RC_SRCS) | ||||
| ### Tools | ### Tools | ||||
| CC = gcc | CC = gcc | ||||
| CXX = g++ | |||||
| WINECC = winegcc | WINECC = winegcc | ||||
| RC = wrc | RC = wrc | ||||
| ### Generic targets | ### Generic targets | ||||
| all: asio.h $(SUBDIRS) $(DLLS:%=%.so) $(EXES:%=%.so) | |||||
| all: rtaudio/include/asio.h $(SUBDIRS) $(DLLS:%=%.so) $(EXES:%=%.so) | |||||
| ### Build rules | ### Build rules | ||||
| @@ -79,12 +91,6 @@ DEFINCL = $(INCLUDE_PATH) $(DEFINES) $(OPTIONS) | |||||
| .c.o: | .c.o: | ||||
| $(CC) -c $(DEFINCL) $(CFLAGS) $(CEXTRA) -o $@ $< | $(CC) -c $(DEFINCL) $(CFLAGS) $(CEXTRA) -o $@ $< | ||||
| .cpp.o: | |||||
| $(CXX) -c $(CXXFLAGS) $(CXXEXTRA) $(DEFINCL) -o $@ $< | |||||
| .cxx.o: | |||||
| $(CXX) -c $(CXXFLAGS) $(CXXEXTRA) $(DEFINCL) -o $@ $< | |||||
| .rc.res: | .rc.res: | ||||
| $(RC) $(RCFLAGS) $(RCEXTRA) $(DEFINCL) -fo$@ $< | $(RC) $(RCFLAGS) $(RCEXTRA) $(DEFINCL) -fo$@ $< | ||||
| @@ -94,7 +100,7 @@ CLEAN_FILES = y.tab.c y.tab.h lex.yy.c core *.orig *.rej \ | |||||
| \\\#*\\\# *~ *% .\\\#* | \\\#*\\\# *~ *% .\\\#* | ||||
| clean:: $(SUBDIRS:%=%/__clean__) $(EXTRASUBDIRS:%=%/__clean__) | clean:: $(SUBDIRS:%=%/__clean__) $(EXTRASUBDIRS:%=%/__clean__) | ||||
| $(RM) $(CLEAN_FILES) $(RC_SRCS:.rc=.res) $(C_SRCS:.c=.o) $(CXX_SRCS:.cpp=.o) | |||||
| $(RM) $(CLEAN_FILES) $(RC_SRCS:.rc=.res) $(C_SRCS:.c=.o) | |||||
| $(RM) $(DLLS:%=%.so) $(EXES:%=%.so) $(EXES:%.exe=%) | $(RM) $(DLLS:%=%.so) $(EXES:%=%.so) $(EXES:%.exe=%) | ||||
| $(SUBDIRS:%=%/__clean__): dummy | $(SUBDIRS:%=%/__clean__): dummy | ||||