Attachment #130016 for bug #174093

View | Details | Raw Unified | Return to bug 174093
Collapse All | Expand All




#

PORTNAME=	odamex
PORTVERSION=	0.6.1
CATEGORIES=	games
MASTER_SITES=	SF/${PORTNAME}/Odamex/${PORTVERSION}
DISTNAME=	odamex-src-${PORTVERSION}

COMMENT=	The Standard in Online Multiplayer Doom

USE_BZIP2=	yes
USE_GMAKE=	yes
USE_SDL=	sdl mixer
USE_CMAKE=	yes
USE_DOS2UNIX=	CMakeLists.txt odalaunch/CMakeLists.txt

OPTIONS_DEFINE=	LAUNCHER

LAUNCHER_DESC=	Enable GUI launcher program
MIDI_DESC=	Enable MIDI support (timidity)

.include <bsd.port.options.mk>

.if ${PORT_OPTIONS:MLAUNCHER}
USE_WX=		2.6+
CMAKE_ARGS+=	-DODALAUNCH_TARGET=on -DNO_AG-ODALAUNCH_TARGET=off
PLIST_SUB+=	LAUNCHER=""
.else
PLIST_SUB+=	LAUNCHER="@comment "
CMAKE_ARGS+=	-DODALAUNCH_TARGET=off

.if ${PORT_OPTIONS:MMIDI}
RUN_DEPENDS+=	timidity:${PORTSDIR}/audio/timidity
.endif

post-patch:

		s|%%DATADIR%%|${DATADIR}|' \
		${WRKSRC}/client/src/d_main.cpp \
		${WRKSRC}/server/src/d_main.cpp
	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' \
		-e 's|%%WX_VER%%|${WX_VERSION}|' \
		${WRKSRC}/odalaunch/CMakeLists.txt \
		${WRKSRC}/odalaunch/src/dlg_main.cpp
	@${REINPLACE_CMD} -e 's|-waddir /usr/share/doom||' \
		${WRKSRC}/installer/arch/odamex.desktop

do-install:
# Binary
	${INSTALL_PROGRAM} ${WRKSRC}/client/odamex ${PREFIX}/bin
	${INSTALL_PROGRAM} ${WRKSRC}/server/odasrv ${PREFIX}/bin
.if ${PORT_OPTIONS:MLAUNCHER}
	${INSTALL_PROGRAM} ${WRKSRC}/odalaunch/odalaunch ${PREFIX}/bin
.endif
# Wad
	${MKDIR} ${DATADIR}
	${INSTALL_DATA} ${WRKSRC}/odamex.wad ${DATADIR}
# Docs
.if ${PORT_OPTIONS:MDOCS}
	${MKDIR} ${DOCSDIR}
	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
	${INSTALL_DATA} ${WRKSRC}/LICENSE ${DOCSDIR}
.endif
# Icons
.for f in odamex odasrv
	${INSTALL_DATA} ${WRKSRC}/media/icon_${f}_*.png ${LOCALBASE}/share/pixmaps
.endfor
.if ${PORT_OPTIONS:MLAUNCHER}
	${INSTALL_DATA} ${WRKSRC}/media/icon_odalaunch_*.png ${LOCALBASE}/share/pixmaps
.endif
# Desktop
.for f in odamex odasrv
	${INSTALL_DATA} ${WRKSRC}/installer/arch/${f}.desktop ${LOCALBASE}/share/applications
.endfor
.if ${PORT_OPTIONS:MLAUNCHER}
	${INSTALL_DATA} ${WRKSRC}/installer/arch/odalaunch.desktop ${LOCALBASE}/share/applications
.endif

.include "${.CURDIR}/../doom-data/Makefile.include"

Lines 1-2 Link Here

(-)odamex/distinfo (-2 / +2 lines)
1	SHA256 (odamex-src-0.5.6.tar.bz2) = fc832ac2df2fceeed79b512cd789d0d30c93c46b246f50af973bb867b02a3440	1	SHA256 (odamex-src-0.6.1.tar.bz2) = d7758141d00510eae55132a2376326560a206c772da3d604666dc2c62009f861
2	SIZE (odamex-src-0.5.6.tar.bz2) = 2954090	2	SIZE (odamex-src-0.6.1.tar.bz2) = 7522333




--- CMakeLists.txt.orig	2012-12-03 15:03:21.000000000 +0400
+++ CMakeLists.txt	2012-12-03 15:05:49.000000000 +0400
@@ -43,7 +43,9 @@
 add_subdirectory(client)
 add_subdirectory(server)
 add_subdirectory(master)
