andr3/scyther
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bugfix: compilation was not working on recent 64-bit Ubuntu versions.

Browse Source 
This patch addresses two 64-bit platform compilation issues:
- Force 32-bit mode for gcc using '-m32'
- Recent library modifications broke the 32-bit compilation on 64-bit machines: updated
  'compile.txt' to include the need for the 'gcc-multilib' package.
This commit is contained in:
Cas Cremers 2014-02-18 10:53:24 +00:00
parent b6517dd41e
commit 3df93c42e4
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/BuildUnix-Win32.cmake
View File

@ -15,7 +15,7 @@ set (CMAKE_SHARED_LIBRARY_LINK_C_FLAGS) # to get rid of -rdynamic
set (CMAKE_C_FLAGS "-DFORWINDOWS") set (CMAKE_C_FLAGS "-DFORWINDOWS")
# Static where possible (i.e. only not on the APPLE) # Static where possible (i.e. only not on the APPLE)
set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -static") set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -static -m32")
set (scythername "scyther-w32.exe") set (scythername "scyther-w32.exe")
add_executable (${scythername} ${Scyther_sources}) add_executable (${scythername} ${Scyther_sources})

2
src/BuildUnix.cmake
View File

@ -9,7 +9,7 @@
message (STATUS "Building Linux version") message (STATUS "Building Linux version")
# Static where possible (i.e. only not on the APPLE) # Static where possible (i.e. only not on the APPLE)
set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -static") set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -static -m32")
set (scythername "scyther-linux") set (scythername "scyther-linux")
add_executable (${scythername} ${Scyther_sources}) add_executable (${scythername} ${Scyther_sources})

3
src/compile.txt
View File

@ -21,6 +21,9 @@ Needed:
[cmake] [cmake]
A Makefile generator, available on almost any platform. A Makefile generator, available on almost any platform.
[gcc-multilib]
Some 64-bit platforms need this to enable 32-bit compilation.
For cross-compilation (Windows): For cross-compilation (Windows):