diff options
| author | tobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2008-02-07 21:50:25 +0000 |
|---|---|---|
| committer | tobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2008-02-07 21:50:25 +0000 |
| commit | 4b221bce47a8d993de19dab49884c1c2f17014d4 (patch) | |
| tree | 1297f4f209b36fb8bfe1a19f2072af6dcbf834b0 | |
| parent | f0b4ae82ddbd384c7dad594eb36d14e4946a5f62 (diff) | |
| download | usdx-4b221bce47a8d993de19dab49884c1c2f17014d4.tar.gz usdx-4b221bce47a8d993de19dab49884c1c2f17014d4.tar.xz usdx-4b221bce47a8d993de19dab49884c1c2f17014d4.zip | |
- removed the gtk2 detection (it is just necessary if we want to use lazjpeg instead of Ulazjpeg)
- undefined ProjectM in switches.inc because it caused some trouble (black screen or crashes). So you have to enable this if you want to use ProjectM. I will try to find the cause for the problem. It occurs with flms` installation only so we will have to debug his version remotely.
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@841 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to '')
| -rw-r--r-- | Game/Code/Makefile.in | 5 | ||||
| -rw-r--r-- | Game/Code/configure.ac | 2 | ||||
| -rw-r--r-- | Game/Code/switches.inc | 3 |
3 files changed, 6 insertions, 4 deletions
diff --git a/Game/Code/Makefile.in b/Game/Code/Makefile.in index b4eff25d..6ab1902e 100644 --- a/Game/Code/Makefile.in +++ b/Game/Code/Makefile.in @@ -47,10 +47,10 @@ RESCOMPILER_PFLAGS = -dRELEASE PUNIT_TOKEN = -Fu
PUNIT_FLAGS = \
$(PUNIT_TOKEN)$(LAZARUS_DIR)/lcl/units/$(PPROCESSOR)-$(PPLATFORM) \
- $(PUNIT_TOKEN)$(LAZARUS_DIR)/lcl/units/$(PPROCESSOR)-$(PPLATFORM)/$(LCL_WIDGET_TYPE) \
$(PUNIT_TOKEN)$(LAZARUS_DIR)/components/images/lib/$(PPROCESSOR)-$(PPLATFORM) \
$(PUNIT_TOKEN)$(LAZARUS_DIR)/components/jpeg \
$(PUNIT_TOKEN).
+# $(PUNIT_TOKEN)$(LAZARUS_DIR)/lcl/units/$(PPROCESSOR)-$(PPLATFORM)/$(LCL_WIDGET_TYPE)
# Directory where compiled units (.ppu and .o files) are stored
PCUNIT_TOKEN = -FU
@@ -62,7 +62,8 @@ PINC_TOKEN = -Fi PINC_FLAGS = $(PINC_TOKEN)lib/JEDI-SDL/SDL/Pas
# Defines
-PDEFINES = -dLCL -dLCL$(LCL_WIDGET_TYPE)
+PDEFINES = -dLCL
+#-dLCL$(LCL_WIDGET_TYPE)
# Misc fpc options
PCOMPAT_FLAGS = -S2dgi
diff --git a/Game/Code/configure.ac b/Game/Code/configure.ac index f0af3447..9ca6e46a 100644 --- a/Game/Code/configure.ac +++ b/Game/Code/configure.ac @@ -296,7 +296,7 @@ if [[ -d "$LCL_WIDGET_DIR" ]]; then AC_MSG_RESULT(yes) else AC_MSG_RESULT(no) - AC_MSG_ERROR(LCL Widget Type not available: directory "$LCL_WIDGET_DIR" not found.) +# AC_MSG_ERROR(LCL Widget Type not available: directory "$LCL_WIDGET_DIR" not found.) fi # find sdl diff --git a/Game/Code/switches.inc b/Game/Code/switches.inc index 66a8ad07..d0cc9525 100644 --- a/Game/Code/switches.inc +++ b/Game/Code/switches.inc @@ -95,7 +95,8 @@ // misc defines
{$IFDEF HaveProjectM}
- {$DEFINE UseProjectM_0_9}
+ // this causes trouble at the moment
+ //{$DEFINE UseProjectM_0_9}
{$ENDIF}
{$IFEND}
|