-add_subdirectory(odalaunch)
+if(ODALAUNCH_TARGET)
+  add_subdirectory(odalaunch)
+endif()
 
 # Disable the ag-odalaunch target completely: -DNO_AG-ODALAUNCH_TARGET
 # This is only really useful when setting up a universal build.




--- Makefile.orig	2011-11-05 05:00:05.000000000 +0100
+++ Makefile	2011-12-01 05:33:47.415968992 +0100
@@ -3,8 +3,8 @@
 OBJDIR = obj
 # denis - fixme - remove mkdir -p
 MKDIR = mkdir -p
-CC = g++
-LD = g++
+CC = $(CXX)
+LD = $(CC)
 INSTALL = cp
 DEUTEX = deutex
 
@@ -62,7 +62,7 @@
 DEUTEX_FLAGS = -rgb 0 255 255 
 
 # Platform and sdl-config flags
-X11_LFLAGS = -L/usr/X11R6/lib -lX11
+X11_LFLAGS = -L$(LOCALBASE)/lib -lX11
 
 SDL_CFLAGS_COMMAND = sdl-config --cflags
 SDL_LFLAGS_COMMAND = sdl-config --libs
@@ -85,8 +85,8 @@
 
 ifeq ($(strip $(freebsd)), true)
 ifeq ($(SDL_CFLAGS),)
-SDL_CFLAGS_COMMAND = sdl11-config --cflags
-SDL_LFLAGS_COMMAND = sdl11-config --libs
+SDL_CFLAGS_COMMAND = $(SDL_CONFIG) --cflags
+SDL_LFLAGS_COMMAND = $(SDL_CONFIG) --libs
 SDL_CFLAGS = $(shell $(SDL_CFLAGS_COMMAND))
 SDL_LFLAGS = $(shell $(SDL_LFLAGS_COMMAND)) $(X11_LFLAGS)
 endif
@@ -177,7 +177,7 @@
 TARGETS = $(SERVER_TARGET) $(CLIENT_TARGET) $(MASTER_TARGET) $(WADFILE_TARGET)
 
 # denis - fixme - cflags are quite messy, but removing these is a very delicate act, also use -Wall -Werror
-CFLAGS = $(CFLAGS_PLATFORM) -DNOASM -Icommon -g -Wall -O2
+CFLAGS += $(CFLAGS_PLATFORM) -DNOASM -Icommon -g -Wall -O2
 LFLAGS = $(LFLAGS_PLATFORM)
 
 CFLAGS_RELEASE = $(CFLAGS_PLATFORM) -DNOASM -Icommon -O3
@@ -213,7 +213,12 @@
 # denis - end fixme
 
 # All
-all: $(SERVER_TARGET) $(CLIENT_TARGET) $(WADFILE_TARGET)
+all: $(SERVER_TARGET) $(CLIENT_TARGET) $(WADFILE_TARGET) launcher
+
+launcher:
+ifdef WITH_LAUNCHER
+	$(MAKE) -C odalaunch odalaunch
+endif
 
 # Textscreen
 $(OBJDIR)/$(TEXTSCREEN_DIR)/%.o: $(TEXTSCREEN_DIR)/%.cpp $(TEXTSCREEN_HEADERS) $(COMMON_HEADERS)

Line 0 Link Here

(-)odamex/files/patch-client-src-d_main.cpp (+11 lines)
	1	--- client/src/d_main.cpp.orig 2012-07-02 07:44:58.000000000 +0400
	2	+++ client/src/d_main.cpp 2012-12-03 06:52:17.000000000 +0400
	3	@@ -834,6 +834,8 @@
	4	D_AddSearchDir(dirs, Args.CheckValue("-waddir"), separator);
	5	D_AddSearchDir(dirs, getenv("DOOMWADDIR"), separator);
	6	D_AddSearchDir(dirs, getenv("DOOMWADPATH"), separator);
	7	+ D_AddSearchDir(dirs, "%%DATADIR%%", separator);
	8	+ D_AddSearchDir(dirs, "%%DMDIR%%", separator);
	9	D_AddSearchDir(dirs, getenv("HOME"), separator);
	10	D_AddSearchDir(dirs, waddirs.cstring(), separator);
	11

Lines 1-11 Link Here

