Skip to content

Commit

Permalink
Merge branch '0.2.x'
Browse files Browse the repository at this point in the history
# Conflicts:
#	DreeRally.vcxproj
#	DreeRally.vcxproj.filters
#	config.c
#	config.h
#	dr.c
#	i18n/i18n.c
#	i18n/i18n.h
#	lang/langEs.txt
#	ui/licenseScreen.c
#	util/hash.c
#	util/hash.h
  • Loading branch information
enriquesomolinos committed Dec 20, 2019
2 parents 006f70b + 54e87b3 commit 66b2650
Show file tree
Hide file tree
Showing 210 changed files with 44,096 additions and 17,217 deletions.
13 changes: 12 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,21 @@
*.bmp
*.SG*
*.rar
*.o
*.exe
*.bak
*_
*.bpk
*.tab
*.dat
*.cmf
*.pal
*.bin
dr.cfg
*.haf

# User-specific files
# User-specif
ic files
*.suo
*.user
*.userosscache
Expand Down
34 changes: 34 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
language: c
compiler: gcc
dist: bionic

install:
- sudo dpkg --add-architecture i386
- sudo apt-get update
- sudo apt-get install libc6-i386
- sudo apt-get install gcc-7-multilib gcc-multilib
- sudo apt-get install g++-7-multilib g++-multilib
- sudo apt-get install xorg-dev
- sudo apt-get install libsdl1.2-dev:i386
- sudo apt-get install libsdl1.2debian:i386
- sudo apt-get install freeglut3-dev:i386
- sudo apt-get install freeglut3:i386
- sudo apt-get install libglu1-mesa:i386
- sudo apt-get install libglu1-mesa-dev
- sudo apt-get install mesa-utils
- sudo apt-get install mesa-common-dev
- sudo apt-get install libx11-dev libgl1-mesa-glx
- sudo apt-get install build-essential libgl1-mesa-dev
- sudo apt-get install libgl1-mesa-glx:i386
- wget https://zdoom.org/files/fmod/fmodapi375linux.tar.gz
- tar -xf fmodapi375linux.tar.gz
- sudo cp fmodapi375linux/api/libfmod-3.75.so /usr/lib
- ls /usr/lib/i386-linux-gnu/

services:
- xvfb


script:
- make -f Makefile.linux

