From c65b08c27e476b513f2d6e4d985a4a5a679acd2f Mon Sep 17 00:00:00 2001 From: ketmar Date: Thu, 8 Nov 2012 17:30:21 +0200 Subject: [PATCH] some stupid fixes for stupid windoze --- Jamrules | 7 ++++++- Jamrules.configure | 12 +++++++++++- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/Jamrules b/Jamrules index 10ce495..2fd6d14 100644 --- a/Jamrules +++ b/Jamrules @@ -1,7 +1,12 @@ if ! $(THIS_IS_K8JAM) { Exit "You need k8jam to build Awish! Download it here: http://repo.or.cz/w/k8jam.git" ; } -if $(WINDOZE) { OPT = default ; OPTIM_STANDARD = -O2 -march=i486 -mtune=i486 ; } +if $(WINDOZE) { + OPT = standard ; + OPTIM_STANDARD = -O2 -march=i486 -mtune=i486 -std=gnu99 ; + LINKFLAGS.all += -L$(TOP)/windoze/libs ; + HDRS += -I$(TOP)/windoze/include ; +} set-profile ; set-target-locations ; diff --git a/Jamrules.configure b/Jamrules.configure index 71d9394..d7daf9b 100644 --- a/Jamrules.configure +++ b/Jamrules.configure @@ -34,9 +34,17 @@ rule -configure-options-install-vmsrc- { INSTALL_VMSRC = tan ; } +rule -configure-options-windoze- { + WINDOZE = tan ; +} + rule -configure- { - -configure-pkg-config- "SDL" : sdl : : : "you need SDL to compile this!" ; + if ! $(WINDOZE) { + -configure-pkg-config- "SDL" : sdl : : : "you need SDL to compile this!" ; + } else { + NOSOUND = "forced" ; + } if $(NOSOUND) = "forced" { -configure-add-line- "NOSOUND = ;" ; -configure-add-line- "LINKLIBS.all += -lSDL_mixer ;" ; @@ -49,6 +57,7 @@ rule -configure- { -configure-add-line- "BUILD_TOOLS =" "$(BUILD_TOOLS)" ";" ; -configure-add-line- "INSTALL_AWASM =" "$(INSTALL_AWASM)" ";" ; -configure-add-line- "INSTALL_VMSRC =" "$(INSTALL_VMSRC)" ";" ; + -configure-add-line- "WINDOZE =" "$(WINDOZE)" ";" ; } @@ -58,6 +67,7 @@ rule -configure-preinit- { BUILD_TOOLS = ; INSTALL_AWASM = ; INSTALL_VMSRC = ; + WINDOZE = ; } -- 2.11.4.GIT