(-)odamex/files/patch-client__src__d_main.cpp (-11 lines)
1	--- client/src/d_main.cpp.orig 2011-11-05 05:00:05.000000000 +0100
2	+++ client/src/d_main.cpp 2011-12-01 05:33:47.422967926 +0100
3	@@ -843,6 +843,8 @@
4	D_AddSearchDir(dirs, Args.CheckValue("-waddir"), separator);
5	D_AddSearchDir(dirs, getenv("DOOMWADDIR"), separator);
6	D_AddSearchDir(dirs, getenv("DOOMWADPATH"), separator);
7	+ D_AddSearchDir(dirs, "/usr/local/share/odamex", separator);
8	+ D_AddSearchDir(dirs, "/usr/local/share/doom", separator);
9	D_AddSearchDir(dirs, getenv("HOME"), separator);
10	D_AddSearchDir(dirs, waddirs.cstring(), separator);
11

Line 0 Link Here

(-)odamex/files/patch-odalaunch-CMakeLists.txt (+10 lines)
	1	--- odalaunch/CMakeLists.txt.orig 2012-12-03 16:15:08.000000000 +0400
	2	+++ odalaunch/CMakeLists.txt 2012-12-03 16:20:04.000000000 +0400
	3	@@ -30,6 +30,7 @@
	4
	5	# Odalaunch target
	6	if(wxWidgets_FOUND)
	7	+ set(wxWidgets_wxrc_EXECUTABLE %%PREFIX%%/bin/wxrc-gtk2-%%WX_VER%%)
	8	add_custom_command(
	9	OUTPUT ${XRCRES_HEADER}
	10	COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/res

Line 0 Link Here

(-)odamex/files/patch-odalaunch-src-dlg_main.cpp (+11 lines)
	1	--- odalaunch/src/dlg_main.cpp.orig 2012-05-31 03:49:32.000000000 +0400
	2	+++ odalaunch/src/dlg_main.cpp 2012-12-03 21:21:50.000000000 +0400
	3	@@ -193,7 +193,7 @@
	4	launchercfg_s.get_list_on_start = 1;
	5	launchercfg_s.show_blocked_servers = 0;
	6	launchercfg_s.wad_paths = wxGetCwd();
	7	- launchercfg_s.odamex_directory = wxGetCwd();
	8	+ launchercfg_s.odamex_directory = wxString("%%PREFIX%%/bin");
	9
	10	m_LstCtrlServers = XRCCTRL(*this, "Id_LstCtrlServers", LstOdaServerList);
	11	m_LstCtrlPlayers = XRCCTRL(*this, "Id_LstCtrlPlayers", LstOdaPlayerList);




--- odalaunch/Makefile.orig	2011-11-05 05:00:03.000000000 +0100
+++ odalaunch/Makefile	2011-12-01 05:33:47.418968116 +0100
@@ -23,11 +23,11 @@
 	-I./res \
 	-I../odalpapi
 
-CC = g++
-LD = g++
+CC = $(CXX)
+LD = $(CC)
 
-WXCONFIG = wx-config
-WXRC = wxrc
+WXCONFIG = $(WX_CONFIG)
+WXRC = $(WXRC_CMD)
 
 # Sometimes wx-config will use the lowest version available, which is what
 # we do no want! -- GhostlyDeath

Line 0 Link Here

(-)odamex/files/patch-server-src-d_main.cpp (+11 lines)
	1	--- server/src/d_main.cpp.orig 2012-07-02 07:44:58.000000000 +0400
	2	+++ server/src/d_main.cpp 2012-12-03 06:56:33.000000000 +0400
	3	@@ -628,6 +628,8 @@
	4	D_AddSearchDir(dirs, Args.CheckValue("-waddir"), separator);
	5	D_AddSearchDir(dirs, getenv("DOOMWADDIR"), separator);
	6	D_AddSearchDir(dirs, getenv("DOOMWADPATH"), separator);
	7	+ D_AddSearchDir(dirs, "%%DATADIR%%", separator);
	8	+ D_AddSearchDir(dirs, "%%DMDIR%%", separator);
	9	D_AddSearchDir(dirs, getenv("HOME"), separator);
	10	D_AddSearchDir(dirs, waddirs.cstring(), separator);
	11

Lines 1-11 Link Here

(-)odamex/files/patch-server__src__d_main.cpp (-11 lines)
1	--- server/src/d_main.cpp.orig 2011-11-05 04:59:48.000000000 +0100
2	+++ server/src/d_main.cpp 2011-12-01 05:33:47.423967844 +0100
3	@@ -627,6 +627,8 @@
4	D_AddSearchDir(dirs, Args.CheckValue("-waddir"), separator);
5	D_AddSearchDir(dirs, getenv("DOOMWADDIR"), separator);
6	D_AddSearchDir(dirs, getenv("DOOMWADPATH"), separator);
7	+ D_AddSearchDir(dirs, "/usr/local/share/odamex", separator);
8	+ D_AddSearchDir(dirs, "/usr/local/share/doom", separator);
9	D_AddSearchDir(dirs, getenv("HOME"), separator);
10	D_AddSearchDir(dirs, waddirs.cstring(), separator);
11

Lines 1-7 Link Here

(-)odamex/pkg-plist (+16 lines)
1	%%LAUNCHER%%bin/odalaunch	1	%%LAUNCHER%%bin/odalaunch
		2	%%LAUNCHER%%share/applications/odalaunch.desktop
		3	%%LAUNCHER%%share/pixmaps/icon_odalaunch_128.png
		4	%%LAUNCHER%%share/pixmaps/icon_odalaunch_256.png
		5	%%LAUNCHER%%share/pixmaps/icon_odalaunch_512.png
		6	%%LAUNCHER%%share/pixmaps/icon_odalaunch_96.png
2	bin/odamex	7	bin/odamex
3	bin/odasrv	8	bin/odasrv
		9	share/applications/odamex.desktop
		10	share/applications/odasrv.desktop
		11	share/pixmaps/icon_odamex_128.png
		12	share/pixmaps/icon_odamex_256.png
		13	share/pixmaps/icon_odamex_512.png
		14	share/pixmaps/icon_odamex_96.png
		15	share/pixmaps/icon_odasrv_128.png
		16	share/pixmaps/icon_odasrv_256.png
		17	share/pixmaps/icon_odasrv_512.png
		18	share/pixmaps/icon_odasrv_96.png
4	%%DATADIR%%/odamex.wad	19	%%DATADIR%%/odamex.wad
		20	%%PORTDOCS%%%%DOCSDIR%%/LICENSE
5	%%PORTDOCS%%%%DOCSDIR%%/README	21	%%PORTDOCS%%%%DOCSDIR%%/README
6	@dirrm %%DATADIR%%	22	@dirrm %%DATADIR%%
7	%%PORTDOCS%%@dirrm %%DOCSDIR%%	23	%%PORTDOCS%%@dirrm %%DOCSDIR%%

Return to bug 174093

Lines 6-12 Link Here

(-)odamex/Makefile (-17 / +32 lines)
6	#	6	#
7		7
8	PORTNAME= odamex	8	PORTNAME= odamex
9	PORTVERSION= 0.5.6	9	PORTVERSION= 0.6.1
10	CATEGORIES= games	10	CATEGORIES= games
11	MASTER_SITES= SF/${PORTNAME}/Odamex/${PORTVERSION}	11	MASTER_SITES= SF/${PORTNAME}/Odamex/${PORTVERSION}
12	DISTNAME= odamex-src-${PORTVERSION}	12	DISTNAME= odamex-src-${PORTVERSION}
Lines 15-40 Link Here
15	COMMENT= The Standard in Online Multiplayer Doom	15	COMMENT= The Standard in Online Multiplayer Doom
16		16
17	USE_BZIP2= yes	17	USE_BZIP2= yes
18	USE_GMAKE= yes
19	USE_SDL= sdl mixer	18	USE_SDL= sdl mixer
		19	USE_CMAKE= yes
		20	USE_DOS2UNIX= CMakeLists.txt odalaunch/CMakeLists.txt
20		21
21	OPTIONS_DEFINE= LAUNCHER MIDI	22	OPTIONS_DEFINE= LAUNCHER
22		23
23	LAUNCHER_DESC= Enable GUI launcher program	24	LAUNCHER_DESC= Enable GUI launcher program
24	MIDI_DESC= Enable MIDI support (timidity)
25		25
26	.include <bsd.port.options.mk>	26	.include <bsd.port.options.mk>
27		27
28	.if ${PORT_OPTIONS:MLAUNCHER}	28	.if ${PORT_OPTIONS:MLAUNCHER}
29	USE_WX= 2.6+	29	USE_WX= 2.6+
30	MAKE_ENV+= WXRC_CMD="${WXRC_CMD}" WITH_LAUNCHER=yes	30	CMAKE_ARGS+= -DODALAUNCH_TARGET=on -DNO_AG-ODALAUNCH_TARGET=off
31	PLIST_SUB+= LAUNCHER=""	31	PLIST_SUB+= LAUNCHER=""
32	.else	32	.else
33	PLIST_SUB+= LAUNCHER="@comment "	33	PLIST_SUB+= LAUNCHER="@comment "
34	.endif	34	CMAKE_ARGS+= -DODALAUNCH_TARGET=off
35
36	.if ${PORT_OPTIONS:MMIDI}
37	RUN_DEPENDS+= timidity:${PORTSDIR}/audio/timidity
38	.endif	35	.endif
39		36
40	post-patch:	37	post-patch:
Lines 42-65 Link Here
42	s\|%%DATADIR%%\|${DATADIR}\|' \	39	s\|%%DATADIR%%\|${DATADIR}\|' \
43	${WRKSRC}/client/src/d_main.cpp \	40	${WRKSRC}/client/src/d_main.cpp \
44	${WRKSRC}/server/src/d_main.cpp	41	${WRKSRC}/server/src/d_main.cpp
45		42	@${REINPLACE_CMD} -e 's\|%%PREFIX%%\|${PREFIX}\|' \
46	.if ${PORT_OPTIONS:MLAUNCHER}	43	-e 's\|%%WX_VER%%\|${WX_VERSION}\|' \
47	@${REINPLACE_CMD} -e 's\|\./odamex\|odamex\|' \	44	${WRKSRC}/odalaunch/CMakeLists.txt \
48	${WRKSRC}/odalaunch/src/misc.cpp	45	${WRKSRC}/odalaunch/src/dlg_main.cpp
49	.endif	46	@${REINPLACE_CMD} -e 's\|-waddir /usr/share/doom\|\|' \
		47	${WRKSRC}/installer/arch/odamex.desktop
50		48
51	do-install:	49	do-install:
52	.for f in odamex odasrv	50	# Binary
53	${INSTALL_PROGRAM} ${WRKSRC}/${f} ${PREFIX}/bin	51	${INSTALL_PROGRAM} ${WRKSRC}/client/odamex ${PREFIX}/bin
54	.endfor	52	${INSTALL_PROGRAM} ${WRKSRC}/server/odasrv ${PREFIX}/bin
55	.if ${PORT_OPTIONS:MLAUNCHER}	53	.if ${PORT_OPTIONS:MLAUNCHER}
56	${INSTALL_PROGRAM} ${WRKSRC}/odalaunch/odalaunch ${PREFIX}/bin	54	${INSTALL_PROGRAM} ${WRKSRC}/odalaunch/odalaunch ${PREFIX}/bin
57	.endif	55	.endif
		56	# Wad
58	${MKDIR} ${DATADIR}	57	${MKDIR} ${DATADIR}
59	${INSTALL_DATA} ${WRKSRC}/odamex.wad ${DATADIR}	58	${INSTALL_DATA} ${WRKSRC}/odamex.wad ${DATADIR}
		59	# Docs
60	.if ${PORT_OPTIONS:MDOCS}	60	.if ${PORT_OPTIONS:MDOCS}
61	${MKDIR} ${DOCSDIR}	61	${MKDIR} ${DOCSDIR}
62	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}	62	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
		63	${INSTALL_DATA} ${WRKSRC}/LICENSE ${DOCSDIR}
		64	.endif
		65	# Icons
		66	.for f in odamex odasrv
		67	${INSTALL_DATA} ${WRKSRC}/media/icon_${f}_*.png ${LOCALBASE}/share/pixmaps
		68	.endfor
		69	.if ${PORT_OPTIONS:MLAUNCHER}
		70	${INSTALL_DATA} ${WRKSRC}/media/icon_odalaunch_*.png ${LOCALBASE}/share/pixmaps
		71	.endif
		72	# Desktop
		73	.for f in odamex odasrv
		74	${INSTALL_DATA} ${WRKSRC}/installer/arch/${f}.desktop ${LOCALBASE}/share/applications
		75	.endfor
		76	.if ${PORT_OPTIONS:MLAUNCHER}
		77	${INSTALL_DATA} ${WRKSRC}/installer/arch/odalaunch.desktop ${LOCALBASE}/share/applications
