Commit Graph

207 Commits

Author SHA1 Message Date
Ezequiel Garcia
02361a37e8 Minor fixes for issues found while cross-building v2 (#2556)
* irrlicht: Fix harmless typo when setting CMAKE_CXX_FLAGS

The CMAKE_CXX_FLAGS set should be based on previously set
CMAKE_CXX_FLAGS (instead of C flags). This is currently
harmless because CMAKE_CXX_FLAGS is not previously set.

Signed-off-by: Ezequiel Garcia <ezequiel@vanguardiasur.com.ar>

* irrlicht: Get rid of unprefixed cflags

Cross-building requires proper include paths. This commit
removes the unprefixed -I/usr/X11R6/include in irrlicht cflags,
replacing it with a proper CMake module.

Signed-off-by: Ezequiel Garcia <ezequiel@vanguardiasur.com.ar>

* irrlicht: Fix boolean return type for jpeglib's callback

Building on certain toolchains can fail due to returning an integer
instead of TRUE. In any case, only {TRUE,FALSE} should be used
as 'boolean' jpeglib type. Fix this by returning TRUE.

  CImageLoaderJPG.cpp: In static member function 'static boolean
  irr::video::CImageLoaderJPG::fill_input_buffer(j_decompress_ptr)':
  CImageLoaderJPG.cpp:69:9: error: invalid conversion from 'int' to 'boolean'
  [-fpermissive]

Signed-off-by: Romain Naour <romain.naour@smile.fr>
Signed-off-by: Ezequiel Garcia <ezequiel@vanguardiasur.com.ar>
2016-07-03 21:07:53 -04:00
David Carlier
2841c0e165 better alternative OSes handling + tiny C++ fix 2015-12-19 07:05:45 +00:00
Benau
9d1c9fac5a Merge remote-tracking branch 'origin/master' into i18n 2015-12-14 03:00:07 +08:00
Deve
6d757326d2 Make sure that we start game with disabled GL_FRAMEBUFFER_SRGB 2015-12-11 19:18:14 +01:00
Deve
b91bcaf554 Disabl sRGB framebuffer on irrlicht side to avoid modifying current user interface colors 2015-12-11 19:18:14 +01:00
Deve
0216fd9697 Request sRGB-capable visual during creating OpenGL context.
We need it for proper working. When it's not available, then function glEnable(GL_FRAMEBUFFER_SRGB) doesn't take any effect, and then displayed image is too dark.

It doesn't solve the issue that the screen is too dark for intel graphics cards on linux, because the driver ignores this request. But still, this is the proper way to do it and it may avoid similar issues in future.

Actually we should detect that the visual is not srgb-capable, and in this case maybe make some gamma correction or filter it on our side to get similar effect.
2015-12-11 19:18:14 +01:00
Benau
93b1b11b99 Merge remote-tracking branch 'origin/master' into i18n 2015-12-11 09:27:15 +08:00
Nado
d66a70b250 Fixing some -Wunused-variable 2015-11-17 11:42:28 +01:00
Benau
2096532d0e Make stk more-i18n friendly
Now supertuxkart can do:

Windows (fully test in win8 and win7 built with vs2015, mingw not tested):
Input characters using ime (CJK tested).
Fix crashes when try to paste unicode text into editbox in stk.

Linux:
Different keymap can be used in stk now, ie typing russian,hebrew (not bidi-aware) is now possible.
IME not supported.

Mac:
No work has been done, sorry mac fanboys/girls:( Though testing is welcome, esp when pasting words into stk.

Limitation:
No ime box is shown in fullscreen

(Windows)Only the used language in current setting of non-Unicode programs can be typed with its supported IME.
2015-10-27 02:34:46 +08:00
Deve
e15cd49cae Make changing to fullscreen on linux safer.
Now we are waiting until window state is already changed to fullscreen. We are getting real window size at the end of creating window function and previously it was sometimes reporting size of the window in windowed mode, which could causing issues in gui. Previously this was workarounded by forcing minimal window size to be at least in screen resolution, but window managers don't like to have non-resizeable fullscreen windows. Now this workaround is not needed anymore.
2015-10-03 16:43:22 +02:00
Deve
35fa7fd272 Fixed a strange bug during changing window to fullscreen under Gnome 2015-09-26 20:32:55 +02:00
Marianne Gagnon
e2da2a36a1 Fix line endings 2015-09-01 19:39:30 -04:00
Benau
0a7a0d7c98 Fix the ugly hack for displaying Chinese in #2110, and then fix #2297 2015-08-30 02:35:17 +08:00
Deve
78cd8efdd4 Reset screensaver counter on linux when joystick event was received 2015-08-09 18:54:59 +02:00
Marianne Gagnon
3687eb79d6 Apply modified version of patch from Benau to fix chinese word wrapping. See #2110 2015-07-29 18:51:03 -04:00
Flakebi
d2ca7d11d7 Remove unused/commented out code 2015-07-03 15:36:45 +02:00
Flakebi
fbf26df23d Merge branch 'master' into fixes
Conflicts:
	src/graphics/2dutils.cpp
	src/graphics/graphics_restrictions.cpp
	src/graphics/render_skybox.cpp
	src/graphics/rtts.hpp
2015-07-03 15:29:53 +02:00
hiker
a560aafa50 Merge branch 'fix_non_hd_option' 2015-03-27 09:33:07 +11:00
hiker
27dec2fbf8 Added attribute to irrlicht's driver to enable automatic resize
of images that are too big. This is then used to automatically
resize any textures (except fonts, background screen) to be
automatically resized to 512x512 if they are bigger.
2015-03-26 11:28:22 +11:00
deve
df656fbf64 Allow to compile project using cygwin.
Note that you need to have all dependencies in cygwin directory (can be easily installed).
Atm. wiimote and joystick events are disabled.
2015-03-25 09:16:15 +01:00
hiker
443d570196 Make legacy somewhat working on linux (just in case). 2015-03-12 11:47:38 +11:00
hiker
98671b620d Added some support to enable a legacy (2.1) opengl context. Many
things don't work with that atm (rtt, some transparent textures).
Needs to be manually set in the user's config file.
2015-03-11 16:45:20 +11:00
Flakebi
e5abf4cec3 Merge branch 'origin/master' into fixes 2015-03-08 01:16:51 +01:00
Marianne Gagnon
0652780040 [OSX] brutally exit supertuxkart when pressing the window's close button. Fixes #1220. 2015-02-17 19:13:13 -05:00
Flakebi
f386f05749 Silence even more warnings 2015-02-05 20:13:33 +01:00
Flakebi
366f8a26bb Fix more clang warnings 2015-02-05 02:44:06 +01:00
Dmitry Marakasov
94bf5949f5 Include unistd.h for usleep()
Fixes build on FreeBSD
2015-02-02 00:08:30 +03:00
Deve
4f5b84a134 Replace spaces by tabs to keep consistency with other irrlicht files. 2015-01-22 18:59:55 +01:00
Deve
5117ab0a0e Fixed issues with clipboard on linux.
Previous version didn't work for me at all when I tried to copy text from external application.
It also fixes problem with crashing GTK3 applications.
2015-01-22 18:52:26 +01:00
hiker
f724369a8e Merge branch 'freebsd-fixes' of https://github.com/leper/stk-code into leper-freebsd-fixes 2015-01-20 14:56:25 +11:00
Vincent Lejeune
0577099551 Move zlib/libpng/jpeglib outside of irrlicht tree and use system lib on linux 2015-01-18 02:02:10 +01:00
Vincent Lejeune
a5230f68da Remove wad support 2015-01-16 19:07:21 +01:00
Vincent Lejeune
184b52966e Remove npk and pak support 2015-01-16 19:02:03 +01:00
Vincent Lejeune
b3195e378d Remove support for lzma and aes encryption 2015-01-16 18:45:52 +01:00
Vincent Lejeune
a831b4c9db Remove bzip2 files
Not used anyway
2015-01-16 18:31:51 +01:00
Vincent Lejeune
1fb99990b4 Remove light volume related code 2015-01-16 01:57:35 +01:00
Vincent Lejeune
c1d85e8674 Remove shadow volume code
We use shadowmap
2015-01-16 01:51:56 +01:00
Vincent Lejeune
c68fee0a07 Remove extra discarded ifdefs 2015-01-16 01:27:17 +01:00
Vincent Lejeune
4151edfd99 Remove RGB support 2015-01-16 01:23:59 +01:00
Vincent Lejeune
510c10153c Remove WAL/LMP support 2015-01-16 01:20:40 +01:00
Vincent Lejeune
9d99fb65e5 Remove DDS support and its scary legal notice 2015-01-16 01:07:48 +01:00
Vincent Lejeune
222f335300 Remove TGA support 2015-01-16 01:02:48 +01:00
Vincent Lejeune
084350ce40 Remove PCX support 2015-01-16 00:54:46 +01:00
Vincent Lejeune
8f51be8766 Remove PSD support 2015-01-16 00:44:32 +01:00
Vincent Lejeune
0856204b80 Remove PPM support 2015-01-16 00:38:53 +01:00
Vincent Lejeune
cf3e79484c Remove Scene Loader files 2015-01-11 00:24:26 +01:00
Vincent Lejeune
78ff00fc36 Revert "Remove irrlicht parallax map"
This reverts commit c17a093d83.
2015-01-11 00:18:29 +01:00
Vincent Lejeune
5f6700d355 Remove CSoftwareTexture2.h 2015-01-11 00:10:12 +01:00
Vincent Lejeune
f1e6212b56 Remove IDepthBuffer 2015-01-11 00:02:37 +01:00
Vincent Lejeune
f68ac808d6 Remove software depth buffer 2015-01-10 23:58:28 +01:00