20 changes: 20 additions & 0 deletions .vscode/c_cpp_properties.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"configurations": [
{
"name": "Linux",
"includePath": [
"${workspaceFolder}/**"
],
"defines": [],
"compilerPath": "/usr/bin/gcc",
"cStandard": "c11",
"cppStandard": "c++17",
"intelliSenseMode": "gcc-x86",
"compilerArgs": [
"-m32 ",
"-nostdinc++"
]
}
],
"version": 4
}
28 changes: 28 additions & 0 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{
// Use IntelliSense to learn about possible attributes.
// Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [

{
"name": "(gdb) Launch",
"type": "cppdbg",
"request": "launch",
"program": "${workspaceFolder}/Debug/dreerally",
"args": ["-D_WINDOWS_TYPES1 -D__WIN32__2 -DPORTABILITY -D_NO_MINIFMOD "],
"stopAtEntry": false,
"cwd": "${workspaceFolder}/Debug",
"environment": [],
"externalConsole": false,
"MIMode": "gdb",
"setupCommands": [
{
"description": "Enable pretty-printing for gdb",
"text": "-enable-pretty-printing",
"ignoreFailures": true
}
]
}
]
}
5 changes: 5 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"files.associations": {
"anim.h": "c"
}
}
26 changes: 26 additions & 0 deletions .vscode/tasks.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
// See https://go.microsoft.com/fwlink/?LinkId=733558
// for the documentation about the tasks.json format
"version": "2.0.0",
"tasks": [
{
"label": "build",
"type": "shell",
"command": "make -f Makefile.linux",
"args": [
// Ask msbuild to generate full paths for file names.
"/property:GenerateFullPaths=true",
"/t:build",
// Do not generate summary otherwise it leads to duplicate errors in Problems panel
"/consoleloggerparameters:NoSummary"
],
"group": "build",
"presentation": {
// Reveal the output only if unrecognized errors occur.
"reveal": "silent"
},
// Use the standard MS compiler pattern to detect errors, warnings and infos
"problemMatcher": "$msCompile"
}
]
}
84 changes: 61 additions & 23 deletions DreeRally.vcxproj
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
Expand Down Expand Up @@ -28,26 +28,22 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v140</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v140</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v140</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v140</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
Expand Down Expand Up @@ -95,17 +91,19 @@
<ClCompile>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>TurnOffAllWarnings</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BufferSecurityCheck>false</BufferSecurityCheck>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<WarningLevel>TurnOffAllWarnings</WarningLevel>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>opengl32.lib;SDL.lib;SDLmain.lib;fmodvc.lib;minifmod.lib;Winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<ShowProgress>NotSet</ShowProgress>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
Expand All @@ -126,7 +124,7 @@
<AdditionalDependencies>opengl32.lib;SDL.lib;SDLmain.lib;fmodvc.lib;minifmod.lib;Winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
<IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
<TargetMachine>MachineX86</TargetMachine>
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
Expand All @@ -145,7 +143,7 @@
<OptimizeReferences>true</OptimizeReferences>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>opengl32.lib;SDL.lib;SDLmain.lib;fmodvc.lib;minifmod.lib;Winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
Expand All @@ -164,23 +162,32 @@
<OptimizeReferences>true</OptimizeReferences>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>opengl32.lib;SDL.lib;SDLmain.lib;fmodvc.lib;minifmod.lib;Winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="asset\bpaUtil.c" />
<ClCompile Include="asset\haf.c" />
<ClCompile Include="mod\mod.c" />
<ClCompile Include="race\3dSystem.c" />
<ClCompile Include="anim.c" />
<ClCompile Include="blackmarket\blackMarket.c" />
<ClCompile Include="bpa\bpaUtil.c" />
<ClCompile Include="cars.c" />
<ClCompile Include="circuit.c" />
<ClCompile Include="config.c" />
<ClCompile Include="dr.c" />
<ClCompile Include="dr.c">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Disabled</Optimization>
<IntrinsicFunctions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</IntrinsicFunctions>
<WholeProgramOptimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</WholeProgramOptimization>
<MinimalRebuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</MinimalRebuild>
<MinimalRebuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</MinimalRebuild>
<BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MultiThreadedDebugDLL</RuntimeLibrary>
<BufferSecurityCheck Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</BufferSecurityCheck>
<FunctionLevelLinking Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</FunctionLevelLinking>
</ClCompile>
<ClCompile Include="drivers.c" />
<ClCompile Include="graphics.c" />
<ClCompile Include="hof\hallOfFame.c" />
<ClCompile Include="imageUtil.c" />
<ClCompile Include="license\licenseScreen.c" />
<ClCompile Include="menus.c" />
<ClCompile Include="multiplayer\multiplayer.c" />
<ClCompile Include="race\pedestrian.c" />
Expand All @@ -189,44 +196,75 @@
<ClCompile Include="raceParticipant.c" />
<ClCompile Include="raceResults.c" />
<ClCompile Include="savegame.c" />
<ClCompile Include="minifmod_modified\soundSystem.c" />
<ClCompile Include="i18n\i18n.c" />
<ClCompile Include="sfx\minifmod\soundSystem.c" />
<ClCompile Include="sfx\sound.c" />
<ClCompile Include="ui\blackMarketScreen.c" />
<ClCompile Include="ui\creditsScreen.c" />
<ClCompile Include="ui\endGameScreen.c" />
<ClCompile Include="ui\hallOfFame.c" />
<ClCompile Include="ui\licenseScreen.c" />
<ClCompile Include="ui\loadSaveGameScreen.c" />
<ClCompile Include="ui\menu.c" />
<ClCompile Include="ui\prevRaceScreen.c" />
<ClCompile Include="ui\selectRaceScreen.c" />
<ClCompile Include="ui\raceResultsScreen.c" />
<ClCompile Include="ui\shopScreen.c" />
<ClCompile Include="ui\startGameScreen.c" />
<ClCompile Include="util.c" />
<ClCompile Include="util\hash.c" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="anim.h" />
<ClInclude Include="asset\bpaUtil.h" />
<ClInclude Include="asset\haf.h" />
<ClInclude Include="input\input.c" />
<ClInclude Include="input\input.h" />
<ClInclude Include="mod\mod.h" />
<ClInclude Include="portability\portability.h" />
<ClInclude Include="race\3dSystem.h" />
<ClInclude Include="race\anim.h" />
<ClInclude Include="blackmarket\blackMarket.h" />
<ClInclude Include="bpa\bpaUtil.h" />
<ClInclude Include="cars.h" />
<ClInclude Include="circuit.h" />
<ClInclude Include="config.h" />
<ClInclude Include="defs.h" />
<ClInclude Include="doc.h" />
<ClInclude Include="dr.h" />
<ClInclude Include="drivers.h" />
<ClInclude Include="minifmod_modified\fmod.h" />
<ClInclude Include="graphics.h" />
<ClInclude Include="hof\hallOfFame.h" />
<ClInclude Include="imageUtil.h" />
<ClInclude Include="license\licenseScreen.h" />
<ClInclude Include="menus.h" />
<ClInclude Include="race\pedestrian.h" />
<ClInclude Include="popup\popup.h" />
<ClInclude Include="race\powerup.h" />
<ClInclude Include="raceParticipant.h" />
<ClInclude Include="savegame.h" />
<ClInclude Include="sfx\minifmod\fmod.h" />
<ClInclude Include="sfx\minifmod\soundSystem.h" />
<ClInclude Include="sfx\minifmod\system_memory.h" />
<ClInclude Include="sfx\minifmod\xmeffects.h" />
<ClInclude Include="sfx\sound.h" />
<ClInclude Include="soundEffects.h" />
<ClInclude Include="minifmod_modified\soundSystem.h" />
<ClInclude Include="minifmod_modified\system_memory.h" />
<ClInclude Include="race\terrain.h" />
<ClInclude Include="i18n\i18n.h" />
<ClInclude Include="ui\blackMarketScreen.h" />
<ClInclude Include="ui\creditsScreen.h" />
<ClInclude Include="ui\endGameScreen.h" />
<ClInclude Include="ui\hallOfFame.h" />
<ClInclude Include="ui\licenseScreen.h" />
<ClInclude Include="ui\loadSaveGameScreen.h" />
<ClInclude Include="ui\mainScreen.c" />
<ClInclude Include="ui\mainScreen.h" />
<ClInclude Include="ui\menu.h" />
<ClInclude Include="ui\prevRaceScreen.h" />
<ClInclude Include="ui\selectRaceScreen.h" />
<ClInclude Include="ui\raceResultsScreen.h" />
<ClInclude Include="ui\shopScreen.h" />
<ClInclude Include="ui\startGameScreen.h" />
<ClInclude Include="util.h" />
<ClInclude Include="util\hash.h" />
<ClInclude Include="variables.h" />
<ClInclude Include="raceResults.h" />
<ClInclude Include="minifmod_modified\xmeffects.h" />
</ItemGroup>
<ItemGroup>
<Reference Include="System" />
Expand Down
Loading

0 comments on commit 66b2650

Please sign in to comment.