63	.endif	78	.endif
64		79
65	.include "${.CURDIR}/../doom-data/Makefile.include"	80	.include "${.CURDIR}/../doom-data/Makefile.include"

Line 0 Link Here

(-)odamex/files/patch-CMakeLists.txt (+13 lines)
	1	--- CMakeLists.txt.orig 2012-12-03 15:03:21.000000000 +0400
	2	+++ CMakeLists.txt 2012-12-03 15:05:49.000000000 +0400
	3	@@ -43,7 +43,9 @@
	4	add_subdirectory(client)
	5	add_subdirectory(server)
	6	add_subdirectory(master)
	7	-add_subdirectory(odalaunch)
	8	+if(ODALAUNCH_TARGET)
	9	+ add_subdirectory(odalaunch)
	10	+endif()
	11
	12	# Disable the ag-odalaunch target completely: -DNO_AG-ODALAUNCH_TARGET
	13	# This is only really useful when setting up a universal build.

Lines 1-56 Link Here

(-)odamex/files/patch-Makefile (-56 lines)
1	--- Makefile.orig 2011-11-05 05:00:05.000000000 +0100
2	+++ Makefile 2011-12-01 05:33:47.415968992 +0100
3	@@ -3,8 +3,8 @@
4	OBJDIR = obj
5	# denis - fixme - remove mkdir -p
6	MKDIR = mkdir -p
7	-CC = g++
8	-LD = g++
9	+CC = $(CXX)
10	+LD = $(CC)
11	INSTALL = cp
12	DEUTEX = deutex
13
14	@@ -62,7 +62,7 @@
15	DEUTEX_FLAGS = -rgb 0 255 255
16
17	# Platform and sdl-config flags
18	-X11_LFLAGS = -L/usr/X11R6/lib -lX11
19	+X11_LFLAGS = -L$(LOCALBASE)/lib -lX11
20
21	SDL_CFLAGS_COMMAND = sdl-config --cflags
22	SDL_LFLAGS_COMMAND = sdl-config --libs
23	@@ -85,8 +85,8 @@
24
25	ifeq ($(strip $(freebsd)), true)
26	ifeq ($(SDL_CFLAGS),)
27	-SDL_CFLAGS_COMMAND = sdl11-config --cflags
28	-SDL_LFLAGS_COMMAND = sdl11-config --libs
29	+SDL_CFLAGS_COMMAND = $(SDL_CONFIG) --cflags
30	+SDL_LFLAGS_COMMAND = $(SDL_CONFIG) --libs
31	SDL_CFLAGS = $(shell $(SDL_CFLAGS_COMMAND))
32	SDL_LFLAGS = $(shell $(SDL_LFLAGS_COMMAND)) $(X11_LFLAGS)
33	endif
34	@@ -177,7 +177,7 @@
35	TARGETS = $(SERVER_TARGET) $(CLIENT_TARGET) $(MASTER_TARGET) $(WADFILE_TARGET)
36
37	# denis - fixme - cflags are quite messy, but removing these is a very delicate act, also use -Wall -Werror
38	-CFLAGS = $(CFLAGS_PLATFORM) -DNOASM -Icommon -g -Wall -O2
39	+CFLAGS += $(CFLAGS_PLATFORM) -DNOASM -Icommon -g -Wall -O2
40	LFLAGS = $(LFLAGS_PLATFORM)
41
42	CFLAGS_RELEASE = $(CFLAGS_PLATFORM) -DNOASM -Icommon -O3
43	@@ -213,7 +213,12 @@
44	# denis - end fixme
45
46	# All
47	-all: $(SERVER_TARGET) $(CLIENT_TARGET) $(WADFILE_TARGET)
48	+all: $(SERVER_TARGET) $(CLIENT_TARGET) $(WADFILE_TARGET) launcher
49	+
50	+launcher:
51	+ifdef WITH_LAUNCHER
52	+ $(MAKE) -C odalaunch odalaunch
53	+endif
54
55	# Textscreen
56	$(OBJDIR)/$(TEXTSCREEN_DIR)/%.o: $(TEXTSCREEN_DIR)/%.cpp $(TEXTSCREEN_HEADERS) $(COMMON_HEADERS)

Lines 1-18 Link Here

(-)odamex/files/patch-odalaunch__Makefile (-18 lines)
1	--- odalaunch/Makefile.orig 2011-11-05 05:00:03.000000000 +0100
2	+++ odalaunch/Makefile 2011-12-01 05:33:47.418968116 +0100
3	@@ -23,11 +23,11 @@
4	-I./res \
5	-I../odalpapi
6
7	-CC = g++
8	-LD = g++
9	+CC = $(CXX)
10	+LD = $(CC)
11
12	-WXCONFIG = wx-config
13	-WXRC = wxrc
14	+WXCONFIG = $(WX_CONFIG)
15	+WXRC = $(WXRC_CMD)
16
17	# Sometimes wx-config will use the lowest version available, which is what
18	# we do no want! -- GhostlyDeath